1 files changed, 314 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test b/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test
new file mode 100644
index 00000000000..519697e3530
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test
@@ -0,0 +1,314 @@
+--source include/have_ucs2.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 `あああ`;
+DROP TABLE IF EXISTS `いいい`;
+DROP TABLE IF EXISTS `ううう`;
+DROP TABLE IF EXISTS `えええ`;
+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 creating table with Japanese characters in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+
+CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+# Tables should not be created because table names exist 
+CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+
+DESC `ｱｱｱ`; 
+DESC `ｲｲｲ`;
+DESC `ｳｳｳ`;
+DESC `ｴｴｴ`;
+DESC `ｵｵｵ`;
+DESC `あああ`;
+DESC `いいい`;
+DESC `ううう`;
+DESC `えええ`;
+DESC `おおお`;
+DESC `龖龖龖`;
+DESC `龗龗龗`;
+DESC `龞龞龞`;
+DESC `龡龡龡`;
+DESC `龢龢龢`;
+
+SHOW CREATE TABLE `ｱｱｱ`;
+SHOW CREATE TABLE `ｲｲｲ`;
+SHOW CREATE TABLE `ｳｳｳ`;
+SHOW CREATE TABLE `ｴｴｴ`;
+SHOW CREATE TABLE `ｵｵｵ`;
+SHOW CREATE TABLE `あああ`;
+SHOW CREATE TABLE `いいい`;
+SHOW CREATE TABLE `ううう`;
+SHOW CREATE TABLE `えええ`;
+SHOW CREATE TABLE `おおお`;
+SHOW CREATE TABLE `龖龖龖`;
+SHOW CREATE TABLE `龗龗龗`;
+SHOW CREATE TABLE `龞龞龞`;
+SHOW CREATE TABLE `龡龡龡`;
+SHOW CREATE TABLE `龢龢龢`;
+
+DROP TABLE `ｱｱｱ`;
+DROP TABLE `ｲｲｲ`;
+DROP TABLE `ｳｳｳ`;
+DROP TABLE `ｴｴｴ`;
+DROP TABLE `ｵｵｵ`;
+DROP TABLE `あああ`;
+DROP TABLE `いいい`;
+DROP TABLE `ううう`;
+DROP TABLE `えええ`;
+DROP TABLE `おおお`;
+DROP TABLE `龖龖龖`;
+DROP TABLE `龗龗龗`;
+DROP TABLE `龞龞龞`;
+DROP TABLE `龡龡龡`;
+DROP TABLE `龢龢龢`;
+
+CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+# Tables should not be created because table names exist
+CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+
+DESC `ｱｱｱ`;
+DESC `ｲｲｲ`;
+DESC `ｳｳｳ`;
+DESC `ｴｴｴ`;
+DESC `ｵｵｵ`;
+DESC `あああ`;
+DESC `いいい`;
+DESC `ううう`;
+DESC `えええ`;
+DESC `おおお`;
+DESC `龖龖龖`;
+DESC `龗龗龗`;
+DESC `龞龞龞`;
+DESC `龡龡龡`;
+DESC `龢龢龢`;
+
+SHOW CREATE TABLE `ｱｱｱ`;
+SHOW CREATE TABLE `ｲｲｲ`;
+SHOW CREATE TABLE `ｳｳｳ`;
+SHOW CREATE TABLE `ｴｴｴ`;
+SHOW CREATE TABLE `ｵｵｵ`;
+SHOW CREATE TABLE `あああ`;
+SHOW CREATE TABLE `いいい`;
+SHOW CREATE TABLE `ううう`;
+SHOW CREATE TABLE `えええ`;
+SHOW CREATE TABLE `おおお`;
+SHOW CREATE TABLE `龖龖龖`;
+SHOW CREATE TABLE `龗龗龗`;
+SHOW CREATE TABLE `龞龞龞`;
+SHOW CREATE TABLE `龡龡龡`;
+SHOW CREATE TABLE `龢龢龢`;
+
+DROP TABLE `ｱｱｱ`;
+DROP TABLE `ｲｲｲ`;
+DROP TABLE `ｳｳｳ`;
+DROP TABLE `ｴｴｴ`;
+DROP TABLE `ｵｵｵ`;
+DROP TABLE `あああ`;
+DROP TABLE `いいい`;
+DROP TABLE `ううう`;
+DROP TABLE `えええ`;
+DROP TABLE `おおお`;
+DROP TABLE `龖龖龖`;
+DROP TABLE `龗龗龗`;
+DROP TABLE `龞龞龞`;
+DROP TABLE `龡龡龡`;
+DROP TABLE `龢龢龢`;
+
+CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+# Tables should not be created because table names exist
+CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+
+DESC `ｱｱｱ`;
+DESC `ｲｲｲ`;
+DESC `ｳｳｳ`;
+DESC `ｴｴｴ`;
+DESC `ｵｵｵ`;
+DESC `あああ`;
+DESC `いいい`;
+DESC `ううう`;
+DESC `えええ`;
+DESC `おおお`;
+DESC `龖龖龖`;
+DESC `龗龗龗`;
+DESC `龞龞龞`;
+DESC `龡龡龡`;
+DESC `龢龢龢`;
+
+SHOW CREATE TABLE `ｱｱｱ`;
+SHOW CREATE TABLE `ｲｲｲ`;
+SHOW CREATE TABLE `ｳｳｳ`;
+SHOW CREATE TABLE `ｴｴｴ`;
+SHOW CREATE TABLE `ｵｵｵ`;
+SHOW CREATE TABLE `あああ`;
+SHOW CREATE TABLE `いいい`;
+SHOW CREATE TABLE `ううう`;
+SHOW CREATE TABLE `えええ`;
+SHOW CREATE TABLE `おおお`;
+SHOW CREATE TABLE `龖龖龖`;
+SHOW CREATE TABLE `龗龗龗`;
+SHOW CREATE TABLE `龞龞龞`;
+SHOW CREATE TABLE `龡龡龡`;
+SHOW CREATE TABLE `龢龢龢`;
+
+DROP TABLE `ｱｱｱ`;
+DROP TABLE `ｲｲｲ`;
+DROP TABLE `ｳｳｳ`;
+DROP TABLE `ｴｴｴ`;
+DROP TABLE `ｵｵｵ`;
+DROP TABLE `あああ`;
+DROP TABLE `いいい`;
+DROP TABLE `ううう`;
+DROP TABLE `えええ`;
+DROP TABLE `おおお`;
+DROP TABLE `龖龖龖`;
+DROP TABLE `龗龗龗`;
+DROP TABLE `龞龞龞`;
+DROP TABLE `龡龡龡`;
+DROP TABLE `龢龢龢`;
+
+CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+# Tables should not be created because table names exist
+CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+
+DESC `ｱｱｱ`;
+DESC `ｲｲｲ`;
+DESC `ｳｳｳ`;
+DESC `ｴｴｴ`;
+DESC `ｵｵｵ`;
+DESC `あああ`;
+DESC `いいい`;
+DESC `ううう`;
+DESC `えええ`;
+DESC `おおお`;
+DESC `龖龖龖`;
+DESC `龗龗龗`;
+DESC `龞龞龞`;
+DESC `龡龡龡`;
+DESC `龢龢龢`;
+
+SHOW CREATE TABLE `ｱｱｱ`;
+SHOW CREATE TABLE `ｲｲｲ`;
+SHOW CREATE TABLE `ｳｳｳ`;
+SHOW CREATE TABLE `ｴｴｴ`;
+SHOW CREATE TABLE `ｵｵｵ`;
+SHOW CREATE TABLE `あああ`;
+SHOW CREATE TABLE `いいい`;
+SHOW CREATE TABLE `ううう`;
+SHOW CREATE TABLE `えええ`;
+SHOW CREATE TABLE `おおお`;
+SHOW CREATE TABLE `龖龖龖`;
+SHOW CREATE TABLE `龗龗龗`;
+SHOW CREATE TABLE `龞龞龞`;
+SHOW CREATE TABLE `龡龡龡`;
+SHOW CREATE TABLE `龢龢龢`;
+
+DROP TABLE `ｱｱｱ`;
+DROP TABLE `ｲｲｲ`;
+DROP TABLE `ｳｳｳ`;
+DROP TABLE `ｴｴｴ`;
+DROP TABLE `ｵｵｵ`;
+DROP TABLE `あああ`;
+DROP TABLE `いいい`;
+DROP TABLE `ううう`;
+DROP TABLE `えええ`;
+DROP TABLE `おおお`;
+DROP TABLE `龖龖龖`;
+DROP TABLE `龗龗龗`;
+DROP TABLE `龞龞龞`;
+DROP TABLE `龡龡龡`;
+DROP TABLE `龢龢龢`;