wsrep: check options as early as possible

to be able disable wsrep before any further code that uses it
(e.g. initialized binlog when wsrep is enabled)

1 files changed, 3 insertions, 5 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 6d8305dea91..e0d532b76d5 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5040,11 +5040,6 @@ a file name for --log-bin-index option", opt_binlog_index_name);
   }
   plugins_are_initialized= TRUE;  /* Don't separate from init function */
 
-#ifdef WITH_WSREP
-  if (WSREP_ON && wsrep_check_opts())
-    global_system_variables.wsrep_on= 0;
-#endif
-
   /* we do want to exit if there are any other unknown options */
   if (remaining_argc > 1)
   {
@@ -5607,6 +5602,9 @@ int mysqld_main(int argc, char **argv)
       set_user(mysqld_user, user_info);
   }
 
+  if (WSREP_ON && wsrep_check_opts())
+    global_system_variables.wsrep_on= 0;
+
   if (opt_bin_log && !global_system_variables.server_id)
   {
     SYSVAR_AUTOSIZE(global_system_variables.server_id, ::server_id= 1);