From: Marc Alff Date: September 17 2010 4:22pm Subject: bzr push into mysql-5.5-bugfixing branch (marc.alff:3209) List-Archive: http://lists.mysql.com/commits/118501 Message-Id: <20100917162237.C3E0745E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3088977388858661740==" --===============3088977388858661740== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3209 Marc Alff 2010-09-17 [merge] local merge modified: sql/log.cc sql/log.h sql/sql_repl.cc === modified file 'mysql-test/suite/perfschema/r/server_init.result' --- a/mysql-test/suite/perfschema/r/server_init.result 2010-08-12 13:50:23 +0000 +++ b/mysql-test/suite/perfschema/r/server_init.result 2010-09-17 01:04:34 +0000 @@ -116,18 +116,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 @@ -144,15 +136,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 @@ -212,10 +204,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-12 13:50:23 +0000 +++ b/mysql-test/suite/perfschema/t/server_init.test 2010-09-17 01:04:34 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Sun Microsystems, Inc +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -10,8 +10,8 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# along with this program; if not, write to the Free Software Foundation, +# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA # Tests for PERFORMANCE_SCHEMA @@ -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"; @@ -130,14 +121,16 @@ select count(name) from MUTEX_INSTANCES select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/LOCK_rpl_status"; -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"; @@ -148,16 +141,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"; @@ -165,28 +153,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 @@ -230,25 +203,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"; - --===============3088977388858661740== 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-5.5-bugfixing-\ # 56832/ # testament_sha1: 0a801c322d17fdac06ddc531ff3a5bde8f42f9b1 # timestamp: 2010-09-17 10:22:37 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/ # base_revision_id: alfranio.correia@stripped\ # 28cqjek8mx58cokb # # Begin bundle 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 --===============3088977388858661740==--