List:Internals« Previous MessageNext Message »
From:sinisa Date:February 19 2005 5:51pm
Subject:bk commit into 4.1 tree (Sinisa:1.2176)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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.2176 05/02/19 19:51:47 Sinisa@stripped +1 -0
  fix for a bug with my_print_defaults with --defaults-extra-file= option

  extra/my_print_defaults.c
    1.18 05/02/19 19:51:33 Sinisa@stripped +13 -5
    fix for a bug with my_print_defaults with --defaults-extra-file= 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.17/extra/my_print_defaults.c	Tue Feb  8 19:49:26 2005
+++ 1.18/extra/my_print_defaults.c	Sat Feb 19 19:51:33 2005
@@ -120,25 +120,33 @@
   int count, error;
   char **load_default_groups, *tmp_arguments[2],
        **argument, **arguments;
+  char *defaults, *extra_defaults;
   MY_INIT(argv[0]);
 
+  get_defaults_files(argc, argv, &defaults, &extra_defaults);
+
   /*
   ** Check out the args
   */
-  if (get_options(&argc,&argv))
-    exit(1);
   if (!(load_default_groups=(char**) my_malloc((argc+2)*sizeof(char*),
 					       MYF(MY_WME))))
     exit(1);
+  if (get_options(&argc,&argv))
+    exit(1);
 
   for (count=0; *argv ; argv++,count++)
     load_default_groups[count]= *argv;
   load_default_groups[count]=0;
 
-  count=1;
+  count=0;
   arguments=tmp_arguments;
-  arguments[0]=my_progname;
-  arguments[1]=0;
+  arguments[count++]=my_progname;
+  if (extra_defaults)
+    arguments[count++]= extra_defaults;
+  if (defaults)
+    arguments[count++]= defaults;
+  arguments[count]= 0;
+
   if ((error= load_defaults(config_file, (const char **) load_default_groups,
 			   &count, &arguments)))
   {
Thread
bk commit into 4.1 tree (Sinisa:1.2176)sinisa19 Feb