diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-16 23:55:56 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-16 23:55:56 +0200 |
| commit | 985e430c0f1c99cbd0854aae649f8aefff98adc0 (patch) | |
| tree | b34d114456ec1febacfe5656144b29787bbc0c6f /mysql-test/t | |
| parent | 27f0bd7d959fa490ab724ab5bfef9aaa80b1b703 (diff) | |
| download | mariadb-git-985e430c0f1c99cbd0854aae649f8aefff98adc0.tar.gz | |
after-merge fixes
in innobase: compilation error on windows
other changes: perfschema merge followup
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/partition_innodb.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/query_cache_ps_no_prot.test | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test index af140611c91..2d90764da0d 100644 --- a/mysql-test/t/partition_innodb.test +++ b/mysql-test/t/partition_innodb.test @@ -1,4 +1,4 @@ -if (`select plugin_auth_version <= "5.6.24" from information_schema.plugins where plugin_name='innodb'`) +if (`select plugin_auth_version < "5.6.25" from information_schema.plugins where plugin_name='innodb'`) { --skip Not fixed in InnoDB as of 5.6.24 or earlier } diff --git a/mysql-test/t/query_cache_ps_no_prot.test b/mysql-test/t/query_cache_ps_no_prot.test index 16533c7194e..4b2bb842e34 100644 --- a/mysql-test/t/query_cache_ps_no_prot.test +++ b/mysql-test/t/query_cache_ps_no_prot.test @@ -16,12 +16,7 @@ let collation=utf8_unicode_ci; --source include/have_collation.inc # The file with expected results fits only to a run without -# ps-protocol/sp-protocol/cursor-protocol/view-protocol. -if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL - + $VIEW_PROTOCOL > 0`) -{ - --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled -} +--source include/no_protocol.inc # The main testing script --source include/query_cache_sql_prepare.inc |