From: Marc Alff
Date: September 17 2010 4:53pm
Subject: bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3293)
List-Archive: http://lists.mysql.com/commits/118511
Message-Id: <20100917165346.C26F245E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1358820814478705007=="

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

#At file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-merge/ based on revid:alfranio.correia@stripped

 3293 Marc Alff	2010-09-17 [merge]
      Merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing

    modified:
      mysql-test/suite/perfschema/r/server_init.result
      mysql-test/suite/perfschema/t/server_init.test
=== modified file 'mysql-test/suite/perfschema/r/server_init.result'
--- a/mysql-test/suite/perfschema/r/server_init.result	2010-08-20 08:48:59 +0000
+++ b/mysql-test/suite/perfschema/r/server_init.result	2010-09-17 16:43:02 +0000
@@ -112,18 +112,10 @@ where name like "wait/synch/mutex/sql/LO
 count(name)
 1
 select count(name) from MUTEX_INSTANCES
-where name like "wait/synch/mutex/sql/LOG_INFO::lock";
-count(name)
-1
-select count(name) from MUTEX_INSTANCES
 where name like "wait/synch/mutex/sql/Query_cache::structure_guard_mutex";
 count(name)
 1
 select count(name) from MUTEX_INSTANCES
-where name like "wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state";
-count(name)
-1
-select count(name) from MUTEX_INSTANCES
 where name like "wait/synch/mutex/sql/LOCK_event_metadata";
 count(name)
 1
@@ -140,15 +132,15 @@ where name like "wait/synch/mutex/sql/Cv
 count(name)
 1
 select count(name) from MUTEX_INSTANCES
-where name like "wait/synch/mutex/sql/LOCK_xid_cache";
+where name like "wait/synch/mutex/sql/LOCK_audit_mask";
 count(name)
 1
 select count(name) from MUTEX_INSTANCES
-where name like "wait/synch/mutex/sql/LOCK_plugin";
+where name like "wait/synch/mutex/sql/LOCK_xid_cache";
 count(name)
 1
 select count(name) from MUTEX_INSTANCES
-where name like "wait/synch/mutex/sql/LOCK_gdl";
+where name like "wait/synch/mutex/sql/LOCK_plugin";
 count(name)
 1
 select count(name) from MUTEX_INSTANCES
@@ -204,10 +196,6 @@ where name like "wait/synch/cond/sql/Que
 count(name)
 1
 select count(name) from COND_INSTANCES
-where name like "wait/synch/cond/sql/Event_scheduler::COND_state";
-count(name)
-1
-select count(name) from COND_INSTANCES
 where name like "wait/synch/cond/sql/COND_queue_state";
 count(name)
 1

=== modified file 'mysql-test/suite/perfschema/t/server_init.test'
--- a/mysql-test/suite/perfschema/t/server_init.test	2010-08-20 08:48:59 +0000
+++ b/mysql-test/suite/perfschema/t/server_init.test	2010-09-17 16:43:02 +0000
@@ -43,10 +43,6 @@ select count(name) from MUTEX_INSTANCES
 select count(name) from MUTEX_INSTANCES
  where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
 
-# Does not exist in mysql 5.5, 6.0 only
-# select count(name) from MUTEX_INSTANCES
-#  where name like "wait/synch/mutex/mysys/THR_LOCK_myisam_log";
-
 select count(name) from MUTEX_INSTANCES
  where name like "wait/synch/mutex/mysys/THR_LOCK_heap";
 
@@ -83,11 +79,6 @@ select count(name) from MUTEX_INSTANCES
 select count(name) from MUTEX_INSTANCES
  where name like "wait/synch/mutex/sql/LOCK_delayed_insert";
 
-# Named LOCK_uuid_short in 6.0 only
-# select count(name) from MUTEX_INSTANCES
-#  where name like "wait/synch/mutex/sql/LOCK_uuid_short";
-
-# Named LOCK_uuid_generator in 5.5, LOCK_uuid_short in 6.0
 select count(name) from MUTEX_INSTANCES
  where name like "wait/synch/mutex/sql/LOCK_uuid_generator";
 
@@ -127,14 +118,16 @@ select count(name) from MUTEX_INSTANCES
 select count(name) from MUTEX_INSTANCES
  where name like "wait/synch/mutex/sql/LOCK_server_started";
 
-select count(name) from MUTEX_INSTANCES
- where name like "wait/synch/mutex/sql/LOG_INFO::lock";
+# LOG_INFO object are created on demand, and are not global.
+# select count(name) from MUTEX_INSTANCES
+#  where name like "wait/synch/mutex/sql/LOG_INFO::lock";
 
 select count(name) from MUTEX_INSTANCES
  where name like "wait/synch/mutex/sql/Query_cache::structure_guard_mutex";
 
-select count(name) from MUTEX_INSTANCES
- where name like "wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state";
+# The event scheduler may be disabled
+# select count(name) from MUTEX_INSTANCES
+#  where name like "wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state";
 
 select count(name) from MUTEX_INSTANCES
  where name like "wait/synch/mutex/sql/LOCK_event_metadata";
@@ -145,16 +138,11 @@ select count(name) from MUTEX_INSTANCES
 select count(name) from MUTEX_INSTANCES
  where name like "wait/synch/mutex/sql/LOCK_user_locks";
 
-# Does not exist in mysql 5.5, 6.0 only
-# select count(name) from MUTEX_INSTANCES
-#  where name like "wait/synch/mutex/sql/LOCK_mdl";
-
 select count(name) from MUTEX_INSTANCES
  where name like "wait/synch/mutex/sql/Cversion_lock";
 
-# Does not exist in mysql 5.5, 6.0 only
-# select count(name) from MUTEX_INSTANCES
-#  where name like "wait/synch/mutex/sql/LOCK_audit_mask";
+select count(name) from MUTEX_INSTANCES
+ where name like "wait/synch/mutex/sql/LOCK_audit_mask";
 
 select count(name) from MUTEX_INSTANCES
  where name like "wait/synch/mutex/sql/LOCK_xid_cache";
@@ -162,28 +150,13 @@ select count(name) from MUTEX_INSTANCES
 select count(name) from MUTEX_INSTANCES
  where name like "wait/synch/mutex/sql/LOCK_plugin";
 
-select count(name) from MUTEX_INSTANCES
- where name like "wait/synch/mutex/sql/LOCK_gdl";
+# Not a global variable, may be destroyed already.
+# select count(name) from MUTEX_INSTANCES
+#  where name like "wait/synch/mutex/sql/LOCK_gdl";
 
 select count(name) from MUTEX_INSTANCES
  where name like "wait/synch/mutex/sql/tz_LOCK";
 
-# Does not exist in mysql 5.5, 6.0 only
-# select count(name) from MUTEX_INSTANCES
-#  where name like "wait/synch/mutex/sql/slave_start";
-
-# Does not exist in mysql 5.5, 6.0 only
-# select count(name) from MUTEX_INSTANCES
-#  where name like "wait/synch/mutex/sql/BML_class::THR_LOCK_BML";
-
-# Does not exist in mysql 5.5, 6.0 only
-# select count(name) from MUTEX_INSTANCES
-#  where name like "wait/synch/mutex/sql/BML_class::THR_LOCK_BML_active";
-
-# Does not exist in mysql 5.5, 6.0 only
-# select count(name) from MUTEX_INSTANCES
-#  where name like "wait/synch/mutex/sql/BML_class::THR_LOCK_BML_get";
-
 # Verify that these global rwlocks have been properly initilized in sql
 
 select count(name) from RWLOCK_INSTANCES
@@ -224,25 +197,10 @@ select count(name) from COND_INSTANCES
 select count(name) from COND_INSTANCES
  where name like "wait/synch/cond/sql/Query_cache::COND_cache_status_changed";
 
-select count(name) from COND_INSTANCES
- where name like "wait/synch/cond/sql/Event_scheduler::COND_state";
+# The event scheduler may be disabled
+# select count(name) from COND_INSTANCES
+#  where name like "wait/synch/cond/sql/Event_scheduler::COND_state";
 
 select count(name) from COND_INSTANCES
  where name like "wait/synch/cond/sql/COND_queue_state";
 
-# Does not exist in mysql 5.5, 6.0 only
-# select count(name) from COND_INSTANCES
-#  where name like "wait/synch/cond/sql/COND_mdl";
-
-# Does not exist in mysql 5.5, 6.0 only
-# select count(name) from COND_INSTANCES
-#  where name like "wait/synch/cond/sql/BML_class::COND_BML";
-
-# Does not exist in mysql 5.5, 6.0 only
-# select count(name) from COND_INSTANCES
-#  where name like "wait/synch/cond/sql/BML_class::COND_BML_registered";
-
-# Does not exist in mysql 5.5, 6.0 only
-# select count(name) from COND_INSTANCES
-#  where name like "wait/synch/cond/sql/BML_class::COND_BML_release";
-


--===============1358820814478705007==
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:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   merge/
# testament_sha1: 02ee8d2a4a263d5bdf1af0c5c41befa766a00c75
# timestamp: 2010-09-17 10:53:46 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing/
# base_revision_id: alfranio.correia@stripped\
#   surf5iw0uvlrlcqi
# 
# Begin bundle
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
BgGOAaVr7lLwyyAfVb+NKAkp/xdyRThQkH24Zm8=


--===============1358820814478705007==--