[Commits] 5298e21: MDEV-6961: mysqld should terminate when started with --wsrep-recover

nirbhay at mariadb.com nirbhay at mariadb.com
Sun Nov 30 07:13:45 EET 2014


revision-id: 5298e21c32666f558b2ecdfee12df493d87d4e07
parent(s): f7708d683036a1471bcdaa25580ac995edfa9f49
committer: Nirbhay Choubey
branch nick: server
timestamp: 2014-11-30 00:12:45 -0500
message:

MDEV-6961: mysqld should terminate when started with --wsrep-recover

Fixed the condition to make sure mysqld process terminates when
started with wsrep-recover.

---
 sql/mysqld.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index f15fa17..df794f5 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5620,10 +5620,11 @@ int mysqld_main(int argc, char **argv)
   }
 #endif
 
-  if (WSREP_ON && wsrep_recovery)
+  // Recover and exit.
+  if (wsrep_recovery)
   {
     select_thread_in_use= 0;
-    wsrep_recover();
+    if (WSREP_ON) wsrep_recover();
     unireg_abort(0);
   }
 


More information about the commits mailing list