diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-09-26 15:54:42 +0200 |
|---|---|---|
| committer | Daniel Black <grooverdan@users.sourceforge.net> | 2018-01-14 22:48:02 +1100 |
| commit | 943c62a5d4729786cb310f4a6af226184eb26196 (patch) | |
| tree | 7809f173f5e8d923b95ee139bac243ec2ce15196 /sql/wsrep_sst.h | |
| parent | d7b2bc98bf55dded58e4d5d4a19e4aa48b30b26b (diff) | |
| download | mariadb-git-943c62a5d4729786cb310f4a6af226184eb26196.tar.gz | |
Backport 4bb49d84a9df, correct handling on defaults[-extra]-file is SST scripts
(from 10.1 to 10.0-galera)
This conflicted signficantly with 7d550c76be13c58551e203f4eeb4f87ebd58ba4b
which added --defaults-group-suffix support.
Took the approach of 4bb49d84a9df and adapted the
--defaults-group-suffix handling to be consistent.
The following changes as follows:
SST scripts now use $MY_PRINT_DEFAULTS rather than the lowercase for
consistency and this include all required --default arguements.
Backport/merge by Daniel Black <daniel@linux.vnet.ibm.com>
Diffstat (limited to 'sql/wsrep_sst.h')
| -rw-r--r-- | sql/wsrep_sst.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/wsrep_sst.h b/sql/wsrep_sst.h index 42f1055bde2..631480e7986 100644 --- a/sql/wsrep_sst.h +++ b/sql/wsrep_sst.h @@ -25,6 +25,7 @@ #define WSREP_SST_OPT_DATA "--datadir" #define WSREP_SST_OPT_CONF "--defaults-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" |