mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

after perfschema-mergetree merge - update tests and results

Browse source
This commit is contained in:
Sergei Golubchik 2014-05-07 10:21:58 +02:00
parent 374f0751a2
commit f55a0a6ad2
5 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mysql-test/suite/perfschema/disabled.def
View file

@ -9,3 +9,16 @@
# Do not use any TAB characters for whitespace.
#
##############################################################################
sizing_off: not updated for 10.0 yet
sizing_med: not updated for 10.0 yet
sizing_low: not updated for 10.0 yet
sizing_high: not updated for 10.0 yet
sizing_growth: not updated for 10.0 yet
sizing_default: not updated for 10.0 yet
binlog_edge_mix: needs slave_relay_log_info
binlog_edge_row: needs slave_relay_log_info
binlog_edge_stmt: needs slave_relay_log_info
binlog_ok_mix: needs slave_relay_log_info
binlog_ok_row: needs slave_relay_log_info
binlog_ok_stmt: needs slave_relay_log_info

7
mysql-test/suite/perfschema/r/rpl_gtid_func.result
View file

@ -1,7 +1,4 @@
include/master-slave.inc
Warnings:
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
[connection master]
**** On Master ****
drop table if exists test.marker;
@ -40,7 +37,7 @@ select digest, digest_text, count_star
from performance_schema.events_statements_summary_by_digest
where digest_text like "%in_%_digest%";
digest digest_text count_star
8d588d616712c7d8dfabf22ce262662b SELECT ? AS in_master_digest 1
e315485f9cbc06befb4e59970905a034 SELECT ? AS in_master_digest 1
insert into test.marker values (2);
**** On Slave ****
select * from test.marker;
@ -67,7 +64,7 @@ select digest, digest_text, count_star
from performance_schema.events_statements_summary_by_digest
where digest_text like "%in_%_digest%";
digest digest_text count_star
02e25175edc3b2834b9b41d58f5a8a6a SELECT ? AS in_slave_digest 1
bd2f53b41efcd037df41a3dd8bf3312a SELECT ? AS in_slave_digest 1
**** On Master ****
delete from performance_schema.setup_objects
where object_schema='master';

2
mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin-master.opt
View file

@ -1,2 +0,0 @@
$PLUGIN_AUTH_OPT
$PLUGIN_AUTH_LOAD

1
mysql-test/suite/perfschema/t/relaylog-slave.opt
View file

@ -1 +0,0 @@
--force-restart

1
mysql-test/suite/perfschema/t/rpl_gtid_func.test
View file

@ -1,4 +1,5 @@
--source include/not_embedded.inc
--source include/have_innodb.inc
--source include/have_perfschema.inc
--source ../include/no_protocol.inc