bzr push into mysql-5.5-bugfixing branch (marc.alff:3200 to 3201) Bug#55873

[Marc Alff]

 3201 Marc Alff	2010-09-01
      Bug#55873 short startup options do not work in 5.5
      
      Merge cleanup, fixed a build warning:
      
      my_getopt.c:156: warning: 'opt_found' may be used uninitialized in this function

    modified:
      mysys/my_getopt.c
 3200 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:34:18 +0000
+++ b/mysys/my_getopt.c	2010-09-02 01:13:24 +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/[e-mail]