File tree Expand file tree Collapse file tree 1 file changed +3
-5
lines changed Expand file tree Collapse file tree 1 file changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -5040,11 +5040,6 @@ a file name for --log-bin-index option", opt_binlog_index_name);
5040
5040
}
5041
5041
plugins_are_initialized= TRUE ; /* Don't separate from init function */
5042
5042
5043
- #ifdef WITH_WSREP
5044
- if (WSREP_ON && wsrep_check_opts ())
5045
- global_system_variables.wsrep_on = 0 ;
5046
- #endif
5047
-
5048
5043
/* we do want to exit if there are any other unknown options */
5049
5044
if (remaining_argc > 1 )
5050
5045
{
@@ -5607,6 +5602,9 @@ int mysqld_main(int argc, char **argv)
5607
5602
set_user (mysqld_user, user_info);
5608
5603
}
5609
5604
5605
+ if (WSREP_ON && wsrep_check_opts ())
5606
+ global_system_variables.wsrep_on = 0 ;
5607
+
5610
5608
if (opt_bin_log && !global_system_variables.server_id )
5611
5609
{
5612
5610
SYSVAR_AUTOSIZE (global_system_variables.server_id , ::server_id= 1 );
You can’t perform that action at this time.
0 commit comments