1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

'no innodb engine' test failure fixed

Browse Source
This commit is contained in:
holyfoot/hf@mysql.com/hfmain.(none) 2007-11-12 14:26:09 +04:00
parent e3df319066
commit 2b3947a6a5
4 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/r/partition.result
View File

@ -1291,18 +1291,4 @@ t1 CREATE TABLE `t1` (
`b` int(11) DEFAULT NULL `b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (b) (PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION p2 VALUES LESS THAN (20) ENGINE = MyISAM) */ ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (b) (PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION p2 VALUES LESS THAN (20) ENGINE = MyISAM) */
drop table t1, t2; drop table t1, t2;
create table t1 (int_column int, char_column char(5))
PARTITION BY RANGE (int_column) subpartition by key (char_column)
(PARTITION p1 VALUES LESS THAN (5) ENGINE = InnoDB);
Warnings:
Warning 1286 Unknown table engine 'InnoDB'
alter table t1 PARTITION BY RANGE (int_column) subpartition by key (char_column)
(PARTITION p1 VALUES LESS THAN (5) ENGINE = myisam);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`int_column` int(11) DEFAULT NULL,
`char_column` char(5) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (int_column) SUBPARTITION BY KEY (char_column) (PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM) */
drop table t1;
End of 5.1 tests End of 5.1 tests

12
mysql-test/r/partition_innodb.result
View File

@ -136,3 +136,15 @@ SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
2 2
DROP TABLE t1; DROP TABLE t1;
create table t1 (int_column int, char_column char(5))
PARTITION BY RANGE (int_column) subpartition by key (char_column)
(PARTITION p1 VALUES LESS THAN (5) ENGINE = InnoDB);
alter table t1 PARTITION BY RANGE (int_column) subpartition by key (char_column)
(PARTITION p1 VALUES LESS THAN (5) ENGINE = myisam);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`int_column` int(11) DEFAULT NULL,
`char_column` char(5) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (int_column) SUBPARTITION BY KEY (char_column) (PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM) */
drop table t1;

11
mysql-test/t/partition.test
View File

@ -1528,15 +1528,4 @@ PARTITION BY RANGE (b) (
show create table t1; show create table t1;
drop table t1, t2; drop table t1, t2;
#
# Bug #31893 Partitions: crash if subpartitions and engine change
#
create table t1 (int_column int, char_column char(5))
PARTITION BY RANGE (int_column) subpartition by key (char_column)
(PARTITION p1 VALUES LESS THAN (5) ENGINE = InnoDB);
alter table t1 PARTITION BY RANGE (int_column) subpartition by key (char_column)
(PARTITION p1 VALUES LESS THAN (5) ENGINE = myisam);
show create table t1;
drop table t1;
--echo End of 5.1 tests --echo End of 5.1 tests

11
mysql-test/t/partition_innodb.test
View File

@ -142,3 +142,14 @@ PARTITION BY KEY(a) PARTITIONS 10;
INSERT INTO t1 VALUES(1),(2); INSERT INTO t1 VALUES(1),(2);
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
DROP TABLE t1; DROP TABLE t1;
#
# Bug #31893 Partitions: crash if subpartitions and engine change
#
create table t1 (int_column int, char_column char(5))
PARTITION BY RANGE (int_column) subpartition by key (char_column)
(PARTITION p1 VALUES LESS THAN (5) ENGINE = InnoDB);
alter table t1 PARTITION BY RANGE (int_column) subpartition by key (char_column)
(PARTITION p1 VALUES LESS THAN (5) ENGINE = myisam);
show create table t1;
drop table t1;