bzr push into mysql-next-mr-bugfixing branch (marc.alff:3240 to 3241)

[Marc Alff]

 3241 Marc Alff	2010-06-08 [merge]
      Merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing

    modified:
      mysys/my_init.c
 3240 Davi Arnaut	2010-06-07
      Post-merge fixes for WL#4783
     @ client/mysqlbinlog.cc
        Do not close stdout, it wasn't opened via my_fopen and we don't
        want to close it anyway. result_file is set to stdout by default.

    modified:
      client/mysqlbinlog.cc
=== modified file 'mysys/my_init.c'
--- a/mysys/my_init.c	2010-05-28 22:53:26 +0000
+++ b/mysys/my_init.c	2010-06-08 12:41:48 +0000
@@ -104,8 +104,6 @@ my_bool my_basic_init(void)
   mysql_stdin= & instrumented_stdin;
 
 #if defined(THREAD)
-  if (my_thread_global_init())
-    return 1;
 #  if defined(SAFE_MUTEX)
   safe_mutex_global_init();		/* Must be called early */
 #  endif


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