From: Marc Alff
Date: June 8 2010 12:58pm
Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3240 to 3241)
List-Archive: http://lists.mysql.com/commits/110496
Message-Id: <201006081258.o58AKEB0028791@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0650590042268769307=="

--===============0650590042268769307==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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


--===============0650590042268769307==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   cleanup/
# testament_sha1: 346afaa0614848337453b1f3758c380eab137487
# timestamp: 2010-06-08 06:58:13 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing/
# base_revision_id: davi.arnaut@stripped\
#   nasq2rvfybxq58an
# 
# Begin bundle
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


--===============0650590042268769307==--