Merged revision 3471, 3472 & 3473 from maria-5.5-galera.

sql/mysqld.cc

@@ -2055,6 +2055,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
   clean_up(!opt_abort && (exit_code || !opt_bootstrap)); /* purecov: inspected */