diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-23 15:48:08 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-23 15:48:08 +0200 |
| commit | b91a123d8c9c321d54256d4ba055857c9505632b (patch) | |
| tree | 354681fe5c859ebebc152befc9b19f62ea77c6f9 /mysql-test/include/rpl_stop_server.inc | |
| parent | 23368b76be5e1094cb42682dcc317e671e57efbc (diff) | |
| download | mariadb-git-b91a123d8c9c321d54256d4ba055857c9505632b.tar.gz | |
Extend have_sanitizer with ASAN+UBSAN and MSAN
Disable some tests that are too slow or big for MSAN.
Diffstat (limited to 'mysql-test/include/rpl_stop_server.inc')
| -rw-r--r-- | mysql-test/include/rpl_stop_server.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/include/rpl_stop_server.inc b/mysql-test/include/rpl_stop_server.inc index 049c3d5bbd2..470e86a139d 100644 --- a/mysql-test/include/rpl_stop_server.inc +++ b/mysql-test/include/rpl_stop_server.inc @@ -48,7 +48,9 @@ if ($rpl_debug) # Send shutdown to the connected server and give # it 60 seconds (of mysqltest's default) to die before zapping it -shutdown_server; +let $rpl_shutdown_timeout= `select 60*(1+9*count(*)) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`; + +shutdown_server $rpl_shutdown_timeout; --source include/wait_until_disconnected.inc |