diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-26 14:34:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-26 14:34:43 +0300 |
| commit | 829e8111c70cf0354f686bd9087818de61f452a2 (patch) | |
| tree | 7e63e7facd44cc3b0d937c34de9b6f5737019a1c /sql/mysqld.cc | |
| parent | 70701ee4b1a9962e33a83da94aea61d7537fe9d4 (diff) | |
| parent | fe7c95ec7833d424b1dcaf64f6c78c74ce0832d6 (diff) | |
| download | mariadb-git-829e8111c70cf0354f686bd9087818de61f452a2.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 41ec99a90b2..4f46b099d31 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1677,6 +1677,7 @@ void kill_mysql(THD *thd) shutdown_thread_id= thd->thread_id; DBUG_EXECUTE_IF("mysql_admin_shutdown_wait_for_slaves", thd->lex->is_shutdown_wait_for_slaves= true;); +#ifdef ENABLED_DEBUG_SYNC DBUG_EXECUTE_IF("simulate_delay_at_shutdown", { DBUG_ASSERT(binlog_dump_thread_count == 3); @@ -1686,6 +1687,7 @@ void kill_mysql(THD *thd) DBUG_ASSERT(!debug_sync_set_action(thd, STRING_WITH_LEN(act))); };); +#endif if (thd->lex->is_shutdown_wait_for_slaves) shutdown_wait_for_slaves= true; |