diff options
Diffstat (limited to 'mysql-test/suite/jp/t/jp_enum_utf8.test')
-rw-r--r-- | mysql-test/suite/jp/t/jp_enum_utf8.test | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/mysql-test/suite/jp/t/jp_enum_utf8.test b/mysql-test/suite/jp/t/jp_enum_utf8.test index 4ce3576b604..ff5978da69c 100644 --- a/mysql-test/suite/jp/t/jp_enum_utf8.test +++ b/mysql-test/suite/jp/t/jp_enum_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `T1`; drop table if exists `T2`; @@ -8,9 +10,6 @@ drop table if exists `T6`; drop table if exists `T7`; drop table if exists `T8`; drop table if exists `T9`; -drop table if exists `T10`; -drop table if exists `T11`; -drop table if exists `T12`; --enable_warnings # @@ -26,12 +25,9 @@ CREATE TABLE `T3` (`C1` ENUM('龔','龖','龗'), INDEX(`C1`)) DEFAUL CREATE TABLE `T4` (`C1` ENUM('ア','イ','ウ'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `T5` (`C1` ENUM('あ','い','う'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `T6` (`C1` ENUM('龔','龖','龗'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `T7` (`C1` ENUM('ア','イ','ウ'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `T8` (`C1` ENUM('あ','い','う'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `T9` (`C1` ENUM('龔','龖','龗'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `T10` (`C1` ENUM('ア','イ','ウ'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `T11` (`C1` ENUM('あ','い','う'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `T12` (`C1` ENUM('龔','龖','龗'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `T7` (`C1` ENUM('ア','イ','ウ'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `T8` (`C1` ENUM('あ','い','う'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `T9` (`C1` ENUM('龔','龖','龗'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY; INSERT INTO `T1` VALUES ('ア'),('イ'),('ウ'); INSERT INTO `T2` VALUES ('あ'),('い'),('う'); @@ -42,9 +38,6 @@ INSERT INTO `T6` VALUES ('龔'),('龖'),('龗'); INSERT INTO `T7` VALUES ('ア'),('イ'),('ウ'); INSERT INTO `T8` VALUES ('あ'),('い'),('う'); INSERT INTO `T9` VALUES ('龔'),('龖'),('龗'); -INSERT INTO `T10` VALUES ('ア'),('イ'),('ウ'); -INSERT INTO `T11` VALUES ('あ'),('い'),('う'); -INSERT INTO `T12` VALUES ('龔'),('龖'),('龗'); SELECT * FROM `T1`; SELECT * FROM `T2`; @@ -55,9 +48,6 @@ SELECT * FROM `T6`; SELECT * FROM `T7`; SELECT * FROM `T8`; SELECT * FROM `T9`; -SELECT * FROM `T10`; -SELECT * FROM `T11`; -SELECT * FROM `T12`; SHOW CREATE TABLE `T1`; SHOW CREATE TABLE `T2`; @@ -68,9 +58,6 @@ SHOW CREATE TABLE `T6`; SHOW CREATE TABLE `T7`; SHOW CREATE TABLE `T8`; SHOW CREATE TABLE `T9`; -SHOW CREATE TABLE `T10`; -SHOW CREATE TABLE `T11`; -SHOW CREATE TABLE `T12`; DESC `T1`; DESC `T2`; @@ -81,9 +68,6 @@ DESC `T6`; DESC `T7`; DESC `T8`; DESC `T9`; -DESC `T10`; -DESC `T11`; -DESC `T12`; # # Test problem with enum values after the colum with NOT NULL restriction @@ -98,9 +82,6 @@ ALTER TABLE `T6` ADD `C2` CHAR(1) NOT NULL FIRST; ALTER TABLE `T7` ADD `C2` CHAR(1) NOT NULL FIRST; ALTER TABLE `T8` ADD `C2` CHAR(1) NOT NULL FIRST; ALTER TABLE `T9` ADD `C2` CHAR(1) NOT NULL FIRST; -ALTER TABLE `T10` ADD `C2` CHAR(1) NOT NULL FIRST; -ALTER TABLE `T11` ADD `C2` CHAR(1) NOT NULL FIRST; -ALTER TABLE `T12` ADD `C2` CHAR(1) NOT NULL FIRST; SHOW CREATE TABLE `T1`; SHOW CREATE TABLE `T2`; @@ -111,9 +92,6 @@ SHOW CREATE TABLE `T6`; SHOW CREATE TABLE `T7`; SHOW CREATE TABLE `T8`; SHOW CREATE TABLE `T9`; -SHOW CREATE TABLE `T10`; -SHOW CREATE TABLE `T11`; -SHOW CREATE TABLE `T12`; DESC `T1`; DESC `T2`; @@ -124,9 +102,6 @@ DESC `T6`; DESC `T7`; DESC `T8`; DESC `T9`; -DESC `T10`; -DESC `T11`; -DESC `T12`; DROP TABLE `T1`; DROP TABLE `T2`; @@ -137,6 +112,3 @@ DROP TABLE `T6`; DROP TABLE `T7`; DROP TABLE `T8`; DROP TABLE `T9`; -DROP TABLE `T10`; -DROP TABLE `T11`; -DROP TABLE `T12`; |