From bd76a4babae24edc1638beaf1442d3d77d55835d Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Tue, 15 Mar 2005 15:54:57 -0800
Subject: Fix handling of the -e flag to my_print_defaults. (Bug #9136)

---
 mysys/default.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'mysys')

diff --git a/mysys/default.c b/mysys/default.c
index 5f554ac36f6..ac6d689d735 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -144,7 +144,7 @@ int load_defaults(const char *conf_file, const char **groups,
                   int *argc, char ***argv)
 {
   DYNAMIC_ARRAY args;
-  const char **dirs, *forced_default_file;
+  const char **dirs, *forced_default_file, *forced_extra_defaults;
   TYPELIB group;
   my_bool found_print_defaults=0;
   uint args_used=0;
@@ -174,13 +174,14 @@ int load_defaults(const char *conf_file, const char **groups,
   }
 
   get_defaults_files(*argc, *argv,
-                      (char **)&forced_default_file, &defaults_extra_file);
+                      (char **)&forced_default_file,
+                      (char **)&forced_extra_defaults);
   if (forced_default_file)
     forced_default_file= strchr(forced_default_file,'=')+1;
-  if (defaults_extra_file)
-    defaults_extra_file= strchr(defaults_extra_file,'=')+1;
+  if (forced_extra_defaults)
+    defaults_extra_file= strchr(forced_extra_defaults,'=')+1;
 
-  args_used+= (forced_default_file ? 1 : 0) + (defaults_extra_file ? 1 : 0);
+  args_used+= (forced_default_file ? 1 : 0) + (forced_extra_defaults ? 1 : 0);
 
   group.count=0;
   group.name= "defaults";
-- 
cgit v1.2.1