diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 14:32:57 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 14:32:57 -0400 |
| commit | 99df0fbad5147b02ffed926f50cef11f9427e398 (patch) | |
| tree | 08db15074e1dde87aeea0c24284bf93e36e35460 /sql/wsrep_sst.cc | |
| parent | 8a6f4e198a57491bac8cc2aac0f3d455a28d79cd (diff) | |
| download | mariadb-git-99df0fbad5147b02ffed926f50cef11f9427e398.tar.gz | |
bzr merge -r3968..3984 codership/5.5 (non-Innodb changes only).
Diffstat (limited to 'sql/wsrep_sst.cc')
| -rw-r--r-- | sql/wsrep_sst.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 0d767106fe9..9b81e0fe22d 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -113,7 +113,7 @@ bool wsrep_sst_receive_address_check (sys_var *self, THD* thd, set_var* var) return 0; } -bool wsrep_sst_receive_address_update (sys_var *self, THD* thd, +bool wsrep_sst_receive_address_update (sys_var *self, THD* thd, enum_var_type type) { return 0; @@ -138,7 +138,7 @@ static bool sst_auth_real_set (const char* value) { my_free ((void*)wsrep_sst_auth); wsrep_sst_auth = my_strdup(WSREP_SST_AUTH_MASK, MYF(0)); - //strncpy (wsrep_sst_auth, WSREP_SST_AUTH_MASK, + //strncpy (wsrep_sst_auth, WSREP_SST_AUTH_MASK, // sizeof(wsrep_sst_auth) - 1); } else @@ -763,9 +763,11 @@ static int sst_donate_mysqldump (const char* addr, WSREP_SST_OPT_PORT" '%s' " WSREP_SST_OPT_LPORT" '%u' " WSREP_SST_OPT_SOCKET" '%s' " + WSREP_SST_OPT_CONF" '%s' " WSREP_SST_OPT_GTID" '%s:%lld'" "%s", - user, pswd, host, port, mysqld_port, mysqld_unix_port, uuid_str, + user, pswd, host, port, mysqld_port, mysqld_unix_port, + wsrep_defaults_file, uuid_str, (long long)seqno, bypass ? " "WSREP_SST_OPT_BYPASS : ""); WSREP_DEBUG("Running: '%s'", cmd_str); @@ -799,7 +801,7 @@ static int run_sql_command(THD *thd, const char *query) int const err= thd->get_stmt_da()->sql_errno(); WSREP_WARN ("error executing '%s': %d (%s)%s", query, err, thd->get_stmt_da()->message(), - err == ER_UNKNOWN_SYSTEM_VARIABLE ? + err == ER_UNKNOWN_SYSTEM_VARIABLE ? ". Was mysqld built with --with-innodb-disallow-writes ?" : ""); thd->clear_error(); return -1; |