bzr push into mysql-trunk branch (tor.didriksen:5179 to 5180)

[Tor Didriksen]

 5180 Tor Didriksen	2012-12-06 [merge]
      merge 5.6 => trunk

    modified:
      sql/mysqld.cc
      sql/mysqld.h
 5179 Harin Vadodaria	2012-12-06 [merge]
      Bug#15912213: BUFFER OVERFLOW IN ACL_GET()
      
      Description: null merge.

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-12-03 06:43:01 +0000
+++ b/sql/mysqld.cc	2012-12-06 13:22:21 +0000
@@ -4106,7 +4106,8 @@ You should consider changing lower_case_
 
 static int init_thread_environment()
 {
-  mysql_mutex_init(0, &LOCK_thread_created, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_LOCK_thread_created,
+                   &LOCK_thread_created, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_thread_count, &LOCK_thread_count, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_thread_remove, 
                    &LOCK_thread_remove, MY_MUTEX_INIT_FAST);
@@ -9128,6 +9129,7 @@ PSI_mutex_key key_RELAYLOG_LOCK_sync;
 PSI_mutex_key key_RELAYLOG_LOCK_sync_queue;
 PSI_mutex_key key_LOCK_sql_rand;
 PSI_mutex_key key_gtid_ensure_index_mutex;
+PSI_mutex_key key_LOCK_thread_created;
 
 static PSI_mutex_info all_server_mutexes[]=
 {
@@ -9197,7 +9199,8 @@ static PSI_mutex_info all_server_mutexes
   { &key_LOCK_thread_count, "LOCK_thread_count", PSI_FLAG_GLOBAL},
   { &key_LOCK_thread_remove, "LOCK_thread_remove", PSI_FLAG_GLOBAL},
   { &key_LOCK_log_throttle_qni, "LOCK_log_throttle_qni", PSI_FLAG_GLOBAL},
-  { &key_gtid_ensure_index_mutex, "Gtid_state", PSI_FLAG_GLOBAL}
+  { &key_gtid_ensure_index_mutex, "Gtid_state", PSI_FLAG_GLOBAL},
+  { &key_LOCK_thread_created, "LOCK_thread_created", PSI_FLAG_GLOBAL }
 };
 
 PSI_rwlock_key key_rwlock_LOCK_grant, key_rwlock_LOCK_logger,

=== modified file 'sql/mysqld.h'
--- a/sql/mysqld.h	2012-11-22 14:40:47 +0000
+++ b/sql/mysqld.h	2012-12-06 13:22:21 +0000
@@ -342,6 +342,7 @@ extern PSI_mutex_key key_RELAYLOG_LOCK_s
 extern PSI_mutex_key key_RELAYLOG_LOCK_sync_queue;
 extern PSI_mutex_key key_LOCK_sql_rand;
 extern PSI_mutex_key key_gtid_ensure_index_mutex;
+extern PSI_mutex_key key_LOCK_thread_created;
 
 extern PSI_rwlock_key key_rwlock_LOCK_grant, key_rwlock_LOCK_logger,
   key_rwlock_LOCK_sys_init_connect, key_rwlock_LOCK_sys_init_slave,

No bundle (reason: useless for push emails).