bzr push into mysql-5.5-merge branch (davi:3215 to 3216) Bug#45288

[Davi Arnaut]

 3216 Davi Arnaut	2010-09-24
      Bug#45288: pb2 returns a lot of compilation warnings on linux
      
      Use UNINIT_VAR workaround instead of LINT_INIT. The former is
      also used in non-debug builds as it doesn't cause changes.

    modified:
      mysys/my_getopt.c
 3215 Dmitry Lenev	2010-09-24
      Fix compile warning about passing NULL to non-pointer
      argument of inline_mysql_mutex_init in sql_base.cc.
      
      When initializing LOCK_dd_owns_lock_open mutex pass
      correct PSI key instead of NULL value.
     @ mysql-test/suite/perfschema/r/dml_setup_instruments.result
        Updated test results after adding P_S instrumentation
        for LOCK_dd_owns_lock_open.
     @ sql/sql_base.cc
        When initializing LOCK_dd_owns_lock_open mutex pass
        correct PSI key instead of NULL value.

    modified:
      mysql-test/suite/perfschema/r/dml_setup_instruments.result
      sql/sql_base.cc
=== 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-24 20:04:36 +0000
@@ -153,7 +153,7 @@ int handle_options(int *argc, char ***ar
 		   const struct my_option *longopts,
                    my_get_one_option get_one_option)
 {
-  uint opt_found, argvpos= 0, length;
+  uint UNINIT_VAR(opt_found), argvpos= 0, length;
   my_bool end_of_options= 0, must_be_var, set_maximum_value,
           option_is_loose;
   char **pos, **pos_end, *optend, *opt_str, key_name[FN_REFLEN];
@@ -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);


Attachment: [text/bzr-bundle] bzr/[e-mail]