summaryrefslogtreecommitdiff
path: root/sql/wsrep_mysqld.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-09-28 16:43:44 +0200
committerSergei Golubchik <serg@mariadb.org>2014-10-01 23:48:35 +0200
commitb3469520a1b838f08cbebaa8047f2bd3f58fef89 (patch)
treef5d7ea31eb3ee0cbbc3e7625c6601c6516dc5efe /sql/wsrep_mysqld.cc
parenteaec266eb16c8f02835f76ac987fca5de4debd51 (diff)
downloadmariadb-git-b3469520a1b838f08cbebaa8047f2bd3f58fef89.tar.gz
cleanup: remove OPT_WSREP_START_POSITION and OPT_WSREP_SST_AUTH
there is no reason to initialize wsrep start position and auth from inside the get_one_option() callback
Diffstat (limited to 'sql/wsrep_mysqld.cc')
-rw-r--r--sql/wsrep_mysqld.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 8dc9c776def..2897bb3fb69 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -572,6 +572,11 @@ int wsrep_init()
int rcode= -1;
DBUG_ASSERT(wsrep_inited == 0);
+ if (strcmp(wsrep_start_position, WSREP_START_POSITION_ZERO))
+ wsrep_start_position_init(wsrep_start_position);
+
+ wsrep_sst_auth_init(wsrep_sst_auth);
+
wsrep_causal_reads_update(&global_system_variables);
mysql_mutex_register("sql", wsrep_mutexes, array_elements(wsrep_mutexes));