database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

cleanup: remove OPT_WSREP_START_POSITION and OPT_WSREP_SST_AUTH

Browse Source 
there is no reason to initialize wsrep start position
and auth from inside the get_one_option() callback
This commit is contained in:
Sergei Golubchik
2014-09-28 16:43:44 +02:00
parent eaec266eb1
commit b3469520a1
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/mysqld.cc
View File

@ -8772,12 +8772,6 @@ mysqld_get_one_option(int optid,
case OPT_LOWER_CASE_TABLE_NAMES: case OPT_LOWER_CASE_TABLE_NAMES:
lower_case_table_names_used= 1; lower_case_table_names_used= 1;
break; break;
case OPT_WSREP_START_POSITION:
wsrep_start_position_init (argument);
break;
case OPT_WSREP_SST_AUTH:
wsrep_sst_auth_init (argument);
break;
#if defined(ENABLED_DEBUG_SYNC) #if defined(ENABLED_DEBUG_SYNC)
case OPT_DEBUG_SYNC_TIMEOUT: case OPT_DEBUG_SYNC_TIMEOUT:
/* /*

2
sql/mysqld.h
View File

@ -599,8 +599,6 @@ enum options_mysqld
OPT_WANT_CORE, OPT_WANT_CORE,
OPT_MYSQL_COMPATIBILITY, OPT_MYSQL_COMPATIBILITY,
OPT_MYSQL_TO_BE_IMPLEMENTED, OPT_MYSQL_TO_BE_IMPLEMENTED,
OPT_WSREP_START_POSITION,
OPT_WSREP_SST_AUTH,
OPT_which_is_always_the_last OPT_which_is_always_the_last
}; };
#endif #endif

4
sql/sys_vars.cc
View File

@ -4553,7 +4553,7 @@ static Sys_var_charptr Sys_wsrep_sst_receive_address(
static Sys_var_charptr Sys_wsrep_sst_auth( static Sys_var_charptr Sys_wsrep_sst_auth(
"wsrep_sst_auth", "Authentication for SST connection", "wsrep_sst_auth", "Authentication for SST connection",
PREALLOCATED GLOBAL_VAR(wsrep_sst_auth), CMD_LINE(REQUIRED_ARG, OPT_WSREP_SST_AUTH), PREALLOCATED GLOBAL_VAR(wsrep_sst_auth), CMD_LINE(REQUIRED_ARG),
IN_SYSTEM_CHARSET, DEFAULT(NULL), NO_MUTEX_GUARD, IN_SYSTEM_CHARSET, DEFAULT(NULL), NO_MUTEX_GUARD,
NOT_IN_BINLOG, NOT_IN_BINLOG,
ON_CHECK(wsrep_sst_auth_check), ON_CHECK(wsrep_sst_auth_check),
@ -4582,7 +4582,7 @@ static Sys_var_mybool Sys_wsrep_on (
static Sys_var_charptr Sys_wsrep_start_position ( static Sys_var_charptr Sys_wsrep_start_position (
"wsrep_start_position", "global transaction position to start from ", "wsrep_start_position", "global transaction position to start from ",
PREALLOCATED GLOBAL_VAR(wsrep_start_position), PREALLOCATED GLOBAL_VAR(wsrep_start_position),
CMD_LINE(REQUIRED_ARG, OPT_WSREP_START_POSITION), CMD_LINE(REQUIRED_ARG),
IN_SYSTEM_CHARSET, DEFAULT(WSREP_START_POSITION_ZERO), IN_SYSTEM_CHARSET, DEFAULT(WSREP_START_POSITION_ZERO),
NO_MUTEX_GUARD, NOT_IN_BINLOG, NO_MUTEX_GUARD, NOT_IN_BINLOG,
ON_CHECK(wsrep_start_position_check), ON_CHECK(wsrep_start_position_check),

5
sql/wsrep_hton.cc
View File

@ -66,10 +66,11 @@ handlerton *wsrep_hton;
*/ */
void wsrep_register_hton(THD* thd, bool all) void wsrep_register_hton(THD* thd, bool all)
{ {
if (thd->wsrep_exec_mode != TOTAL_ORDER && !thd->wsrep_apply_toi) if (WSREP(thd) && thd->wsrep_exec_mode != TOTAL_ORDER &&
!thd->wsrep_apply_toi)
{ {
THD_TRANS *trans=all ? &thd->transaction.all : &thd->transaction.stmt; THD_TRANS *trans=all ? &thd->transaction.all : &thd->transaction.stmt;
for (Ha_trx_info *i= trans->ha_list; WSREP(thd) && i; i = i->next()) for (Ha_trx_info *i= trans->ha_list; i; i = i->next())
{ {
if ((i->ht()->db_type == DB_TYPE_INNODB) || if ((i->ht()->db_type == DB_TYPE_INNODB) ||
(i->ht()->db_type == DB_TYPE_TOKUDB)) (i->ht()->db_type == DB_TYPE_TOKUDB))

5
sql/wsrep_mysqld.cc
View File

@ -572,6 +572,11 @@ int wsrep_init()
int rcode= -1; int rcode= -1;
DBUG_ASSERT(wsrep_inited == 0); 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); wsrep_causal_reads_update(&global_system_variables);
mysql_mutex_register("sql", wsrep_mutexes, array_elements(wsrep_mutexes)); mysql_mutex_register("sql", wsrep_mutexes, array_elements(wsrep_mutexes));