From: Dmitry Lenev
Date: September 24 2010 4:26pm
Subject: bzr commit into mysql-5.5-merge branch (Dmitry.Lenev:3215)
List-Archive: http://lists.mysql.com/commits/119077
Message-Id: <20100924162643.CE387E5A6D@mockturtle>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1799927840=="

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

#At file:///home/dlenev/src/bzr/mysql-5.5-merge/ based on revid:kostja@stripped

 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 'mysql-test/suite/perfschema/r/dml_setup_instruments.result'
--- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result	2010-07-27 13:34:58 +0000
+++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result	2010-09-24 16:26:24 +0000
@@ -13,7 +13,7 @@ wait/synch/mutex/sql/LOCK_active_mi	YES	
 wait/synch/mutex/sql/LOCK_audit_mask	YES	YES
 wait/synch/mutex/sql/LOCK_connection_count	YES	YES
 wait/synch/mutex/sql/LOCK_crypt	YES	YES
-wait/synch/mutex/sql/LOCK_delayed_create	YES	YES
+wait/synch/mutex/sql/LOCK_dd_owns_lock_open	YES	YES
 select * from performance_schema.SETUP_INSTRUMENTS
 where name like 'Wait/Synch/Rwlock/sql/%'
   and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock')

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2010-09-06 17:29:02 +0000
+++ b/sql/sql_base.cc	2010-09-24 16:26:24 +0000
@@ -104,9 +104,10 @@ mysql_mutex_t LOCK_dd_owns_lock_open;
 uint dd_owns_lock_open= 0;
 
 #ifdef HAVE_PSI_INTERFACE
-static PSI_mutex_key key_LOCK_open;
+static PSI_mutex_key key_LOCK_open, key_LOCK_dd_owns_lock_open;
 static PSI_mutex_info all_tdc_mutexes[]= {
-  { &key_LOCK_open, "LOCK_open", PSI_FLAG_GLOBAL }
+  { &key_LOCK_open, "LOCK_open", PSI_FLAG_GLOBAL },
+  { &key_LOCK_dd_owns_lock_open, "LOCK_dd_owns_lock_open", PSI_FLAG_GLOBAL }
 };
 
 /**
@@ -300,7 +301,8 @@ bool table_def_init(void)
   init_tdc_psi_keys();
 #endif
   mysql_mutex_init(key_LOCK_open, &LOCK_open, MY_MUTEX_INIT_FAST);
-  mysql_mutex_init(NULL, &LOCK_dd_owns_lock_open, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_LOCK_dd_owns_lock_open, &LOCK_dd_owns_lock_open,
+                   MY_MUTEX_INIT_FAST);
   oldest_unused_share= &end_of_unused_share;
   end_of_unused_share.prev= &oldest_unused_share;
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.lenev@stripped
# target_branch: file:///home/dlenev/src/bzr/mysql-5.5-merge/
# testament_sha1: 6e5929cb24b75ea4ca7efc7842b9455e09dbc529
# timestamp: 2010-09-24 20:26:43 +0400
# base_revision_id: kostja@stripped
# 
# Begin bundle
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


--===============1799927840==--