1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Marko Mäkelä 2017-06-05 15:16:15 +03:00
parent ab62b7538f
commit 151daaf480
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/srv/srv0srv.cc
View File

@ -2403,7 +2403,7 @@ suspend_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();

2
storage/xtradb/srv/srv0srv.cc
View File

@ -3076,7 +3076,7 @@ suspend_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();