From 943c62a5d4729786cb310f4a6af226184eb26196 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 26 Sep 2014 15:54:42 +0200 Subject: 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 --- sql/wsrep_sst.h | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/wsrep_sst.h') 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" -- cgit v1.2.1