database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

wsrep: check options as early as possible

Browse Source 
to be able disable wsrep before any further code that uses it
(e.g. initialized binlog when wsrep is enabled)
This commit is contained in:
Sergei Golubchik
2015-02-06 16:16:38 +01:00
parent c877610e16
commit 2a1470a0ed
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/mysqld.cc
View File

@@ -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);