diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-11 23:12:18 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-11 23:12:18 -0400 |
| commit | 57ba177dafef33bac544498e66bfd705e6cfc476 (patch) | |
| tree | e1da7ca29e259b70363e050eea1b853b0aa30df6 /sql/mysqld.cc | |
| parent | 653ef22336a5c14404b9690bb44df702292463b2 (diff) | |
| download | mariadb-git-57ba177dafef33bac544498e66bfd705e6cfc476.tar.gz | |
MDEV#5812 Memory leaks while running mysqld in
bootstrap mode
Added calls to deinit functions at appropriate
places.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 829bc0be763..91fdb27ffe7 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1868,6 +1868,10 @@ extern "C" void unireg_abort(int exit_code) wsrep_close_threads(thd); /* this won't close all threads */ sleep(1); /* so give some time to exit for those which can */ WSREP_INFO("Some threads may fail to exit."); + + /* In bootstrap mode we deinitialize wsrep here. */ + if (opt_bootstrap && wsrep_inited) + wsrep_deinit(); } #endif // WITH_WSREP |