Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
fc6711c6
Commit
fc6711c6
authored
Mar 27, 2024
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mtr: increase timeouts under ASAN/UBSAN/MSAN
not only under valgrind
parent
bd0e7515
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
20 deletions
+17
-20
mysql-test/include/shutdown_mysqld.inc
mysql-test/include/shutdown_mysqld.inc
+2
-5
mysql-test/include/slow_environ.inc
mysql-test/include/slow_environ.inc
+9
-0
mysql-test/include/sync_slave_sql_with_io.inc
mysql-test/include/sync_slave_sql_with_io.inc
+2
-5
mysql-test/include/sync_with_master_gtid.inc
mysql-test/include/sync_with_master_gtid.inc
+2
-5
mysql-test/include/wait_for_slave_param.inc
mysql-test/include/wait_for_slave_param.inc
+2
-5
No files found.
mysql-test/include/shutdown_mysqld.inc
View file @
fc6711c6
...
...
@@ -31,11 +31,8 @@ if ($rpl_inited)
set @@global.log_warnings=0
;
--
enable_query_log
--
let
$server_shutdown_timeout
=
60
if
(
$VALGRIND_TEST
)
{
--
let
$server_shutdown_timeout
=
300
}
--
source
include
/
slow_environ
.
inc
--
let
$server_shutdown_timeout
=
60
$_timeout_adjustment
if
(
$shutdown_timeout
)
{
...
...
mysql-test/include/slow_environ.inc
0 → 100644
View file @
fc6711c6
if
(
!
$slow_environ_check
)
{
let
$_timeout_adjustment
=
;
if
(
`select $VALGRIND_TEST + count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like '%SAN%'`
)
{
let
$_timeout_adjustment
=
0
;
}
let
$slow_environ_check
=
1
;
}
mysql-test/include/sync_slave_sql_with_io.inc
View file @
fc6711c6
...
...
@@ -25,11 +25,8 @@
let
$_slave_timeout
=
$slave_timeout
;
if
(
!
$_slave_timeout
)
{
let
$_slave_timeout
=
300
;
if
(
$VALGRIND_TEST
)
{
let
$_slave_timeout
=
1500
;
}
source
include
/
slow_environ
.
inc
;
let
$_slave_timeout
=
300
$_timeout_adjustment
;
}
--
let
$_master_log_file
=
query_get_value
(
SHOW
SLAVE
STATUS
,
Master_Log_File
,
1
)
...
...
mysql-test/include/sync_with_master_gtid.inc
View file @
fc6711c6
...
...
@@ -33,11 +33,8 @@
let
$_slave_timeout
=
$slave_timeout
;
if
(
!
$_slave_timeout
)
{
let
$_slave_timeout
=
120
;
if
(
$VALGRIND_TEST
)
{
let
$_slave_timeout
=
1200
;
}
source
include
/
slow_environ
.
inc
;
let
$_slave_timeout
=
120
$_timeout_adjustment
;
}
--
let
$_result
=
`SELECT master_gtid_wait('$master_pos', $_slave_timeout)`
...
...
mysql-test/include/wait_for_slave_param.inc
View file @
fc6711c6
...
...
@@ -49,11 +49,8 @@
let
$_slave_timeout
=
$slave_timeout
;
if
(
!
$_slave_timeout
)
{
let
$_slave_timeout
=
300
;
if
(
$VALGRIND_TEST
)
{
let
$_slave_timeout
=
1500
;
}
source
include
/
slow_environ
.
inc
;
let
$_slave_timeout
=
300
$_timeout_adjustment
;
}
let
$_slave_param_comparison
=
$slave_param_comparison
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment