Skip to content

Commit 2a1470a

Browse files
committed
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 parent c877610 commit 2a1470a

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

sql/mysqld.cc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5040,11 +5040,6 @@ a file name for --log-bin-index option", opt_binlog_index_name);
50405040
}
50415041
plugins_are_initialized= TRUE; /* Don't separate from init function */
50425042

5043-
#ifdef WITH_WSREP
5044-
if (WSREP_ON && wsrep_check_opts())
5045-
global_system_variables.wsrep_on= 0;
5046-
#endif
5047-
50485043
/* we do want to exit if there are any other unknown options */
50495044
if (remaining_argc > 1)
50505045
{
@@ -5607,6 +5602,9 @@ int mysqld_main(int argc, char **argv)
56075602
set_user(mysqld_user, user_info);
56085603
}
56095604

5605+
if (WSREP_ON && wsrep_check_opts())
5606+
global_system_variables.wsrep_on= 0;
5607+
56105608
if (opt_bin_log && !global_system_variables.server_id)
56115609
{
56125610
SYSVAR_AUTOSIZE(global_system_variables.server_id, ::server_id= 1);

0 commit comments

Comments
 (0)