diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 3 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 3 | ||||
| -rw-r--r-- | sql/wsrep_mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/wsrep_sst.cc | 5 | ||||
| -rw-r--r-- | sql/wsrep_utils.h | 3 |
5 files changed, 6 insertions, 10 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6f0f517eade..981b76ec210 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5532,7 +5532,8 @@ static int init_server_components() initialized. This initialization was not possible before, as plugins (and thus some global system variables) are initialized after wsrep startup threads are created. - Note: This only needs to be done for rsync, xtrabackup based SST methods. + Note: This only needs to be done for rsync and mariabackup based SST + methods. */ if (wsrep_before_SE()) wsrep_plugins_post_init(); diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 369c9a6222a..7be30c97d2f 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -5352,8 +5352,7 @@ static Sys_var_charptr sys_wsrep_sst_method( "wsrep_sst_method", "State snapshot transfer method", GLOBAL_VAR(wsrep_sst_method),CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET, DEFAULT(WSREP_SST_DEFAULT), NO_MUTEX_GUARD, NOT_IN_BINLOG, - ON_CHECK(wsrep_sst_method_check), - ON_UPDATE(wsrep_sst_method_update)); + ON_CHECK(wsrep_sst_method_check)); static Sys_var_charptr Sys_wsrep_sst_receive_address( "wsrep_sst_receive_address", "Address where node is waiting for " diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index e60fa94ba2a..e0bb24266a4 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -825,7 +825,7 @@ void wsrep_init_startup (bool first) Pre-initialize global_system_variables.table_plugin with a dummy engine (placeholder) required during the initialization of wsrep threads (THDs). (see: plugin_thdvar_init()) - Note: This only needs to be done for rsync & xtrabackup based SST methods. + Note: This only needs to be done for rsync & mariabackup based SST methods. In case of mysqldump SST method, the wsrep threads are created after the server plugins & global system variables are initialized. */ diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 7a542ab88f1..902d78a2f33 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -60,11 +60,6 @@ bool wsrep_sst_method_check (sys_var *self, THD* thd, set_var* var) return 0; } -bool wsrep_sst_method_update (sys_var *self, THD* thd, enum_var_type type) -{ - return 0; -} - static const char* data_home_dir = NULL; void wsrep_set_data_home_dir(const char *data_dir) diff --git a/sql/wsrep_utils.h b/sql/wsrep_utils.h index 277cea9dc31..0afca96ea41 100644 --- a/sql/wsrep_utils.h +++ b/sql/wsrep_utils.h @@ -108,7 +108,8 @@ private: /* Hostname with port (host:port) */ start= addr_in; end= colon; - parse_port(colon + 1); + if (parse_port(colon + 1)) + return; /* Error: invalid port */ break; default: /* IPv6 address */ |