bk commit into 5.0 tree (ramil:1.1932) BUG#12917

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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.1932 05/09/01 13:37:11 ramil@stripped +1 -0
  a fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).

  mysys/default.c
    1.78 05/09/01 13:37:02 ramil@stripped +6 -4
    a fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
    we should use global 'defaults_extra_file' instead of local 'forced_extra_defaults'
    as we use it widely in the default.c

# 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:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/mysql-5.0

--- 1.77/mysys/default.c	2005-07-29 07:06:31 +05:00
+++ 1.78/mysys/default.c	2005-09-01 13:37:02 +05:00
@@ -116,22 +116,24 @@
     0  ok
     1  given cinf_file doesn't exist
 
-    The global variable 'defaults_group_suffix' is updated with value for
-    --defaults_group_suffix
+    The global variable 'defaults_group_suffix' is updated with value of
+    --defaults-group-suffix.
+    The global variable 'defaults_extra_file' is updated with value of
+    --defaults-extra-file.
 */
 
 int my_search_option_files(const char *conf_file, int *argc, char ***argv,
                            uint *args_used, Process_option_func func,
                            void *func_ctx)
 {
-  const char **dirs, *forced_default_file, *forced_extra_defaults;
+  const char **dirs, *forced_default_file;
   int error= 0;
   DBUG_ENTER("my_search_option_files");
 
   /* Check if we want to force the use a specific default file */
   *args_used+= get_defaults_options(*argc - *args_used, *argv + *args_used,
                                     (char **) &forced_default_file,
-                                    (char **) &forced_extra_defaults,
+                                    (char **) &defaults_extra_file,
                                     (char **) &defaults_group_suffix);
 
   if (! defaults_group_suffix)