From: Date: March 16 2005 12:55am
Subject: bk commit into 4.1 tree (jimw:1.2119) BUG#9136
List-Archive: http://lists.mysql.com/internals/23065
X-Bug: 9136
Message-Id: <20050315235501.02C4AA8A71@rama.trainedmonkey.com>

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2119 05/03/15 15:54:57 jimw@stripped +1 -0
  Fix handling of the -e flag to my_print_defaults. (Bug #9136)

  mysys/default.c
    1.48 05/03/15 15:54:55 jimw@stripped +6 -5
    Don't automatically reset defaults_extra_file in load_defaults(),
    only update it based on it appearing as a command-line option.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-9136

--- 1.47/mysys/default.c	2005-02-25 05:28:37 -08:00
+++ 1.48/mysys/default.c	2005-03-15 15:54:55 -08:00
@@ -144,7 +144,7 @@
                   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 @@
   }
 
   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";