1 files changed, 320 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/t/jp_alter_ujis.test b/mysql-test/suite/jp/t/jp_alter_ujis.test
new file mode 100644
index 00000000..e397cf66
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_alter_ujis.test
@@ -0,0 +1,320 @@
+--source include/have_ujis.inc
+--source include/have_innodb.inc
+
+
+--disable_warnings
+DROP TABLE IF EXISTS `ｱｱｱ`;
+DROP TABLE IF EXISTS `ｲｲｲ`;
+DROP TABLE IF EXISTS `あああ`;
+DROP TABLE IF EXISTS `いいい`;
+DROP TABLE IF EXISTS `龖龖龖`;
+DROP TABLE IF EXISTS `龗龗龗`;
+--enable_warnings
+
+#
+# Test altering table with Japanese characters in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+#
+# Test InnoDB
+#
+CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ujis engine=INNODB;
+
+INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ');
+INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
+INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅');
+
+# Test basic alter operation
+
+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 (`ｸｸｸ`);
+#Multi-byte field name is not allowed for FOREIGN KEY As of 4.1.4
+#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 (`くくく`);
+#Multi-byte field name is not allowed for FOREIGN KEY As of 4.1.4
+#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 (`丅丅丅`);
+#Multi-byte field name is not allowed for FOREIGN KEY As of 4.1.4
+#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 `龗龗龗`;
+
+#
+# Test MyISAM
+#
+
+CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ujis engine=MYISAM;
+CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ujis engine=MYISAM;
+CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ujis engine=MYISAM;
+CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ujis engine=MYISAM;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ujis engine=MYISAM;
+CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ujis engine=MYISAM;
+
+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 (`ｷｷｷ`);
+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 `龗龗龗`;
+
+#
+# Test 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;
+CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+
+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 (`ｷｷｷ`);
+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 `龗龗龗`;