Commit 151daaf4 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-12994 innodb_fast_shutdown=0 skips change buffer merge; fast shutdown does it

srv_master_thread(): Pass the correct parameter to srv_shutdown().
This bug was introduced in MDEV-12052, and it affects the MariaDB 10.1.24
release.
parent ab62b753
...@@ -2403,7 +2403,7 @@ DECLARE_THREAD(srv_master_thread)( ...@@ -2403,7 +2403,7 @@ DECLARE_THREAD(srv_master_thread)(
case SRV_SHUTDOWN_CLEANUP: case SRV_SHUTDOWN_CLEANUP:
if (srv_shutdown_state == SRV_SHUTDOWN_CLEANUP if (srv_shutdown_state == SRV_SHUTDOWN_CLEANUP
&& srv_fast_shutdown < 2) { && srv_fast_shutdown < 2) {
srv_shutdown(srv_fast_shutdown == 1); srv_shutdown(srv_fast_shutdown == 0);
} }
srv_suspend_thread(slot); srv_suspend_thread(slot);
my_thread_end(); my_thread_end();
......
...@@ -3076,7 +3076,7 @@ DECLARE_THREAD(srv_master_thread)( ...@@ -3076,7 +3076,7 @@ DECLARE_THREAD(srv_master_thread)(
case SRV_SHUTDOWN_CLEANUP: case SRV_SHUTDOWN_CLEANUP:
if (srv_shutdown_state == SRV_SHUTDOWN_CLEANUP if (srv_shutdown_state == SRV_SHUTDOWN_CLEANUP
&& srv_fast_shutdown < 2) { && srv_fast_shutdown < 2) {
srv_shutdown(srv_fast_shutdown == 1); srv_shutdown(srv_fast_shutdown == 0);
} }
srv_suspend_thread(slot); srv_suspend_thread(slot);
my_thread_end(); my_thread_end();
......
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