1 files changed, 9 insertions, 107 deletions

diff --git a/mysql-test/suite/jp/t/jp_alter_ujis.test b/mysql-test/suite/jp/t/jp_alter_ujis.test
index d388d20c49b..e397cf66a50 100644
--- a/mysql-test/suite/jp/t/jp_alter_ujis.test
+++ b/mysql-test/suite/jp/t/jp_alter_ujis.test
@@ -1,4 +1,6 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
+
 
 --disable_warnings
 DROP TABLE IF EXISTS `ｱｱｱ`;
@@ -219,15 +221,15 @@ DROP TABLE `龖龖龖`;
 DROP TABLE `龗龗龗`;
 
 #
-# Test HEAP
+# Test MEMORY
 #
 
-CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
 
 INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ');
 INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
@@ -316,103 +318,3 @@ DROP TABLE `あああ`;
 DROP TABLE `いいい`;
 DROP TABLE `龖龖龖`;
 DROP TABLE `龗龗龗`;
-
-#
-# Test BDB
-#
-
-CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-
-INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ');
-INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
-INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅');
-
-ALTER TABLE `ｱｱｱ` ADD `ｶｶｶ` char(1) FIRST;
-ALTER TABLE `ｱｱｱ` ADD `ｸｸｸ` char(1) AFTER `ｷｷｷ`;
-ALTER TABLE `ｱｱｱ` ADD `ｹｹｹ` char(1);
-ALTER TABLE `ｱｱｱ` ADD INDEX (`ｶｶｶ`);
-ALTER TABLE `ｱｱｱ` ADD PRIMARY KEY (`ｷｷｷ`);
-#Multiple NULL fields are not allowed in BDB
-#ALTER TABLE `ｱｱｱ` ADD UNIQUE (`ｸｸｸ`);
-#ALTER TABLE `ｱｱｱ` ADD FOREIGN KEY (`ｹｹｹ`) REFERENCES `ｲｲｲ`(`ｹｹｹ`);
-ALTER TABLE `ｱｱｱ` CHANGE `ｶｶｶ` `ｶｶ` char(1);
-ALTER TABLE `ｱｱｱ` MODIFY `ｷｷｷ` char(6);
-
-SELECT * FROM `ｱｱｱ`;
-DESC `ｱｱｱ`;
-SHOW CREATE TABLE `ｱｱｱ`;
-
-ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
-ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
-#ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
-#ALTER TABLE `ｱｱｱ` DROP FOREIGN KEY `ｹｹｹ`;
-ALTER TABLE `ｱｱｱ` DROP `ｶｶ`;
-ALTER TABLE `ｱｱｱ` DROP `ｸｸｸ`;
-ALTER TABLE `ｱｱｱ` DROP `ｹｹｹ`;
-SELECT * FROM `ｱｱｱ`;
-DESC `ｱｱｱ`;
-SHOW CREATE TABLE `ｱｱｱ`;
-
-ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
-ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
-ALTER TABLE `あああ` ADD `けけけ` char(1);
-ALTER TABLE `あああ` ADD INDEX (`かかか`);
-ALTER TABLE `あああ` ADD PRIMARY KEY (`ききき`);
-#ALTER TABLE `あああ` ADD UNIQUE (`くくく`);
-#ALTER TABLE `あああ` ADD FOREIGN KEY (`けけけ`) REFERENCES `いいい`(`けけけ`);
-ALTER TABLE `あああ` CHANGE `かかか` `かか` char(1);
-ALTER TABLE `あああ` MODIFY `ききき` char(6);
-
-SELECT * FROM `あああ`;
-DESC `あああ`;
-SHOW CREATE TABLE `あああ`;
-
-ALTER TABLE `あああ` DROP INDEX `かかか`;
-ALTER TABLE `あああ` DROP PRIMARY KEY;
-#ALTER TABLE `あああ` DROP INDEX `くくく`;
-#ALTER TABLE `あああ` DROP FOREIGN KEY `けけけ`;
-ALTER TABLE `あああ` DROP `かか`;
-ALTER TABLE `あああ` DROP `くくく`;
-ALTER TABLE `あああ` DROP `けけけ`;
-
-SELECT * FROM `あああ`;
-DESC `あああ`;
-SHOW CREATE TABLE `あああ`;
-
-ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
-ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
-ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
-ALTER TABLE `龖龖龖` ADD INDEX (`丄丄丄`);
-ALTER TABLE `龖龖龖` ADD PRIMARY KEY (`丂丂丂`);
-#ALTER TABLE `龖龖龖` ADD UNIQUE (`丅丅丅`);
-#ALTER TABLE `龖龖龖` ADD FOREIGN KEY (`乚乚乚`) REFERENCES `龗龗龗`(`乚乚乚`);
-ALTER TABLE `龖龖龖` CHANGE `丄丄丄` `丄丄` char(1);
-ALTER TABLE `龖龖龖` MODIFY `丂丂丂` char(6);
-
-SELECT * FROM `龖龖龖`;
-DESC `龖龖龖`;
-SHOW CREATE TABLE `龖龖龖`;
-
-ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
-ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
-#ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
-#ALTER TABLE `龖龖龖` DROP FOREIGN KEY `乚乚乚`;
-ALTER TABLE `龖龖龖` DROP `丄丄`;
-ALTER TABLE `龖龖龖` DROP `丅丅丅`;
-ALTER TABLE `龖龖龖` DROP `乚乚乚`;
-
-SELECT * FROM `龖龖龖`;
-DESC `龖龖龖`;
-SHOW CREATE TABLE `龖龖龖`;
-
-DROP TABLE `ｱｱｱ`;
-DROP TABLE `ｲｲｲ`;
-DROP TABLE `あああ`;
-DROP TABLE `いいい`;
-DROP TABLE `龖龖龖`;
-DROP TABLE `龗龗龗`;