diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-01-26 19:33:53 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-01-26 19:33:53 +0100 |
| commit | 04a86111121ff1cb700a8e3b5047700f20bfabf7 (patch) | |
| tree | b8710a28697907b5b3c47d1637b8f14d8b7b9e2e /mysql-test/t/partition_error.test | |
| parent | 5e03579061186e0e574ff03ce49eb9f997fc6f6f (diff) | |
| parent | 4e47db3af4fa17862e1212167896e5723f12f297 (diff) | |
| download | mariadb-git-04a86111121ff1cb700a8e3b5047700f20bfabf7.tar.gz | |
merge of bug 47902 and (null-merge) of bug 57924.
bug#57924 does not occur in 5.5, so I reverted the 5.1 specific
code and used the errors from 5.5 instead in the tests
Diffstat (limited to 'mysql-test/t/partition_error.test')
| -rw-r--r-- | mysql-test/t/partition_error.test | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/mysql-test/t/partition_error.test b/mysql-test/t/partition_error.test index 1e0032a2bfa..61b14b81fca 100644 --- a/mysql-test/t/partition_error.test +++ b/mysql-test/t/partition_error.test @@ -11,6 +11,21 @@ drop table if exists t1, t2; let $MYSQLD_DATADIR= `SELECT @@datadir`; --echo # +--echo # Bug#57924: crash when creating partitioned table with +--echo # multiple columns in the partition key +--echo # +--error ER_SAME_NAME_PARTITION_FIELD +CREATE TABLE t1 (a INT, b INT, PRIMARY KEY (a,b)) +PARTITION BY KEY(a, b, a); +CREATE TABLE t1 (a INT, b INT, PRIMARY KEY (a,b)) +PARTITION BY KEY(A, b); +DROP TABLE t1; +--error ER_SAME_NAME_PARTITION_FIELD +CREATE TABLE t1 (a INT, b INT, PRIMARY KEY (a,b)) +PARTITION BY KEY(a, b, A); + + +--echo # --echo # Bug#54483: valgrind errors when making warnings for multiline inserts --echo # into partition --echo # @@ -670,7 +685,6 @@ PARTITION BY HASH (TIME_TO_SEC(a)); CREATE TABLE t1 (a INT) PARTITION BY HASH (TIME_TO_SEC(a)); - --echo # --echo # Bug#50036: Inconsistent errors when using TIMESTAMP --echo # columns/expressions |