diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-03 15:22:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-03 15:22:39 +0100 |
| commit | 72c20282db820b0b0818aea160a485bdca897eec (patch) | |
| tree | 3089e022d958990fc0a405a38ba43ae00c87103c /mysql-test/suite/handler | |
| parent | 5e1d5d9bc0bf9ea776bffe6c4914a84be920c0b2 (diff) | |
| parent | 2acc01b3cfa27074f93016b893cda20fa0a3497f (diff) | |
| download | mariadb-git-72c20282db820b0b0818aea160a485bdca897eec.tar.gz | |
10.0-base merge
Diffstat (limited to 'mysql-test/suite/handler')
| -rw-r--r-- | mysql-test/suite/handler/innodb.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/handler/innodb.test | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/suite/handler/innodb.result b/mysql-test/suite/handler/innodb.result index eb054136b8d..78660b0ef9c 100644 --- a/mysql-test/suite/handler/innodb.result +++ b/mysql-test/suite/handler/innodb.result @@ -256,7 +256,7 @@ handler t1 read a=(1); a b handler t1 read a next; a b -16 ccc +14 aaa handler t1 close; handler t1 open; prepare stmt from 'handler t1 read a=(?) limit ?,?'; @@ -563,7 +563,7 @@ HANDLER t1 READ `primary` = (1, 1000); no1 no2 HANDLER t1 READ `primary` NEXT; no1 no2 -2 8 +2 6 DROP TABLE t1; create table t1 (c1 int); insert into t1 values (14397); diff --git a/mysql-test/suite/handler/innodb.test b/mysql-test/suite/handler/innodb.test index 6527c4bb8bb..d752da7dc31 100644 --- a/mysql-test/suite/handler/innodb.test +++ b/mysql-test/suite/handler/innodb.test @@ -9,6 +9,11 @@ # rename t/innodb_handler.test to t/handler_innodb.test # +if (`select plugin_auth_version < "5.6.15" from information_schema.plugins where plugin_name='innodb'`) +{ + --skip Not fixed in InnoDB before 5.6.15 +} + --source include/have_innodb.inc let $engine_type= InnoDB; |