diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-05 15:16:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-05 15:16:15 +0300 |
| commit | 151daaf4805d4e8ed30d2d871ac99ff1c1873bdc (patch) | |
| tree | a93982c345354022e11455eab54af453acf79cb9 /storage/xtradb | |
| parent | ab62b7538f2eab43943da56c3a6d74cd85dfa877 (diff) | |
| download | mariadb-git-151daaf4805d4e8ed30d2d871ac99ff1c1873bdc.tar.gz | |
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.
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/srv/srv0srv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/srv/srv0srv.cc b/storage/xtradb/srv/srv0srv.cc index d18abbe0574..2fa3be014a5 100644 --- a/storage/xtradb/srv/srv0srv.cc +++ b/storage/xtradb/srv/srv0srv.cc @@ -3076,7 +3076,7 @@ suspend_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(); |