From 5298e21c32666f558b2ecdfee12df493d87d4e07 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@mariadb.com>
Date: Sun, 30 Nov 2014 00:12:45 -0500
Subject: [PATCH] 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 f15fa1769c6..df794f5afab 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);
   }