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>

1 files changed, 0 insertions, 25 deletions

diff --git a/mysys/my_default.c b/mysys/my_default.c
index d63090f95e1..03cfa973b2c 100644
--- a/mysys/my_default.c
+++ b/mysys/my_default.c
@@ -88,15 +88,6 @@ static char my_defaults_extra_file_buffer[FN_REFLEN];
 
 static my_bool defaults_already_read= FALSE;
 
-#ifdef WITH_WSREP
-/*
-  The only purpose of this global array is to hold full name of my.cnf
-  which seems to be otherwise unavailable.
-*/
-char wsrep_defaults_file[FN_REFLEN + 10]= {0,};
-char wsrep_defaults_group_suffix[FN_EXTLEN]= {0,};
-#endif /* WITH_WSREP */
-
 /* Which directories are searched for options (and in which order) */
 
 #define MAX_DEFAULT_DIRS 7
@@ -442,16 +433,6 @@ int get_defaults_options(int argc, char **argv,
     if (!*group_suffix && is_prefix(*argv, "--defaults-group-suffix="))
     {
       *group_suffix= *argv + sizeof("--defaults-group-suffix=")-1;
-
-#ifdef WITH_WSREP
-      /* make sure we do this only once - for top-level file */
-      if ('\0' == wsrep_defaults_group_suffix[0])
-      {
-        strncpy(wsrep_defaults_group_suffix, *group_suffix,
-                sizeof(wsrep_defaults_group_suffix) - 1);
-      }
-#endif /* WITH_WSREP */
-
       argc--;
       continue;
     }
@@ -823,12 +804,6 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
   if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
     return 1;					/* Ignore wrong files */
 
-#ifdef WITH_WSREP
-  /* make sure we do this only once - for top-level file */
-  if ('\0' == wsrep_defaults_file[0])
-    strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1);
-#endif /* WITH_WSREP */
-
   while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
   {
     line++;