Commit a891fe6a authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-23927 Crash in ./mtr --skip-innodb-fast-shutdown innodb.temporary_tables

innodb_preshutdown(): On innodb_fast_shutdown=0, only wait for
transactions to exit if the transaction system had been initialized.

Reviewed by: Vladislav Vaintroub
parent d312d641
...@@ -131,7 +131,7 @@ AND support IN ('YES', 'DEFAULT', 'ENABLED'); ...@@ -131,7 +131,7 @@ AND support IN ('YES', 'DEFAULT', 'ENABLED');
# We cannot use include/restart_mysqld.inc in this particular test, # We cannot use include/restart_mysqld.inc in this particular test,
# because SHOW STATUS would fail due to unwritable (nonexistent) tmpdir. # because SHOW STATUS would fail due to unwritable (nonexistent) tmpdir.
--source include/shutdown_mysqld.inc --source include/shutdown_mysqld.inc
--exec echo "restart: --tmpdir=/dev/null/nonexistent" > $_expect_file_name --exec echo "restart: --tmpdir=/dev/null/nonexistent --skip-innodb-fast-shutdown" > $_expect_file_name
--enable_reconnect --enable_reconnect
--disable_result_log --disable_result_log
--disable_query_log --disable_query_log
......
...@@ -2076,6 +2076,7 @@ void innodb_preshutdown() ...@@ -2076,6 +2076,7 @@ void innodb_preshutdown()
better prevent any further changes from being buffered. */ better prevent any further changes from being buffered. */
innodb_change_buffering= 0; innodb_change_buffering= 0;
if (trx_sys.is_initialised())
while (trx_sys.any_active_transactions()) while (trx_sys.any_active_transactions())
os_thread_sleep(1000); os_thread_sleep(1000);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment