summaryrefslogtreecommitdiff
path: root/mysql-test/t/partition_innodb_plugin.test
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2011-09-15 19:26:38 +0200
committerMattias Jonsson <mattias.jonsson@oracle.com>2011-09-15 19:26:38 +0200
commit1cfcab041ae325b9280e68bcaa8d0395c33cef5c (patch)
tree0fec1fd9d23d135560c4489495a34963add846cb /mysql-test/t/partition_innodb_plugin.test
parent499be1cf1fb44fc45cee52f07f2165135d9990da (diff)
parent0fca2269425df6a1e2224bb3185a76d3a2608fbf (diff)
downloadmariadb-git-1cfcab041ae325b9280e68bcaa8d0395c33cef5c.tar.gz
merge into 5.1-sec of bug#11766879.
Diffstat (limited to 'mysql-test/t/partition_innodb_plugin.test')
-rw-r--r--mysql-test/t/partition_innodb_plugin.test28
1 files changed, 26 insertions, 2 deletions
diff --git a/mysql-test/t/partition_innodb_plugin.test b/mysql-test/t/partition_innodb_plugin.test
index 626e5d19b99..e9e1471f4bd 100644
--- a/mysql-test/t/partition_innodb_plugin.test
+++ b/mysql-test/t/partition_innodb_plugin.test
@@ -1,10 +1,34 @@
--source include/have_partition.inc
--source include/have_innodb_plugin.inc
-# Remove the line below when bug#53307 is solved.
---source include/not_valgrind.inc
let $MYSQLD_DATADIR= `SELECT @@datadir`;
+--echo #
+--echo # Bug#11766879/Bug#60106: DIFF BETWEEN # OF INDEXES IN MYSQL VS INNODB,
+--echo # PARTITONING, ON INDEX CREATE
+--echo #
+call mtr.add_suppression("contains 2 indexes inside InnoDB, which is different from the number of indexes 1 defined in the MySQL");
+CREATE TABLE t1 (
+ id bigint NOT NULL AUTO_INCREMENT,
+ time date,
+ id2 bigint not null,
+ PRIMARY KEY (id,time)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+/*!50100 PARTITION BY RANGE(TO_DAYS(time))
+(PARTITION p10 VALUES LESS THAN (734708) ENGINE = InnoDB,
+ PARTITION p20 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */;
+
+INSERT INTO t1 (time,id2) VALUES ('2011-07-24',1);
+INSERT INTO t1 (time,id2) VALUES ('2011-07-25',1);
+INSERT INTO t1 (time,id2) VALUES ('2011-07-25',1);
+
+--error ER_DUP_ENTRY
+CREATE UNIQUE INDEX uk_time_id2 on t1(time,id2);
+
+SELECT COUNT(*) FROM t1;
+
+DROP TABLE t1;
+
call mtr.add_suppression("nnoDB: Error: table `test`.`t1` .* Partition.* InnoDB internal");
--echo #
--echo # Bug#55091: Server crashes on ADD PARTITION after a failed attempt