Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/cps/mysql/devel/im/default_patch/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union

BitKeeper/etc/logging_ok

@@ -151,6 +151,7 @@ pem@per-erik-martins-dator.local
 peter@linux.local
 peter@mysql.com
 peterg@mysql.com
+petr@mysql.com
 pgulutzan@linux.local
 pmartin@build.mysql2.com
 psergey@psergey-rh8.(none)

mysys/default.c

@@ -119,8 +119,6 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
   int error= 0;
   DBUG_ENTER("search_files");
 
-  args_used= 0;
-
   /* Check if we want to force the use a specific default file */
   forced_default_file= 0;
   if (*argc >= 2)
@@ -128,12 +126,12 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
     if (is_prefix(argv[0][1],"--defaults-file="))
     {
       forced_default_file= strchr(argv[0][1],'=') + 1;
-      *args_used++;
+      (*args_used)++;
     }
     else if (is_prefix(argv[0][1],"--defaults-extra-file="))
     {
       defaults_extra_file= strchr(argv[0][1],'=') + 1;
-      *args_used++;
+      (*args_used)++;
     }
   }