From: Marc Alff
Date: June 8 2010 12:50pm
Subject: bzr push into mysql-trunk-bugfixing branch (marc.alff:3091 to 3092) Bug#54334
List-Archive: http://lists.mysql.com/commits/110494
X-Bug: 54334
Message-Id: <201006081251.o58CFtOY028828@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2564724216105363064=="

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

 3092 Marc Alff	2010-06-08
      Bug#54334 Double initialization of mysys mutexes
      
      Prior to this fix, mysys mutexes such as THR_LOCK_lock could be initialized
      twice by a call to my_init().
      The root cause was out of place initialization in my_basic_init(),
      calling my_thread_global_init().
      
      With this fix,
      - my_basic_init() properly initializes the mutex implementation itself,
      for SAFE or FAST mutexes, and for platform dependent initializations,
      before initialiazing a mutex.
      - my_init() properly initializes mysys mutexes once,
      when making the first call to my_thread_global_init().

    modified:
      mysys/my_init.c
 3091 Davi Arnaut	2010-06-05
      Post-merge fix: header is used by the client API. Obvious in retrospect.
      Also, update a few cases missed by the initial patch.
     @ client/mysqltest.cc
        Remove trailing comma.
     @ include/my_alloc.h
        Do not use wrapper.
     @ include/mysql.h.pp
        Update ABI file.
     @ plugin/semisync/semisync_master.h
        Initialize variable.
     @ sql/debug_sync.cc
        Use C linkage.

    modified:
      client/mysqltest.cc
      include/my_alloc.h
      include/mysql.h.pp
      plugin/semisync/semisync_master.h
      sql/debug_sync.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


--===============2564724216105363064==
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-trunk-bugfixing-\
#   54334/
# testament_sha1: 6f2e027d0ab2db6a9e5a8b483bac7cbf0728d17e
# timestamp: 2010-06-08 06:50:33 -0600
# base_revision_id: davi.arnaut@stripped\
#   pt38vhutqe957kb4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeB161cAAajfgAAQWGf/939O
3IC////wUAR6t7G2Pe69NWt7y9b3CUgIRPaJoanqeRG1MTQDQ02poyaAElJqT0YyTyak9RkbRqMQ
AAAAAlCAo2kxPUxNRqHpqaB6QZANA0ASSmTQyFGjHqmmjI0AAAyAACSRExqp+Ip+FPFPUzSmn6UN
oAARkMPxqrvO/4eBXK6dSuFlsFipJWUHb3Yvg9nd0Ne3uoqqfa44teqCrINWy6RnEq/fearB77pz
f8tLw9t79ZjekanDBck07+uC8blrG/SVH9q1hJvIONkGLG3U/ROXTDeunLh60ZUHRFro4hb0LJY2
4OAgXCL36OEzQlAVZpt1q/NZkkwywrSqClaQtSudO/CuMX3azePEUP3CHDxw24kTEEgwqBFn5wRM
b1kpNJI2D3WIcXAnYo5MzTFWeTEdF1PzVTtPSlwnhZvyy5+b2pzMcnAtJC2YqaahMuiwQzF1j44X
DxHs2mY0OUMZYTLWZZh5cDaP8Ndq37JiE+0OgPrZuDcZl0qYcoVaC0qKqDEniyU0F00DIkFNDJ5k
TEhITkzTSWLIGl06Sjo4oynL60owxKrzMteJwNZphktkpbnoEocd8abEyySUIGrY9OES0uOYjVW6
jRS9pHWfzNMRIdF7TmI4C57m6VM4C0lbMrEVCiKjZUkmLrcEiTLJC0ZShKiyRiFqhGiwptcNUyaD
UlIQqbmJ4L7N69zGXt591KsPnVKy1hhteTg57l3bPb7j4X98ccq2n16GMpomb3mZalIwPnbdEOOQ
YGesz+NpP386VIUODbvOlLwArVlclXd/oJUIgEfxyDiZWC+ollCoPGfW4xpuTXsNJ5FFuDKemrz2
xRBlrRSV/UOMhhMLNA1m68Y2OCZiVSRXhvjimfVfbYYx+JXESLpvOSYgDoMzGx9GazDoqYydpia0
Cg07chLZ/JnhS00LvyBOTPjhDJXWzUteKvdNco4qKqJ7OvCU3kWjDDTJEvKJhm16oG8eKATJEV+w
03rK/ZsKB8qXGMuSYBkCz6584W9DGZcSzQSvTUrfSc1KDuw7TlMfVBedhaDTv1T0xFhBxmrS1wPS
2sYzkIraqk0jxZlyeXrmCvU9uqpBOl8Z7aKVEGQflJAwig/mJO2TqKpYHPVG3EStgqwymvgc2IRA
9wRnIvtn+Z0nEWjukAlZBzKktIQEYI+2cStNKIVbzgK6Mz0fDA7CV873uHXxCy8YeqM+JqZi8F66
jErQawkE3Mhq7BGAIvpScyZZ9CwixKVpuGVI0NYk/iogh0R34lIHIzUK8/Y15LlRNmTjBUnne+Oy
8qxJ1qiWGNiWETHsciHKADcBkLOq0n1f5iYSC2Mb0zlKKo0nnoRw1hsY2eLbG1qTqCkJs8604C/h
Y9xcxwWyuBs4VxlWuwRlTclDQScQjzNTNV4mwlyJ2PDIda9E23jwgrguUk06q3JskIzo8sb9/uFS
EWlfBgzizKaOwbUutaAeF1mBVXhw6Bcstw2IwOZF1ugYqQXdNwNRGgBlH+LuSKcKEhwOvWrg


--===============2564724216105363064==--