List:Commits« Previous MessageNext Message »
From:Marc Alff Date:September 2 2010 1:43am
Subject:bzr push into mysql-trunk-bugfixing branch (marc.alff:3255 to 3256)
View as plain text  
 3256 Marc Alff	2010-09-01 [merge]
      Merge mysql-5.5-bugfixing --> mysql-trunk-bugfixing

    modified:
      mysys/my_getopt.c
 3255 Alexey Botchkov	2010-09-01 [merge]
      merging.

    modified:
      libmysqld/Makefile.am
=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c	2010-08-26 14:54:39 +0000
+++ b/mysys/my_getopt.c	2010-09-02 01:43:11 +0000
@@ -163,7 +163,6 @@ int handle_options(int *argc, char ***ar
   int error, i;
   my_bool is_cmdline_arg= 1;
 
-  LINT_INIT(opt_found);
   /* handle_options() assumes arg0 (program name) always exists */
   DBUG_ASSERT(argc && *argc >= 1);
   DBUG_ASSERT(argv && *argv);
@@ -188,6 +187,7 @@ int handle_options(int *argc, char ***ar
   {
     char **first= pos;
     char *cur_arg= *pos;
+    opt_found= 0;
     if (!is_cmdline_arg && (cur_arg == args_separator))
     {
       is_cmdline_arg= 1;


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100902014311-55yyi2ln74e24p36.bundle
Thread
bzr push into mysql-trunk-bugfixing branch (marc.alff:3255 to 3256) Marc Alff2 Sep