diff options
Diffstat (limited to 'mysql-test/r/partition_innodb.result')
| -rw-r--r-- | mysql-test/r/partition_innodb.result | 49 |
1 files changed, 3 insertions, 46 deletions
diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result index 8968ad76635..2df8b19e00c 100644 --- a/mysql-test/r/partition_innodb.result +++ b/mysql-test/r/partition_innodb.result @@ -265,7 +265,7 @@ create table t1 (a int) engine = x partition by key (a); Warnings: -Warning 1286 Unknown table engine 'x' +Warning 1286 Unknown storage engine 'x' Warning 1266 Using storage engine MyISAM for table 't1' show create table t1; Table Create Table @@ -279,7 +279,8 @@ engine = innodb partition by list (a) (partition p0 values in (0)); alter table t1 engine = x; -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +Warnings: +Warning 1286 Unknown storage engine 'x' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -372,47 +373,3 @@ CREATE TABLE t1 (a INT) ENGINE=InnoDB PARTITION BY list(a) (PARTITION p1 VALUES IN (1)); CREATE INDEX i1 ON t1 (a); DROP TABLE t1; -# -# Bug#47343: InnoDB fails to clean-up after lock wait timeout on -# REORGANIZE PARTITION -# -CREATE TABLE t1 ( -a INT, -b DATE NOT NULL, -PRIMARY KEY (a, b) -) ENGINE=InnoDB -PARTITION BY RANGE (a) ( -PARTITION pMAX VALUES LESS THAN MAXVALUE -) ; -INSERT INTO t1 VALUES (1, '2001-01-01'), (2, '2002-02-02'), (3, '2003-03-03'); -START TRANSACTION; -SELECT * FROM t1 FOR UPDATE; -a b -1 2001-01-01 -2 2002-02-02 -3 2003-03-03 -# Connection con1 -ALTER TABLE t1 REORGANIZE PARTITION pMAX INTO -(PARTITION p3 VALUES LESS THAN (3), -PARTITION pMAX VALUES LESS THAN MAXVALUE); -ERROR HY000: Lock wait timeout exceeded; try restarting transaction -SHOW WARNINGS; -Level Code Message -Error 1205 Lock wait timeout exceeded; try restarting transaction -ALTER TABLE t1 REORGANIZE PARTITION pMAX INTO -(PARTITION p3 VALUES LESS THAN (3), -PARTITION pMAX VALUES LESS THAN MAXVALUE); -ERROR HY000: Lock wait timeout exceeded; try restarting transaction -SHOW WARNINGS; -Level Code Message -Error 1205 Lock wait timeout exceeded; try restarting transaction -t1.frm -t1.par -# Connection default -SELECT * FROM t1; -a b -1 2001-01-01 -2 2002-02-02 -3 2003-03-03 -COMMIT; -DROP TABLE t1; |