diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-10 16:33:57 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-10 16:33:57 -0400 |
| commit | 90ead99572c8168583cb0943792d964cc2a6abd2 (patch) | |
| tree | 715afd1c1bccbca66eee3c3b58f8e6589f53fe37 /sql/wsrep_sst.cc | |
| parent | b441c510a7ea731e2da0fa9b4cf3e7f1275f841b (diff) | |
| download | mariadb-git-90ead99572c8168583cb0943792d964cc2a6abd2.tar.gz | |
bzr merge -r3980..3984 codership/5.5
Diffstat (limited to 'sql/wsrep_sst.cc')
| -rw-r--r-- | sql/wsrep_sst.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 37c55707b28..1b57b63131c 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -110,7 +110,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; @@ -135,7 +135,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 @@ -717,10 +717,11 @@ static int sst_donate_mysqldump (const char* addr, WSREP_SST_OPT_LPORT" '%u' " WSREP_SST_OPT_SOCKET" '%s' " WSREP_SST_OPT_DATA" '%s' " + WSREP_SST_OPT_CONF" '%s' " WSREP_SST_OPT_GTID" '%s:%lld'" "%s", user, pswd, host, port, mysqld_port, mysqld_unix_port, - mysql_real_data_home, uuid_str, + mysql_real_data_home, wsrep_defaults_file, uuid_str, (long long)seqno, bypass ? " "WSREP_SST_OPT_BYPASS : ""); WSREP_DEBUG("Running: '%s'", cmd_str); @@ -754,7 +755,7 @@ static int run_sql_command(THD *thd, const char *query) int const err= thd->stmt_da->sql_errno(); WSREP_WARN ("error executing '%s': %d (%s)%s", query, err, thd->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; |