From 40bfd20180a392f0c2e56cc99fff9ab3bf3ef87f Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@skysql.com>
Date: Wed, 9 Jul 2014 11:04:28 -0400
Subject: MDEV#6411 - Setting set @@global_wsrep_sst_auth=NULL causes crash

Fixed by properly handling the NULL values.
---
 sql/mysqld.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql/mysqld.cc')

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
 
-- 
cgit v1.2.1