database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

mtr: increase timeouts under ASAN/UBSAN/MSAN

Browse Source 
not only under valgrind
This commit is contained in:
Sergei Golubchik
2024-03-27 22:30:29 +01:00
parent bd0e751549
commit fc6711c636
5 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/include/shutdown_mysqld.inc
View File

@ -31,11 +31,8 @@ if ($rpl_inited)
set @@global.log_warnings=0; set @@global.log_warnings=0;
--enable_query_log --enable_query_log
--let $server_shutdown_timeout= 60 --source include/slow_environ.inc
if ($VALGRIND_TEST) --let $server_shutdown_timeout= 60$_timeout_adjustment
{
--let $server_shutdown_timeout= 300
}
if ($shutdown_timeout) if ($shutdown_timeout)
{ {

9
mysql-test/include/slow_environ.inc Normal file
View File

@ -0,0 +1,9 @@
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;
}

7
mysql-test/include/sync_slave_sql_with_io.inc
View File

@ -25,11 +25,8 @@
let $_slave_timeout= $slave_timeout; let $_slave_timeout= $slave_timeout;
if (!$_slave_timeout) if (!$_slave_timeout)
{ {
let $_slave_timeout= 300; source include/slow_environ.inc;
if ($VALGRIND_TEST) let $_slave_timeout= 300$_timeout_adjustment;
{
let $_slave_timeout= 1500;
}
} }
--let $_master_log_file= query_get_value(SHOW SLAVE STATUS, Master_Log_File, 1) --let $_master_log_file= query_get_value(SHOW SLAVE STATUS, Master_Log_File, 1)

7
mysql-test/include/sync_with_master_gtid.inc
View File

@ -33,11 +33,8 @@
let $_slave_timeout= $slave_timeout; let $_slave_timeout= $slave_timeout;
if (!$_slave_timeout) if (!$_slave_timeout)
{ {
let $_slave_timeout= 120; source include/slow_environ.inc;
if ($VALGRIND_TEST) let $_slave_timeout= 120$_timeout_adjustment;
{
let $_slave_timeout= 1200;
}
} }
--let $_result= `SELECT master_gtid_wait('$master_pos', $_slave_timeout)` --let $_result= `SELECT master_gtid_wait('$master_pos', $_slave_timeout)`

7
mysql-test/include/wait_for_slave_param.inc
View File

@ -49,11 +49,8 @@
let $_slave_timeout= $slave_timeout; let $_slave_timeout= $slave_timeout;
if (!$_slave_timeout) if (!$_slave_timeout)
{ {
let $_slave_timeout= 300; source include/slow_environ.inc;
if ($VALGRIND_TEST) let $_slave_timeout= 300$_timeout_adjustment;
{
let $_slave_timeout= 1500;
}
} }
let $_slave_param_comparison= $slave_param_comparison; let $_slave_param_comparison= $slave_param_comparison;