bzr push into mysql-5.5-bugteam branch (tor.didriksen:3250 to 3251) Bug#52172

[Tor Didriksen]

 3251 Tor Didriksen	2010-10-19 [merge]
      automerge from 5.1-bugteam: Bug#52172 post-push fix: init auto-variable to NULL

    modified:
      dbug/dbug.c
 3250 Davi Arnaut	2010-10-18 [merge]
      Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
     @ CMakeLists.txt
        Enable the maintainer mode if debug support is enabled.
        Does not cause it to be enabled if the user explicitly
        disabled the maintainer mode.

    modified:
      CMakeLists.txt
      config/ac-macros/maintainer.m4
      configure.in
=== modified file 'dbug/dbug.c'
--- a/dbug/dbug.c	2010-10-18 11:27:52 +0000
+++ b/dbug/dbug.c	2010-10-19 07:17:26 +0000
@@ -2370,7 +2370,7 @@ static void DbugFlush(CODE_STATE *cs)
 
 void _db_flush_()
 {
-  CODE_STATE *cs;
+  CODE_STATE *cs= NULL;
   get_code_state_or_return;
   (void) fflush(cs->stack->out_file);
 }


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