From: Marc Alff Date: September 17 2010 4:43pm Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3269) List-Archive: http://lists.mysql.com/commits/118508 Message-Id: <20100917164331.8BB1345E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9160475015032497006==" --===============9160475015032497006== 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-trunk-bugfixing-merge/ based on revid:alfranio.correia@stripped 3269 Marc Alff 2010-09-17 [merge] Merge mysql-5.5-bugfixing --> mysql-trunk-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"; - --===============9160475015032497006== 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-trunk-bugfixing-\ # merge/ # testament_sha1: 29b3b15f58f6c46b4fbdeaa0e65dbcc9d46430ee # timestamp: 2010-09-17 10:43:31 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/ # base_revision_id: alfranio.correia@stripped\ # 38vu32t03rnfxj75 # # Begin bundle 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 cKEgqahANA== --===============9160475015032497006==--