diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-02-03 08:09:06 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-03 08:09:06 +0100 |
commit | c383418cbf754c654a9a705ddb73a107e390ecb2 (patch) | |
tree | c67137c7c6a016474c4febde3ac52bc61934068d /sql/wsrep_sst.h | |
parent | f69a3b2e920a9409d33c0f36227cb42b1ec5a332 (diff) | |
parent | c7e5feb2596e2a032207191320dbf1387d440959 (diff) | |
download | mariadb-git-c383418cbf754c654a9a705ddb73a107e390ecb2.tar.gz |
Merge branch 'github/10.0-galera' into 10.1
Diffstat (limited to 'sql/wsrep_sst.h')
-rw-r--r-- | sql/wsrep_sst.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/wsrep_sst.h b/sql/wsrep_sst.h index 49dd5b39fad..dcf0ff22651 100644 --- a/sql/wsrep_sst.h +++ b/sql/wsrep_sst.h @@ -27,7 +27,8 @@ #define WSREP_SST_OPT_AUTH "--auth" #define WSREP_SST_OPT_DATA "--datadir" #define WSREP_SST_OPT_CONF "--defaults-file" -#define WSREP_SST_OPT_EXTRA_CONF "--defaults-extra-file" +#define WSREP_SST_OPT_CONF_SUFFIX "--defaults-group-suffix" +#define WSREP_SST_OPT_CONF_EXTRA "--defaults-extra-file" #define WSREP_SST_OPT_PARENT "--parent" #define WSREP_SST_OPT_BINLOG "--binlog" |