cleanup: wsrep_check_opts

sql/mysqld.cc

@@ -4142,15 +4142,6 @@ static int init_common_variables()
                      SQLCOM_END + 8);
 #endif
 
-#ifdef WITH_WSREP
-  /*
-    This is a protection against mutually incompatible option values.
-    Note WSREP_ON == global_system_variables.wsrep_on
-  */
-  if (WSREP_ON && wsrep_check_opts (remaining_argc, remaining_argv))
-    global_system_variables.wsrep_on= 0;
-#endif /* WITH_WSREP */
-
   if (get_options(&remaining_argc, &remaining_argv))
     return 1;
   set_server_version();
@@ -4990,6 +4981,9 @@ a file name for --log-bin-index option", opt_binlog_index_name);
   }
   plugins_are_initialized= TRUE;  /* Don't separate from init function */
 
+  if (wsrep_check_opts())
+    unireg_abort(1);
+
   /* we do want to exit if there are any other unknown options */
   if (remaining_argc > 1)
   {

sql/wsrep_mysqld.h

@@ -152,8 +152,8 @@ extern void wsrep_kill_mysql(THD *thd);
 /* new defines */
 extern void wsrep_stop_replication(THD *thd);
 extern bool wsrep_start_replication();
-extern bool wsrep_sync_wait (THD* thd, uint mask = WSREP_SYNC_WAIT_BEFORE_READ);
-extern int  wsrep_check_opts (int argc, char* const* argv);
+extern bool wsrep_sync_wait(THD* thd, uint mask = WSREP_SYNC_WAIT_BEFORE_READ);
+extern int  wsrep_check_opts();
 extern void wsrep_prepend_PATH (const char* path);
 /* some inline functions are defined in wsrep_mysqld_inl.h */