bzr push into mysql-5.5-merge branch (Dmitry.Lenev:3214 to 3215)

[Dmitry Lenev]

 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
 3214 Konstantin Osipov	2010-09-24 [merge]
      Merge 5.5 -> 5.5-merge.

    added:
      mysql-test/include/ctype_filesort2.inc
    modified:
      client/CMakeLists.txt
      client/sql_string.cc
      configure.in
      include/atomic/x86-gcc.h
      include/m_ctype.h
      mysql-test/r/ctype_utf16.result
      mysql-test/r/ctype_utf32.result
      mysql-test/r/ctype_utf8mb4.result
      mysql-test/r/func_if.result
      mysql-test/r/sp-destruct.result
      mysql-test/t/ctype_utf16.test
      mysql-test/t/ctype_utf32.test
      mysql-test/t/ctype_utf8mb4.test
      mysql-test/t/func_if.test
      mysql-test/t/sp-destruct.test
      scripts/CMakeLists.txt
      sql/CMakeLists.txt
      sql/field.cc
      sql/item_cmpfunc.cc
      sql/mdl.cc
      sql/mdl.h
      sql/sp.cc
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_string.cc
      sql/table.cc
      storage/perfschema/ha_perfschema.cc
      strings/ctype-ucs2.c
      strings/ctype-utf8.c
=== 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;
 


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