MDEV-12994 innodb_fast_shutdown=0 skips change buffer merge; fast shu…

…tdown 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.
MariaDB · Jun 5, 2017 · 151daaf · 151daaf
1 parent ab62b75
commit 151daaf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
@@ -2403,7 +2403,7 @@ DECLARE_THREAD(srv_master_thread)(
 	case SRV_SHUTDOWN_CLEANUP:
 		if (srv_shutdown_state == SRV_SHUTDOWN_CLEANUP
 		    && srv_fast_shutdown < 2) {
-			srv_shutdown(srv_fast_shutdown == 1);
+			srv_shutdown(srv_fast_shutdown == 0);
 		}
 		srv_suspend_thread(slot);
 		my_thread_end();

diff --git a/storage/xtradb/srv/srv0srv.cc b/storage/xtradb/srv/srv0srv.cc
@@ -3076,7 +3076,7 @@ DECLARE_THREAD(srv_master_thread)(
 	case SRV_SHUTDOWN_CLEANUP:
 		if (srv_shutdown_state == SRV_SHUTDOWN_CLEANUP
 		    && srv_fast_shutdown < 2) {
-			srv_shutdown(srv_fast_shutdown == 1);
+			srv_shutdown(srv_fast_shutdown == 0);
 		}
 		srv_suspend_thread(slot);
 		my_thread_end();