From: Marc Alff Date: January 4 2011 9:04am Subject: bzr commit into mysql-5.5 branch (marc.alff:3213) Bug#59091 List-Archive: http://lists.mysql.com/commits/127862 X-Bug: 59091 Message-Id: <201101040905.p0431324006366@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4377157395170242673==" --===============4377157395170242673== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/malff/BZR_TREE/mysql-5.5-bug59091/ based on revid:mikael@dator8-20110103145904-7b8j3z5pmu6t4jj9 3213 Marc Alff 2011-01-04 Bug#59091 perfschema.binlog_mix and perfschema.binlog_row tests fail with openssl Fixed the test case to be independent of build options used. Removed the lowercase-table-names constraint, since performance schema tables are now in lowercase. modified: mysql-test/suite/perfschema/include/binlog_common.inc mysql-test/suite/perfschema/r/binlog_mix.result mysql-test/suite/perfschema/r/binlog_row.result mysql-test/suite/perfschema/r/binlog_stmt.result mysql-test/suite/perfschema/t/binlog_mix.test mysql-test/suite/perfschema/t/binlog_row.test mysql-test/suite/perfschema/t/binlog_stmt.test === modified file 'mysql-test/suite/perfschema/include/binlog_common.inc' --- a/mysql-test/suite/perfschema/include/binlog_common.inc 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/include/binlog_common.inc 2011-01-04 09:04:02 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Sun Microsystems, Inc +# Copyright (c) 2009, 2011, 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 @@ -19,8 +19,13 @@ RESET MASTER; select count(*) > 0 from performance_schema.setup_instruments; +# Note: +# Do not include records that could depend on +# compiling options (storage engines, SSL), +# to ensure the expected output in the binlog is predictable. update performance_schema.setup_instruments set enabled='NO' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); select count(*) > 0 from performance_schema.events_waits_current; @@ -37,13 +42,15 @@ insert into test.t1 insert into test.t2 select name from performance_schema.setup_instruments - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); drop table test.t1; drop table test.t2; update performance_schema.setup_instruments set enabled='YES' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); --source include/show_binlog_events.inc === modified file 'mysql-test/suite/perfschema/r/binlog_mix.result' --- a/mysql-test/suite/perfschema/r/binlog_mix.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/binlog_mix.result 2011-01-04 09:04:02 +0000 @@ -4,7 +4,8 @@ select count(*) > 0 from performance_sch count(*) > 0 1 update performance_schema.setup_instruments set enabled='NO' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); select count(*) > 0 from performance_schema.events_waits_current; count(*) > 0 1 @@ -16,16 +17,17 @@ insert into test.t1 select thread_id from performance_schema.events_waits_current; insert into test.t2 select name from performance_schema.setup_instruments -where name like "wait/synch/rwlock/%"; +where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); drop table test.t1; drop table test.t2; update performance_schema.setup_instruments set enabled='YES' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) -master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ @@ -44,6 +46,5 @@ master-bin.000001 # Query # # use `test` master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) -master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT === modified file 'mysql-test/suite/perfschema/r/binlog_row.result' --- a/mysql-test/suite/perfschema/r/binlog_row.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/binlog_row.result 2011-01-04 09:04:02 +0000 @@ -4,7 +4,8 @@ select count(*) > 0 from performance_sch count(*) > 0 1 update performance_schema.setup_instruments set enabled='NO' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); select count(*) > 0 from performance_schema.events_waits_current; count(*) > 0 1 @@ -16,16 +17,17 @@ insert into test.t1 select thread_id from performance_schema.events_waits_current; insert into test.t2 select name from performance_schema.setup_instruments -where name like "wait/synch/rwlock/%"; +where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); drop table test.t1; drop table test.t2; update performance_schema.setup_instruments set enabled='YES' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) -master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ @@ -44,6 +46,5 @@ master-bin.000001 # Query # # use `test` master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) -master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT === modified file 'mysql-test/suite/perfschema/r/binlog_stmt.result' --- a/mysql-test/suite/perfschema/r/binlog_stmt.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/binlog_stmt.result 2011-01-04 09:04:02 +0000 @@ -5,7 +5,8 @@ select count(*) > 0 from performance_sch count(*) > 0 1 update performance_schema.setup_instruments set enabled='NO' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. select count(*) > 0 from performance_schema.events_waits_current; @@ -21,20 +22,23 @@ Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. insert into test.t2 select name from performance_schema.setup_instruments -where name like "wait/synch/rwlock/%"; +where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. drop table test.t1; drop table test.t2; update performance_schema.setup_instruments set enabled='YES' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; update performance_schema.setup_instruments set enabled='NO' - where name like "wait/synch/rwlock/%" + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock") master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */ @@ -47,11 +51,13 @@ master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into test.t2 select name from performance_schema.setup_instruments -where name like "wait/synch/rwlock/%" +where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock") master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; update performance_schema.setup_instruments set enabled='YES' - where name like "wait/synch/rwlock/%" + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock") master-bin.000001 # Query # # COMMIT === modified file 'mysql-test/suite/perfschema/t/binlog_mix.test' --- a/mysql-test/suite/perfschema/t/binlog_mix.test 2010-01-12 01:47:27 +0000 +++ b/mysql-test/suite/perfschema/t/binlog_mix.test 2011-01-04 09:04:02 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Sun Microsystems, Inc +# Copyright (c) 2009, 2011, 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 @@ -19,9 +19,6 @@ --source include/not_embedded.inc --source include/have_perfschema.inc -# See Bug#46896 binlog: case sensitivity of table names ---source include/have_lowercase0.inc - set binlog_format=mixed; --source ../include/binlog_common.inc === modified file 'mysql-test/suite/perfschema/t/binlog_row.test' --- a/mysql-test/suite/perfschema/t/binlog_row.test 2010-01-12 01:47:27 +0000 +++ b/mysql-test/suite/perfschema/t/binlog_row.test 2011-01-04 09:04:02 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Sun Microsystems, Inc +# Copyright (c) 2009, 2011, 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 @@ -19,9 +19,6 @@ --source include/not_embedded.inc --source include/have_perfschema.inc -# See Bug#46896 binlog: case sensitivity of table names ---source include/have_lowercase0.inc - set binlog_format=row; --source ../include/binlog_common.inc === modified file 'mysql-test/suite/perfschema/t/binlog_stmt.test' --- a/mysql-test/suite/perfschema/t/binlog_stmt.test 2010-04-28 12:47:49 +0000 +++ b/mysql-test/suite/perfschema/t/binlog_stmt.test 2011-01-04 09:04:02 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Sun Microsystems, Inc +# Copyright (c) 2009, 2011, 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 --===============4377157395170242673== 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:///Users/malff/BZR_TREE/mysql-5.5-bug59091/ # testament_sha1: 0aea44e22528c8608ca25c0f2f81a73ecbaf09b4 # timestamp: 2011-01-04 10:04:13 +0100 # base_revision_id: mikael@dator8-20110103145904-7b8j3z5pmu6t4jj9 # # Begin bundle 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 31jP/4u5IpwoSD8V/68A --===============4377157395170242673==--