diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-08-21 17:17:30 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-08-21 17:17:30 +0300 |
| commit | fca065f95c3f62b0f6ec8448f7dcda40d73eb433 (patch) | |
| tree | 8d477005bfd14f335d91d8c66c0632f64c7599cb /sql/wsrep_sst.cc | |
| parent | 2db87f65167c389c191336672e7ae1ddc65c8436 (diff) | |
| download | mariadb-git-fca065f95c3f62b0f6ec8448f7dcda40d73eb433.tar.gz | |
Merged with lp:~codership/codership-mysql/5.5-23, up to revision 3903
Diffstat (limited to 'sql/wsrep_sst.cc')
| -rw-r--r-- | sql/wsrep_sst.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 5aca1de6d0e..204a937ea8f 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -45,8 +45,9 @@ extern const char wsrep_defaults_file[]; #define WSREP_SST_OPT_BYPASS "--bypass" #define WSREP_SST_MYSQLDUMP "mysqldump" +#define WSREP_SST_RSYNC "rsync" #define WSREP_SST_SKIP "skip" -#define WSREP_SST_DEFAULT WSREP_SST_MYSQLDUMP +#define WSREP_SST_DEFAULT WSREP_SST_RSYNC #define WSREP_SST_ADDRESS_AUTO "AUTO" #define WSREP_SST_AUTH_MASK "********" @@ -691,9 +692,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_DATA" '%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, + mysql_real_data_home, uuid_str, (long long)seqno, bypass ? " "WSREP_SST_OPT_BYPASS : ""); WSREP_DEBUG("Running: '%s'", cmd_str); @@ -747,8 +750,8 @@ static int sst_flush_tables(THD* thd) else { /* make sure logs are flushed after global read lock acquired */ - err= reload_acl_and_cache(thd, REFRESH_ENGINE_LOG, - (TABLE_LIST*) 0, ¬_used); + err= reload_acl_and_cache(thd, REFRESH_ENGINE_LOG, + (TABLE_LIST*) 0, ¬_used); } if (err) |