From: Marc Alff Date: September 17 2010 1:04am Subject: bzr commit into mysql-5.5-bugfixing branch (marc.alff:3208) Bug#56832 List-Archive: http://lists.mysql.com/commits/118438 X-Bug: 56832 Message-Id: <20100917010440.590D645E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4451161895211801078==" --===============4451161895211801078== 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-5.5-bugfixing-56832/ based on revid:marc.alff@stripped 3208 Marc Alff 2010-09-16 Bug#56832 perfschema.server_init test output not consistent Before this fix, the test output for perfschema.server_init would vary between executions, because some of the objects tested were not guaranteed to exist in all configurations / code paths. This fix removes these weak tests. Also, comments referring to abandonned code have been cleaned up. 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-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"; - --===============4451161895211801078== 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: 609abe14d098fb75f4dd3664b523a76d20c00588 # timestamp: 2010-09-16 19:04:40 -0600 # base_revision_id: marc.alff@stripped\ # ot7u834d8618xhm4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXCF5J4AAwlfgAAQWGf//3+v jkC////wYAbt0+5PCpB7fb3c9rsddVvb0eqGRTTFDGkm0wp6jRk2hPUAGmgAAJJACnoAU0p70kZR oPUABkAABpNMhMqeo08oeU9CZGQGgxGRkekxAJTSlPR6ap6amgPCENBoHqaAZDEA0EUoJNNNNHom 0RmUaaAAA0GjEAJIQgBMRNHqNSfkaSaBoGjEZHqAf8JQllVqbEMQ9K6ewULvvIyU1gVvEwpjO83C xjCMLFAk0w2wyU7jSEyg0M1mlwmrhF+dYQnhUA4Fyu+6x6zoSYDTV6hCUgUJ6EXkCV93N5FkruiY 4Kbl1QoEIpgcSLKTIKyEjopNFe02aaK+L6mjwMNEIGbeQ2i5Teqctb4Pb+kiG5OpbXkT3MIMiYiE tjYC1IHYZ2+khYOOL6CT9n6uVSKUJbRif601pUbwrHnnQNMMY3e/vCJJFXYLkEcuDHbqujGhc+IX L0AZYJOqtYCIAzkmdRIS7TpUHjulVG4qa3WxtzhRwodJB1MFGNRULoP5aruAqqFmaRd6S3X18AWB qCxXUZcVcLdTCohGIcEVi5F9os2dg8GEZdz03ZuRNwPUyRU4I9QEhQnATpzLUFwBECSxGoT7h9io wLAKK81B/AsAhOHaAWaMB3nR7JB9EnAd5lzTGmX10FEnSQqkFaRth37SPpuOwIbvINuDEiI6wm4y d3JkWb2NUgBjpJvlzU5+c1wZ0Ilf4MuOt5F7NQujZpG9ILxWqC6CUdsEiG84LziZ3QEkdRNfConb vdIvkXFSPPNs8GkikwN1BXiZHNCtFtzob9wGV0qnrV5g48aO89IAykJryqK6oilwEKDNhyYzDpU2 LrZVrKuDNYmhgZjLqYjR2CiW21ukC+Ww6GslpM1WFyMspUPjwkddjLjepwQdpRsYzaA8TtclDNul rczKYlyJI6V16PGWxOJkY+BDZogZ57mhfaHGxU17GuoWH4etcGD8+HXZ14s9y4JYTLyUz+1KvW0Z q0ShvB2dzuMCC62h0jgyRvgRxGquh1N4q1TsemviSjZs88GsxOYYvVaPBqtNSRSZVjYsbbtcaRc5 USJIhaTYQaky6NQ14o2RCSF72jt+YtgiGgp7xVoxJE1UegFAmq5uwn9wqHwBNnNA2SW4Om2MrQMq SG3FCWE0Go0w6nFVSLIA7DmfM5cQSwnxHKNdDqLXHMeHIfZrcjmvjdAg3jFkF4e5pH8DHtG0A4nF tZJqWKlHPYL+/M4CvrM0v+JBcW4Tl7b/tNdpr9OJVme5HxH+IGYoIVXrSPAByglH3ANsrM2bCSMG S6SEzdPQ2pqRzgbxRkXHlWnBLIjhcosW80hhhbiFY65Ie8W4E9OczhsieHp294/PTioUCfenxQ19 jAZs3NwmOD56gV2OV2I9gFvq6C8376dvrlWpkjp5imlJ42iVkMRSkkt9O9zYnl5dvQqfpqxd1y6M svSDvYXJm3zSEmhR7cFsz4lssgRNlz2B2tU0Y6Hi+WSaRKvtRmBnDcDBDMhMjZwg4FO+IKANlYLq XYO6ClXjS6+SGa9oWGnUhEkOMil9nlxg5skvO7TgMCrXjx/w8DItY8uQqRcx9TC1M4mfS33YCjEr Kmfh0A7xShL+BjYnWsZZoOJigvKUSlBfi72Xkie5U2CmyMLOTw31ouphaB7e7Wlu9DHNYnRFs8wN hTNseOfPeQA1TfE8yIvC7SGmLsB2F1RnwXK6f85hchdEXDXC4ycE4NIUEkfzYCpqLvgl3U5GUycl fokHgouwU19R9qYd49xys1UVWQcz1HQOkYqyGkpTZliMFYvUkxX9gmUqkUjZpEhm5sBEVHBnbTZW EnhsQkMGOtxdQ4C0RWtRF+b2kyAQM4zQRLPFMSdajHYJIGiqjWDRYcLXbkMumwLGr6PjJLec8/Cs CJc2GBqyE5ZlVFMifak3gcn8oXgMiPlhAGvZkfKhBcgQFG5qGywDSU3GfkiOERpquZXViruzkKt4 sJsgtdbS6JlOH9kPI2wLVcU4NLcMs40NujDNJcrS9GTmZkHl3YcbxY2sKwZ96wRCPEegsOGNWzML e52OxQuMohK+kGsydAU1ZBAx6gmnkB7Pg2ptDY4TGCGDpb7BPFIvzsPKXKJhYKD1vFr66ytkE9t/ 4Ln3i4ZHXplrNFuKIA0e1fWfAjWZPyltofsbp4E4I8RdqswVZZgaidwN2FaGAuH+Ch6AfAdGSxNw mubLeLXWq5Wf+LuSKcKEg4QvJPA= --===============4451161895211801078==--