MDEV-23559: Galera LeakSanitizer: detected memory leaks in galera.GAL…

…-419 When process is aborted WSREP deinitialization and memory cleanup is not properly handled. Other reported leaks are in Galera library and should be fixed there.
MariaDB · Sep 24, 2020 · a50ce94 · a50ce94
1 parent 8370a38
commit a50ce94
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
@@ -1900,13 +1900,10 @@ extern "C" void unireg_abort(int exit_code)
     WSREP_INFO("Some threads may fail to exit.");
   }
 
-  if (WSREP_ON)
+  if (WSREP_ON && wsrep_inited)
   {
-    /* In bootstrap mode we deinitialize wsrep here. */
-    if (opt_bootstrap || wsrep_recovery)
-    {
-      if (wsrep_inited) wsrep_deinit(true);
-    }
+    wsrep_deinit(true);
+    wsrep_deinit_server();
   }
 #endif // WITH_WSREP