diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-07-09 11:04:28 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-07-09 11:04:28 -0400 |
| commit | 40bfd20180a392f0c2e56cc99fff9ab3bf3ef87f (patch) | |
| tree | 87a341f119275a1592e8e1dc629392ea20e40303 /sql/mysqld.cc | |
| parent | 04db5aeb097a9733ba31015f09198aea04067ee4 (diff) | |
| download | mariadb-git-40bfd20180a392f0c2e56cc99fff9ab3bf3ef87f.tar.gz | |
MDEV#6411 - Setting set @@global_wsrep_sst_auth=NULL
causes crash
Fixed by properly handling the NULL values.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c008be9d5d3..888900565db 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1759,7 +1759,7 @@ static void __cdecl kill_server(int sig_ptr) close_connections(); #ifdef WITH_WSREP if (wsrep_inited == 1) - wsrep_deinit(); + wsrep_deinit(true); #endif if (sig != MYSQL_KILL_SIGNAL && sig != 0) @@ -1871,7 +1871,7 @@ extern "C" void unireg_abort(int exit_code) /* In bootstrap mode we deinitialize wsrep here. */ if (opt_bootstrap && wsrep_inited) - wsrep_deinit(); + wsrep_deinit(true); } #endif // WITH_WSREP |