Skip to content

Commit

Permalink
[upstream] add more timeout for asandebug shutdown
Browse files Browse the repository at this point in the history
Summary:
During mysqld shutdown, asandebug will detect memory leak which take long time and if it can't finish in time, mysqld will be killed by mysqltest_safe_process.

similar to vangrind, add more timeout for asan build during shutdown.

Reviewed By: Pushapgl

Differential Revision: D28860932
  • Loading branch information
luqun authored and inikep committed Jun 6, 2024
1 parent dda8c1d commit ce2d1d3
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions mysql-test/include/rpl_stop_server.inc
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@ if ($VALGRIND_TEST)
--expr $ss_timeout= $ss_timeout * $timeout_multiplier
}

if ($ASAN_OPTIONS)
{
if(!$VALGRIND_TEST)
{
--expr $ss_timeout= $ss_timeout * $timeout_multiplier
}
}

let $have_sparc = `select convert(@@version_compile_machine using latin1) IN ('sparc')`;
if ($have_sparc)
{
Expand Down

0 comments on commit ce2d1d3

Please sign in to comment.