#At file:///Users/malff/BZR_TREE/mysql-trunk-upmerge/ based on revid:magne.mahre@stripped
3457 Marc Alff 2011-01-05 [merge]
Merge mysql-5.5 --> mysql-trunk
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-08 19:35:17 +0000
+++ b/mysql-test/suite/perfschema/include/binlog_common.inc 2011-01-05 07:16:57 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -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-09 08:16:50 +0000
+++ b/mysql-test/suite/perfschema/r/binlog_mix.result 2011-01-05 07:16:57 +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,11 +17,13 @@ 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 <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN
=== modified file 'mysql-test/suite/perfschema/r/binlog_row.result'
--- a/mysql-test/suite/perfschema/r/binlog_row.result 2010-11-09 08:16:50 +0000
+++ b/mysql-test/suite/perfschema/r/binlog_row.result 2011-01-05 07:16:57 +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,11 +17,13 @@ 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 <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN
=== 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 <binlog_start>;
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-06-03 13:30:54 +0000
+++ b/mysql-test/suite/perfschema/t/binlog_mix.test 2011-01-05 07:16:57 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -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-06-03 13:30:54 +0000
+++ b/mysql-test/suite/perfschema/t/binlog_row.test 2011-01-05 07:16:57 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -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-06-03 13:30:54 +0000
+++ b/mysql-test/suite/perfschema/t/binlog_stmt.test 2011-01-05 07:16:57 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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
No bundle (reason: revision is a merge).
| Thread |
|---|
| • bzr commit into mysql-trunk branch (marc.alff:3457) | Marc Alff | 5 Jan |
