Skip to content

M
mariadb
Commit 27f8a526 authored by Marc Alff's avatar Marc Alff
Browse files
Options

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.
parent 7313acfe
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 37 deletions
mysql-test/suite/perfschema/include/binlog_common.inc
View file @ 27f8a526
# 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 # 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 # it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software Foundation,
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
# Tests for PERFORMANCE_SCHEMA # Tests for PERFORMANCE_SCHEMA
...@@ -19,8 +19,13 @@ RESET MASTER; ...@@ -19,8 +19,13 @@ RESET MASTER;
select count(*) > 0 from performance_schema.setup_instruments; 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' 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; select count(*) > 0 from performance_schema.events_waits_current;
...@@ -37,13 +42,15 @@ insert into test.t1 ...@@ -37,13 +42,15 @@ insert into test.t1
insert into test.t2 insert into test.t2
select name from performance_schema.setup_instruments 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.t1;
drop table test.t2; drop table test.t2;
update performance_schema.setup_instruments set enabled='YES' 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 --source include/show_binlog_events.inc
mysql-test/suite/perfschema/r/binlog_mix.result
View file @ 27f8a526
...@@ -4,7 +4,8 @@ select count(*) > 0 from performance_schema.setup_instruments; ...@@ -4,7 +4,8 @@ select count(*) > 0 from performance_schema.setup_instruments;
count(*) > 0 count(*) > 0
1 1
update performance_schema.setup_instruments set enabled='NO' 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; select count(*) > 0 from performance_schema.events_waits_current;
count(*) > 0 count(*) > 0
1 1
...@@ -16,16 +17,17 @@ insert into test.t1 ...@@ -16,16 +17,17 @@ insert into test.t1
select thread_id from performance_schema.events_waits_current; select thread_id from performance_schema.events_waits_current;
insert into test.t2 insert into test.t2
select name from performance_schema.setup_instruments 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.t1;
drop table test.t2; drop table test.t2;
update performance_schema.setup_instruments set enabled='YES' 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>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) 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 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT 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 `t1` /* generated by server */
...@@ -44,6 +46,5 @@ master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server ...@@ -44,6 +46,5 @@ 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 # # use `test`; DROP TABLE `t2` /* generated by server */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) 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 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
mysql-test/suite/perfschema/r/binlog_row.result
View file @ 27f8a526
...@@ -4,7 +4,8 @@ select count(*) > 0 from performance_schema.setup_instruments; ...@@ -4,7 +4,8 @@ select count(*) > 0 from performance_schema.setup_instruments;
count(*) > 0 count(*) > 0
1 1
update performance_schema.setup_instruments set enabled='NO' 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; select count(*) > 0 from performance_schema.events_waits_current;
count(*) > 0 count(*) > 0
1 1
...@@ -16,16 +17,17 @@ insert into test.t1 ...@@ -16,16 +17,17 @@ insert into test.t1
select thread_id from performance_schema.events_waits_current; select thread_id from performance_schema.events_waits_current;
insert into test.t2 insert into test.t2
select name from performance_schema.setup_instruments 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.t1;
drop table test.t2; drop table test.t2;
update performance_schema.setup_instruments set enabled='YES' 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>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) 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 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT 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 `t1` /* generated by server */
...@@ -44,6 +46,5 @@ master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server ...@@ -44,6 +46,5 @@ 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 # # use `test`; DROP TABLE `t2` /* generated by server */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) 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 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
mysql-test/suite/perfschema/r/binlog_stmt.result
View file @ 27f8a526
...@@ -5,7 +5,8 @@ select count(*) > 0 from performance_schema.setup_instruments; ...@@ -5,7 +5,8 @@ select count(*) > 0 from performance_schema.setup_instruments;
count(*) > 0 count(*) > 0
1 1
update performance_schema.setup_instruments set enabled='NO' 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: 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. 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; select count(*) > 0 from performance_schema.events_waits_current;
...@@ -21,20 +22,23 @@ Warnings: ...@@ -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. 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 insert into test.t2
select name from performance_schema.setup_instruments 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: 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. 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.t1;
drop table test.t2; drop table test.t2;
update performance_schema.setup_instruments set enabled='YES' 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: 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. 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>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; update performance_schema.setup_instruments set enabled='NO' 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 # # 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 `t1` /* generated by server */
master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t2` /* 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 ...@@ -47,11 +51,13 @@ master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; insert into test.t2 master-bin.000001 # Query # # use `test`; insert into test.t2
select name from performance_schema.setup_instruments 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 # # COMMIT
master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ 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 # # use `test`; DROP TABLE `t2` /* generated by server */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; update performance_schema.setup_instruments set enabled='YES' 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 master-bin.000001 # Query # # COMMIT
mysql-test/suite/perfschema/t/binlog_mix.test
View file @ 27f8a526
# 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 # 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 # it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software Foundation,
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
# Tests for PERFORMANCE_SCHEMA # Tests for PERFORMANCE_SCHEMA
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# See Bug#46896 binlog: case sensitivity of table names
--source include/have_lowercase0.inc
set binlog_format=mixed; set binlog_format=mixed;
--source ../include/binlog_common.inc --source ../include/binlog_common.inc
......
mysql-test/suite/perfschema/t/binlog_row.test
View file @ 27f8a526
# 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 # 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 # it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software Foundation,
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
# Tests for PERFORMANCE_SCHEMA # Tests for PERFORMANCE_SCHEMA
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# See Bug#46896 binlog: case sensitivity of table names
--source include/have_lowercase0.inc
set binlog_format=row; set binlog_format=row;
--source ../include/binlog_common.inc --source ../include/binlog_common.inc
......
mysql-test/suite/perfschema/t/binlog_stmt.test
View file @ 27f8a526
# 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 # 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 # it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software Foundation,
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
# Tests for PERFORMANCE_SCHEMA # Tests for PERFORMANCE_SCHEMA
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7