diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 10:21:58 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 10:21:58 +0200 |
| commit | f55a0a6ad2a2c2866c81b07b63f330b24189a1d0 (patch) | |
| tree | d23683febf676ad9758e66b7723495a698aa5076 /mysql-test/suite | |
| parent | 374f0751a23dc6aa854badc007ac797fcc776ccc (diff) | |
| download | mariadb-git-f55a0a6ad2a2c2866c81b07b63f330b24189a1d0.tar.gz | |
after perfschema-mergetree merge - update tests and results
Diffstat (limited to 'mysql-test/suite')
5 files changed, 16 insertions, 8 deletions
diff --git a/mysql-test/suite/perfschema/disabled.def b/mysql-test/suite/perfschema/disabled.def index 888298bbb09..d9e9e5bf34e 100644 --- a/mysql-test/suite/perfschema/disabled.def +++ b/mysql-test/suite/perfschema/disabled.def @@ -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 diff --git a/mysql-test/suite/perfschema/r/rpl_gtid_func.result b/mysql-test/suite/perfschema/r/rpl_gtid_func.result index 4714b63c440..98342bc4869 100644 --- a/mysql-test/suite/perfschema/r/rpl_gtid_func.result +++ b/mysql-test/suite/perfschema/r/rpl_gtid_func.result @@ -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'; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin-master.opt deleted file mode 100644 index 3536d102387..00000000000 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin-master.opt +++ /dev/null @@ -1,2 +0,0 @@ -$PLUGIN_AUTH_OPT -$PLUGIN_AUTH_LOAD diff --git a/mysql-test/suite/perfschema/t/relaylog-slave.opt b/mysql-test/suite/perfschema/t/relaylog-slave.opt deleted file mode 100644 index cef79bc8585..00000000000 --- a/mysql-test/suite/perfschema/t/relaylog-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---force-restart diff --git a/mysql-test/suite/perfschema/t/rpl_gtid_func.test b/mysql-test/suite/perfschema/t/rpl_gtid_func.test index cdee1be6475..27837572bff 100644 --- a/mysql-test/suite/perfschema/t/rpl_gtid_func.test +++ b/mysql-test/suite/perfschema/t/rpl_gtid_func.test @@ -1,4 +1,5 @@ --source include/not_embedded.inc +--source include/have_innodb.inc --source include/have_perfschema.inc --source ../include/no_protocol.inc |