diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2012-02-29 20:51:38 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2012-02-29 20:51:38 +0100 |
| commit | 937ee6b7a0f07c5a71407c9be1b864488b90e980 (patch) | |
| tree | 85d9ab27e729f1459871fabb2c55d0f55539c36f /mysql-test/t | |
| parent | cf2f97800e40c424e8ce8641e353759789684902 (diff) | |
| parent | 74374933c8db3c7f1de07ced89ce72dd705576b3 (diff) | |
| download | mariadb-git-937ee6b7a0f07c5a71407c9be1b864488b90e980.tar.gz | |
merge into mysql-5.1
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/cache_innodb-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/partition_cache.test | 21 |
2 files changed, 21 insertions, 1 deletions
diff --git a/mysql-test/t/cache_innodb-master.opt b/mysql-test/t/cache_innodb-master.opt deleted file mode 100644 index 5f0ebff98f6..00000000000 --- a/mysql-test/t/cache_innodb-master.opt +++ /dev/null @@ -1 +0,0 @@ ---set-variable=query_cache_size=1M diff --git a/mysql-test/t/partition_cache.test b/mysql-test/t/partition_cache.test new file mode 100644 index 00000000000..b5d19796b7c --- /dev/null +++ b/mysql-test/t/partition_cache.test @@ -0,0 +1,21 @@ +# t/cache_innodb.test +# +# Last update: +# 2006-07-26 ML test refactored (MySQL 5.1) +# main code t/innodb_cache.test --> include/query_cache.inc +# new wrapper t/cache_innodb.test +# + +--source include/have_query_cache.inc + +--source include/have_innodb.inc +--source include/have_partition.inc +let $engine_type= InnoDB; +# Using SELECT to get a space as first character. +let $partitions_a= `SELECT ' PARTITION BY KEY (a) PARTITIONS 3'`; +let $partitions_id= `SELECT ' PARTITION BY HASH (id) PARTITIONS 3'`; +let $partitions_s1= `SELECT ' PARTITION BY KEY (s1) PARTITIONS 3'`; +# partitioning does not support FOREIGN KEYs +let $test_foreign_keys= 0; + +--source include/query_cache.inc |