Added test data, test case and test result files for Japanese characters test.

I have put the tests into a separate "suite", the first one actually.
Currently this can only be run by the Perl version of mysql-test-run
that is not quite finished. It should, or at least will, be able to
be run with the line

  ./mysql-test-run.pl --suite=jp

109 files changed, 18664 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/t/jp_alter_sjis.test b/mysql-test/suite/jp/t/jp_alter_sjis.test
new file mode 100755
index 00000000000..b7b31862599
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_alter_sjis.test
@@ -0,0 +1,416 @@
+--character_set sjis
+SET NAMES sjis;
+SET character_set_database = sjis;
+--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 sjis encoding
+#
+
+#
+# Test InnoDB
+#
+CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE `ソソソ`(`表表表` char(5)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE `十十十`(`予予予` char(5)) DEFAULT CHARSET = sjis 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 = sjis engine=MYISAM;
+CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = sjis engine=MYISAM;
+CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = sjis engine=MYISAM;
+CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = sjis engine=MYISAM;
+CREATE TABLE `ソソソ`(`表表表` char(5)) DEFAULT CHARSET = sjis engine=MYISAM;
+CREATE TABLE `十十十`(`予予予` char(5)) DEFAULT CHARSET = sjis 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 HEAP
+#
+
+CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `ソソソ`(`表表表` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `十十十`(`予予予` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
+
+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 BDB
+#
+
+CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE `ソソソ`(`表表表` char(5)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE `十十十`(`予予予` char(5)) DEFAULT CHARSET = sjis 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 `十十十`;
diff --git a/mysql-test/suite/jp/t/jp_alter_ucs2.test b/mysql-test/suite/jp/t/jp_alter_ucs2.test
new file mode 100755
index 00000000000..6c5b3132edf
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_alter_ucs2.test
@@ -0,0 +1,419 @@
+--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 `常ﾞ常ﾞ常ﾞ`;
+--enable_warnings
+
+#
+# Test altering table with Japanese characters in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+#
+# Test InnoDB
+#
+CREATE TABLE `竺竺竺`(`執執執` char(5)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE `軸軸軸`(`嫉嫉嫉` char(5)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE `､｢､｢､｢`(`､ｭ､ｭ､ｭ` char(5)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE `､､､､､､`(`､ｱ､ｱ､ｱ` char(5)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE `常ﾝ常ﾝ常ﾝ`(`床｡床｡床｡` char(5)) DEFAULT CHARSET = ucs2 engine=INNODB;
+CREATE TABLE `常ﾞ常ﾞ常ﾞ`(`床ｴ床ｴ床ｴ` char(5)) DEFAULT CHARSET = ucs2 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 = ucs2 engine=MYISAM;
+CREATE TABLE `軸軸軸`(`嫉嫉嫉` char(5)) DEFAULT CHARSET = ucs2 engine=MYISAM;
+CREATE TABLE `､｢､｢､｢`(`､ｭ､ｭ､ｭ` char(5)) DEFAULT CHARSET = ucs2 engine=MYISAM;
+CREATE TABLE `､､､､､､`(`､ｱ､ｱ､ｱ` char(5)) DEFAULT CHARSET = ucs2 engine=MYISAM;
+CREATE TABLE `常ﾝ常ﾝ常ﾝ`(`床｡床｡床｡` char(5)) DEFAULT CHARSET = ucs2 engine=MYISAM;
+CREATE TABLE `常ﾞ常ﾞ常ﾞ`(`床ｴ床ｴ床ｴ` char(5)) DEFAULT CHARSET = ucs2 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 HEAP
+#
+
+CREATE TABLE `竺竺竺`(`執執執` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `軸軸軸`(`嫉嫉嫉` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `､｢､｢､｢`(`､ｭ､ｭ､ｭ` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `､､､､､､`(`､ｱ､ｱ､ｱ` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `常ﾝ常ﾝ常ﾝ`(`床｡床｡床｡` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `常ﾞ常ﾞ常ﾞ`(`床ｴ床ｴ床ｴ` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
+
+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 BDB
+#
+
+CREATE TABLE `竺竺竺`(`執執執` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE `軸軸軸`(`嫉嫉嫉` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE `､｢､｢､｢`(`､ｭ､ｭ､ｭ` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE `､､､､､､`(`､ｱ､ｱ､ｱ` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE `常ﾝ常ﾝ常ﾝ`(`床｡床｡床｡` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE `常ﾞ常ﾞ常ﾞ`(`床ｴ床ｴ床ｴ` char(5)) DEFAULT CHARSET = ucs2 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 `常ﾞ常ﾞ常ﾞ`;
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 100755
index 00000000000..d388d20c49b
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_alter_ujis.test
@@ -0,0 +1,418 @@
+--source include/have_ujis.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 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=HEAP;
+
+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 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 `常ﾞ常ﾞ常ﾞ`;
diff --git a/mysql-test/suite/jp/t/jp_alter_utf8.test b/mysql-test/suite/jp/t/jp_alter_utf8.test
new file mode 100755
index 00000000000..6771343f38f
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_alter_utf8.test
@@ -0,0 +1,416 @@
+--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 utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+#
+# Test InnoDB
+#
+CREATE TABLE `�ｽｱ�ｽｱ�ｽｱ`(`�ｽｷ�ｽｷ�ｽｷ` char(5)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE `�ｽｲ�ｽｲ�ｽｲ`(`�ｽｹ�ｽｹ�ｽｹ` char(5)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE `縺ゅ≠縺Ａ(`縺阪″縺港 char(5)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE `縺�縺�縺Я(`縺代¢縺疏 char(5)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE `鮴夜ｾ夜ｾ冒(`荳ゆｸゆｸＡ char(5)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE `鮴鈴ｾ鈴ｾ輿(`荵壻ｹ壻ｹ啻 char(5)) DEFAULT CHARSET = utf8 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 = utf8 engine=MYISAM;
+CREATE TABLE `�ｽｲ�ｽｲ�ｽｲ`(`�ｽｹ�ｽｹ�ｽｹ` char(5)) DEFAULT CHARSET = utf8 engine=MYISAM;
+CREATE TABLE `縺ゅ≠縺Ａ(`縺阪″縺港 char(5)) DEFAULT CHARSET = utf8 engine=MYISAM;
+CREATE TABLE `縺�縺�縺Я(`縺代¢縺疏 char(5)) DEFAULT CHARSET = utf8 engine=MYISAM;
+CREATE TABLE `鮴夜ｾ夜ｾ冒(`荳ゆｸゆｸＡ char(5)) DEFAULT CHARSET = utf8 engine=MYISAM;
+CREATE TABLE `鮴鈴ｾ鈴ｾ輿(`荵壻ｹ壻ｹ啻 char(5)) DEFAULT CHARSET = utf8 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 HEAP
+#
+
+CREATE TABLE `�ｽｱ�ｽｱ�ｽｱ`(`�ｽｷ�ｽｷ�ｽｷ` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `�ｽｲ�ｽｲ�ｽｲ`(`�ｽｹ�ｽｹ�ｽｹ` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `縺ゅ≠縺Ａ(`縺阪″縺港 char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `縺�縺�縺Я(`縺代¢縺疏 char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `鮴夜ｾ夜ｾ冒(`荳ゆｸゆｸＡ char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `鮴鈴ｾ鈴ｾ輿(`荵壻ｹ壻ｹ啻 char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
+
+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 BDB
+#
+
+CREATE TABLE `�ｽｱ�ｽｱ�ｽｱ`(`�ｽｷ�ｽｷ�ｽｷ` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE `�ｽｲ�ｽｲ�ｽｲ`(`�ｽｹ�ｽｹ�ｽｹ` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE `縺ゅ≠縺Ａ(`縺阪″縺港 char(5)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE `縺�縺�縺Я(`縺代¢縺疏 char(5)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE `鮴夜ｾ夜ｾ冒(`荳ゆｸゆｸＡ char(5)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE `鮴鈴ｾ鈴ｾ輿(`荵壻ｹ壻ｹ啻 char(5)) DEFAULT CHARSET = utf8 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 `鮴鈴ｾ鈴ｾ輿;
diff --git a/mysql-test/suite/jp/t/jp_charlength_sjis.test b/mysql-test/suite/jp/t/jp_charlength_sjis.test
new file mode 100755
index 00000000000..5f3543bb7a6
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_charlength_sjis.test
@@ -0,0 +1,81 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test CHAR_LENGTH() function with Japanese character in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ５` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+
+#InnoDB
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ２`;
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ３`;
+
+#MyISAM
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ４`;
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ５`;
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ６`;
+
+#HEAP
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ７`;
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ８`;
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ９`;
+
+#BDB
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_charlength_ucs2.test b/mysql-test/suite/jp/t/jp_charlength_ucs2.test
new file mode 100755
index 00000000000..2db9db7cfc6
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_charlength_ucs2.test
@@ -0,0 +1,83 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test CHAR_LENGTH() function with Japanese character in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_charlength_ujis.test b/mysql-test/suite/jp/t/jp_charlength_ujis.test
new file mode 100755
index 00000000000..08973231f27
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_charlength_ujis.test
@@ -0,0 +1,82 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test CHAR_LENGTH() function with Japanese character in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CHAR_LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_charlength_utf8.test b/mysql-test/suite/jp/t/jp_charlength_utf8.test
new file mode 100755
index 00000000000..a3f74db27ee
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_charlength_utf8.test
@@ -0,0 +1,80 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test CHAR_LENGTH() function with Japanese character in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+
+#InnoDB
+SELECT `�ｼ｣�ｼ疏, CHAR_LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, CHAR_LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, CHAR_LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT `�ｼ｣�ｼ疏, CHAR_LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, CHAR_LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, CHAR_LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT `�ｼ｣�ｼ疏, CHAR_LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, CHAR_LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, CHAR_LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT `�ｼ｣�ｼ疏, CHAR_LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, CHAR_LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, CHAR_LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_charset_sjis.test b/mysql-test/suite/jp/t/jp_charset_sjis.test
new file mode 100755
index 00000000000..3a9f264bdfe
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_charset_sjis.test
@@ -0,0 +1,133 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test CHARSET() function with Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(20)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(20)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(20)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(20)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(20)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(20)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(20)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(20)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(20)) DEFAULT CHARSET = sjis engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ２`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ３`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ４`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ５`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ６`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ７`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ８`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ９`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１０`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ１１`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ１２`;
+
+#InnoDB
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１`;
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ２`;
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ３`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ２`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ２`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ２`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ２`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ３`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ３`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ３`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ３`;
+
+#MyISAM
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ４`;
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ５`;
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ６`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ４`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ４`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ４`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ４`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ５`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ５`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ５`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ５`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ６`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ６`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ６`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ６`;
+
+#Heap
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ７`;
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ８`;
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ９`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ７`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ７`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ７`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ７`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ８`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ８`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ８`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ８`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ９`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ９`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ９`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ９`;
+
+#BDB
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１０`;
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１１`;
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１２`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１０`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１０`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１０`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１０`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１１`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１１`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１１`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１１`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１２`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１２`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１２`;
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１２`;
+
+drop table `Ｔ１`;
+drop table `Ｔ２`;
+drop table `Ｔ３`;
+drop table `Ｔ４`;
+drop table `Ｔ５`;
+drop table `Ｔ６`;
+drop table `Ｔ７`;
+drop table `Ｔ８`;
+drop table `Ｔ９`;
+drop table `Ｔ１０`;
+drop table `Ｔ１１`;
+drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_charset_ucs2.test b/mysql-test/suite/jp/t/jp_charset_ucs2.test
new file mode 100755
index 00000000000..5183071033b
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_charset_ucs2.test
@@ -0,0 +1,221 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test CHARSET() function with Japanese characters in ucs2 encoding  
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+#Insert the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｲ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｳ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｴ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｵ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｶ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｷ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｸ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｹ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+ 
+#InnoDB
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｳ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｳ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｳ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｴ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｴ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｴ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｴ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｵ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｵ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｵ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｵ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｶ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｶ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｶ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｶ`;
+
+#Heap
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｷ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｷ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｷ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｷ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｸ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｸ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｸ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｸ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｹ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｹ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｹ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+drop table `｣ﾔ｣ｱ`;
+drop table `｣ﾔ｣ｲ`;
+drop table `｣ﾔ｣ｳ`;
+drop table `｣ﾔ｣ｴ`;
+drop table `｣ﾔ｣ｵ`;
+drop table `｣ﾔ｣ｶ`;
+drop table `｣ﾔ｣ｷ`;
+drop table `｣ﾔ｣ｸ`;
+drop table `｣ﾔ｣ｹ`;
+drop table `｣ﾔ｣ｱ｣ｰ`;
+drop table `｣ﾔ｣ｱ｣ｱ`;
+drop table `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_charset_ujis.test b/mysql-test/suite/jp/t/jp_charset_ujis.test
new file mode 100755
index 00000000000..de9ef318530
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_charset_ujis.test
@@ -0,0 +1,135 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test CHARSET() function with Japanese characters in ujis encoding  
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(20)) DEFAULT CHARSET = ujis engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｱ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｲ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｳ`; 
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｴ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｵ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｶ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｷ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｸ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｹ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｰ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｱ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｲ`;
+
+#InnoDB
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｳ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｳ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｳ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｴ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｴ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｴ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｴ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｵ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｵ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｵ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｵ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｶ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｶ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｶ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｶ`;
+
+#Heap
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｷ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｷ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｷ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｷ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｸ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｸ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｸ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｸ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｹ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｹ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｹ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT DISTINCT CHARSET(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING utf8)) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ucs2)) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING sjis)) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT DISTINCT CHARSET(CONVERT(`｣ﾃ｣ｱ` USING ujis)) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+drop table `｣ﾔ｣ｱ`;
+drop table `｣ﾔ｣ｲ`;
+drop table `｣ﾔ｣ｳ`;
+drop table `｣ﾔ｣ｴ`;
+drop table `｣ﾔ｣ｵ`;
+drop table `｣ﾔ｣ｶ`;
+drop table `｣ﾔ｣ｷ`;
+drop table `｣ﾔ｣ｸ`;
+drop table `｣ﾔ｣ｹ`;
+drop table `｣ﾔ｣ｱ｣ｰ`;
+drop table `｣ﾔ｣ｱ｣ｱ`;
+drop table `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_charset_utf8.test b/mysql-test/suite/jp/t/jp_charset_utf8.test
new file mode 100755
index 00000000000..2d73daba42a
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_charset_utf8.test
@@ -0,0 +1,133 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test CHARSET() function with Japanese characters in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(20)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(20)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(20)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(20)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(20)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(20)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(20)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(20)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(20)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(20)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(20)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(20)) DEFAULT CHARSET = utf8 engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ疏;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ蛋;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ伝;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ覗;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ描;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ冒;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ輿;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ倭;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ兪;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ秦;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ疏;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ蛋;
+
+#InnoDB
+SELECT DISTINCT CHARSET(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ疏;
+SELECT DISTINCT CHARSET(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ蛋;
+SELECT DISTINCT CHARSET(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ伝;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING utf8)) FROM `�ｼｴ�ｼ疏;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ucs2)) FROM `�ｼｴ�ｼ疏;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING sjis)) FROM `�ｼｴ�ｼ疏;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ujis)) FROM `�ｼｴ�ｼ疏;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING utf8)) FROM `�ｼｴ�ｼ蛋;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ucs2)) FROM `�ｼｴ�ｼ蛋;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING sjis)) FROM `�ｼｴ�ｼ蛋;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ujis)) FROM `�ｼｴ�ｼ蛋;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING utf8)) FROM `�ｼｴ�ｼ伝;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ucs2)) FROM `�ｼｴ�ｼ伝;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING sjis)) FROM `�ｼｴ�ｼ伝;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ujis)) FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT DISTINCT CHARSET(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ覗;
+SELECT DISTINCT CHARSET(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ描;
+SELECT DISTINCT CHARSET(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ冒;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING utf8)) FROM `�ｼｴ�ｼ覗;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ucs2)) FROM `�ｼｴ�ｼ覗;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING sjis)) FROM `�ｼｴ�ｼ覗;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ujis)) FROM `�ｼｴ�ｼ覗;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING utf8)) FROM `�ｼｴ�ｼ描;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ucs2)) FROM `�ｼｴ�ｼ描;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING sjis)) FROM `�ｼｴ�ｼ描;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ujis)) FROM `�ｼｴ�ｼ描;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING utf8)) FROM `�ｼｴ�ｼ冒;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ucs2)) FROM `�ｼｴ�ｼ冒;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING sjis)) FROM `�ｼｴ�ｼ冒;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ujis)) FROM `�ｼｴ�ｼ冒;
+
+#Heap
+SELECT DISTINCT CHARSET(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ輿;
+SELECT DISTINCT CHARSET(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ倭;
+SELECT DISTINCT CHARSET(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ兪;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING utf8)) FROM `�ｼｴ�ｼ輿;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ucs2)) FROM `�ｼｴ�ｼ輿;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING sjis)) FROM `�ｼｴ�ｼ輿;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ujis)) FROM `�ｼｴ�ｼ輿;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING utf8)) FROM `�ｼｴ�ｼ倭;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ucs2)) FROM `�ｼｴ�ｼ倭;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING sjis)) FROM `�ｼｴ�ｼ倭;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ujis)) FROM `�ｼｴ�ｼ倭;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING utf8)) FROM `�ｼｴ�ｼ兪;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ucs2)) FROM `�ｼｴ�ｼ兪;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING sjis)) FROM `�ｼｴ�ｼ兪;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ujis)) FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT DISTINCT CHARSET(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT DISTINCT CHARSET(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT DISTINCT CHARSET(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING utf8)) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ucs2)) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING sjis)) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ujis)) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING utf8)) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ucs2)) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING sjis)) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ujis)) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING utf8)) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ucs2)) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING sjis)) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT DISTINCT CHARSET(CONVERT(`�ｼ｣�ｼ疏 USING ujis)) FROM `�ｼｴ�ｼ托ｼ蛋;
+
+drop table `�ｼｴ�ｼ疏;
+drop table `�ｼｴ�ｼ蛋;
+drop table `�ｼｴ�ｼ伝;
+drop table `�ｼｴ�ｼ覗;
+drop table `�ｼｴ�ｼ描;
+drop table `�ｼｴ�ｼ冒;
+drop table `�ｼｴ�ｼ輿;
+drop table `�ｼｴ�ｼ倭;
+drop table `�ｼｴ�ｼ兪;
+drop table `�ｼｴ�ｼ托ｼ秦;
+drop table `�ｼｴ�ｼ托ｼ疏;
+drop table `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_convert_sjis.test b/mysql-test/suite/jp/t/jp_convert_sjis.test
new file mode 100755
index 00000000000..93fa33029bf
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_convert_sjis.test
@@ -0,0 +1,110 @@
+--character_set sjis
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test CONVERT() function with Japanese character in sjis encoding
+#
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ２`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ３`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ４`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ５`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ６`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ７`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ８`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ９`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１０`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ１１`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ１２`;
+
+#InnoDB
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ２`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ２`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ２`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ３`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ３`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ３`;
+
+#MyISAM
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ４`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ４`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ４`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ５`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ５`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ５`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ６`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ６`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ６`;
+
+#Heap
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ７`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ７`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ７`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ８`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ８`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ８`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ９`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ９`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ９`;
+
+#BDB
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１０`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１０`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１０`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１１`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１１`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１１`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１２`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１２`;
+SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１２`;
+
+drop table `Ｔ１`;
+drop table `Ｔ２`;
+drop table `Ｔ３`;
+drop table `Ｔ４`;
+drop table `Ｔ５`;
+drop table `Ｔ６`;
+drop table `Ｔ７`;
+drop table `Ｔ８`;
+drop table `Ｔ９`;
+drop table `Ｔ１０`;
+drop table `Ｔ１１`;
+drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_convert_ucs2.test b/mysql-test/suite/jp/t/jp_convert_ucs2.test
new file mode 100755
index 00000000000..88b0d0c9cba
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_convert_ucs2.test
@@ -0,0 +1,203 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test CONVERT() function with Japanese character in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+#Insert the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｲ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｳ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｴ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｵ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｶ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｷ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｸ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｹ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｳ`;
+# The result will get garbled because jisx0212 is not included in sjis
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｶ`;
+# The result will get garbled because jisx0212 is not included in sjis
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｶ`;
+
+#Heap
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｹ`;
+# The result will get garbled because jisx0212 is not included in sjis
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｱ｣ｲ`;
+# The result will get garbled because jisx0212 is not included in sjis
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+drop table `｣ﾔ｣ｱ`;
+drop table `｣ﾔ｣ｲ`;
+drop table `｣ﾔ｣ｳ`;
+drop table `｣ﾔ｣ｴ`;
+drop table `｣ﾔ｣ｵ`;
+drop table `｣ﾔ｣ｶ`;
+drop table `｣ﾔ｣ｷ`;
+drop table `｣ﾔ｣ｸ`;
+drop table `｣ﾔ｣ｹ`;
+drop table `｣ﾔ｣ｱ｣ｰ`;
+drop table `｣ﾔ｣ｱ｣ｱ`;
+drop table `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_convert_ujis.test b/mysql-test/suite/jp/t/jp_convert_ujis.test
new file mode 100755
index 00000000000..d6303b66f34
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_convert_ujis.test
@@ -0,0 +1,115 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test CONVERT() function with Japanese character in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｱ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｲ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｳ`; 
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｴ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｵ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｶ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｷ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｸ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｹ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｰ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｱ`;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｲ`;
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｳ`;
+# The result will get garbled because jisx0212 is not included in sjis
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｶ`;
+# The result will get garbled because jisx0212 is not included in sjis
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｶ`;
+
+#Heap
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｹ`;
+# The result will get garbled because jisx0212 is not included in sjis
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using utf8) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using ucs2) FROM `｣ﾔ｣ｱ｣ｲ`;
+# The result will get garbled because jisx0212 is not included in sjis
+SELECT `｣ﾃ｣ｱ`, CONVERT(`｣ﾃ｣ｱ` using sjis) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+drop table `｣ﾔ｣ｱ`;
+drop table `｣ﾔ｣ｲ`;
+drop table `｣ﾔ｣ｳ`;
+drop table `｣ﾔ｣ｴ`;
+drop table `｣ﾔ｣ｵ`;
+drop table `｣ﾔ｣ｶ`;
+drop table `｣ﾔ｣ｷ`;
+drop table `｣ﾔ｣ｸ`;
+drop table `｣ﾔ｣ｹ`;
+drop table `｣ﾔ｣ｱ｣ｰ`;
+drop table `｣ﾔ｣ｱ｣ｱ`;
+drop table `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_convert_utf8.test b/mysql-test/suite/jp/t/jp_convert_utf8.test
new file mode 100755
index 00000000000..a687b0f06cb
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_convert_utf8.test
@@ -0,0 +1,113 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test CONVERT() function with Japanese character in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ疏;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ蛋;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ伝;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ覗;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ描;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ冒;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ輿;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ倭;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ兪;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ秦;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ疏;
+ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ蛋;
+
+#InnoDB
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ujis) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ucs2) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using sjis) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ujis) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ucs2) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using sjis) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ujis) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ucs2) FROM `�ｼｴ�ｼ伝;
+# The result will get garbled because jisx0212 is not included in sjis
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using sjis) FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ujis) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ucs2) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using sjis) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ujis) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ucs2) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using sjis) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ujis) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ucs2) FROM `�ｼｴ�ｼ冒;
+# The result will get garbled because jisx0212 is not included in sjis
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using sjis) FROM `�ｼｴ�ｼ冒;
+
+#Heap
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ujis) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ucs2) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using sjis) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ujis) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ucs2) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using sjis) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ujis) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ucs2) FROM `�ｼｴ�ｼ兪;
+# The result will get garbled because jisx0212 is not included in sjis
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using sjis) FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ujis) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ucs2) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using sjis) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ujis) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ucs2) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using sjis) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ujis) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using ucs2) FROM `�ｼｴ�ｼ托ｼ蛋;
+# The result will get garbled because jisx0212 is not included in sjis
+SELECT `�ｼ｣�ｼ疏, CONVERT(`�ｼ｣�ｼ疏 using sjis) FROM `�ｼｴ�ｼ托ｼ蛋;
+
+drop table `�ｼｴ�ｼ疏;
+drop table `�ｼｴ�ｼ蛋;
+drop table `�ｼｴ�ｼ伝;
+drop table `�ｼｴ�ｼ覗;
+drop table `�ｼｴ�ｼ描;
+drop table `�ｼｴ�ｼ冒;
+drop table `�ｼｴ�ｼ輿;
+drop table `�ｼｴ�ｼ倭;
+drop table `�ｼｴ�ｼ兪;
+drop table `�ｼｴ�ｼ托ｼ秦;
+drop table `�ｼｴ�ｼ托ｼ疏;
+drop table `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_create_db_sjis.test b/mysql-test/suite/jp/t/jp_create_db_sjis.test
new file mode 100755
index 00000000000..ef66d338fce
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_create_db_sjis.test
@@ -0,0 +1,26 @@
+--character_set sjis
+SET NAMES sjis;
+SET character_set_database = sjis;
+--disable_warnings
+drop database if exists `ﾆﾎﾝｺﾞ`;
+drop database if exists `日本語`;
+drop database if exists `ソ十表`;
+--enable_warnings
+
+#
+# Test Creating databases using Japanese charact for DB name in ujis encoding
+#
+
+CREATE DATABASE `ﾆﾎﾝｺﾞ`;
+CREATE DATABASE `日本語`;
+CREATE DATABASE `ソ十表`;
+
+SHOW DATABASES;
+
+USE `ﾆﾎﾝｺﾞ`;
+USE `日本語`;
+USE `ソ十表`;
+
+DROP DATABASE `ﾆﾎﾝｺﾞ`;
+DROP DATABASE `日本語`;
+DROP DATABASE `ソ十表`;
diff --git a/mysql-test/suite/jp/t/jp_create_db_ucs2.test b/mysql-test/suite/jp/t/jp_create_db_ucs2.test
new file mode 100755
index 00000000000..9e8ca7d2a0f
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_create_db_ucs2.test
@@ -0,0 +1,29 @@
+--source include/have_ucs2.inc
+
+--disable_warnings
+drop database if exists `屡斜爵室酌`;
+drop database if exists `ﾆ�ﾋﾜｸ�`;
+drop database if exists `常ﾜ常ﾝ常ﾞ`;
+--enable_warnings
+
+#
+# Test Creating databases using Japanese charact for DB name in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET character_set_server = ucs2;
+
+CREATE DATABASE `屡斜爵室酌`;
+CREATE DATABASE `ﾆ�ﾋﾜｸ�`;
+CREATE DATABASE `常ﾜ常ﾝ常ﾞ`;
+
+SHOW DATABASES;
+
+USE `屡斜爵室酌`;
+USE `ﾆ�ﾋﾜｸ�`;
+USE `常ﾜ常ﾝ常ﾞ`;
+
+DROP DATABASE `屡斜爵室酌`;
+DROP DATABASE `ﾆ�ﾋﾜｸ�`;
+DROP DATABASE `常ﾜ常ﾝ常ﾞ`;
diff --git a/mysql-test/suite/jp/t/jp_create_db_ujis.test b/mysql-test/suite/jp/t/jp_create_db_ujis.test
new file mode 100755
index 00000000000..0095f864836
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_create_db_ujis.test
@@ -0,0 +1,28 @@
+--source include/have_ujis.inc
+
+--disable_warnings
+drop database if exists `屡斜爵室酌`;
+drop database if exists `ﾆ�ﾋﾜｸ�`;
+drop database if exists `常ﾜ常ﾝ常ﾞ`;
+--enable_warnings
+
+#
+# Test Creating databases using Japanese charact for DB name in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE DATABASE `屡斜爵室酌`;
+CREATE DATABASE `ﾆ�ﾋﾜｸ�`;
+CREATE DATABASE `常ﾜ常ﾝ常ﾞ`;
+
+SHOW DATABASES;
+
+USE `屡斜爵室酌`;
+USE `ﾆ�ﾋﾜｸ�`;
+USE `常ﾜ常ﾝ常ﾞ`;
+
+DROP DATABASE `屡斜爵室酌`;
+DROP DATABASE `ﾆ�ﾋﾜｸ�`;
+DROP DATABASE `常ﾜ常ﾝ常ﾞ`;
diff --git a/mysql-test/suite/jp/t/jp_create_db_utf8.test b/mysql-test/suite/jp/t/jp_create_db_utf8.test
new file mode 100755
index 00000000000..4f8eb24cbe3
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_create_db_utf8.test
@@ -0,0 +1,26 @@
+--disable_warnings
+drop database if exists `�ｾ��ｾ趣ｾ晢ｽｺ�ｾ杼;
+drop database if exists `譌･譛ｬ隱杼;
+drop database if exists `鮴秘ｾ夜ｾ輿;
+--enable_warnings
+
+#
+# Test Creating databases using Japanese charact for DB name in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE DATABASE `�ｾ��ｾ趣ｾ晢ｽｺ�ｾ杼;
+CREATE DATABASE `譌･譛ｬ隱杼;
+CREATE DATABASE `鮴秘ｾ夜ｾ輿;
+
+SHOW DATABASES;
+
+USE `�ｾ��ｾ趣ｾ晢ｽｺ�ｾ杼;
+USE `譌･譛ｬ隱杼;
+USE `鮴秘ｾ夜ｾ輿;
+
+DROP DATABASE `�ｾ��ｾ趣ｾ晢ｽｺ�ｾ杼;
+DROP DATABASE `譌･譛ｬ隱杼;
+DROP DATABASE `鮴秘ｾ夜ｾ輿;
diff --git a/mysql-test/suite/jp/t/jp_create_tbl_sjis.test b/mysql-test/suite/jp/t/jp_create_tbl_sjis.test
new file mode 100755
index 00000000000..45c0b24388b
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_create_tbl_sjis.test
@@ -0,0 +1,308 @@
+--character_set sjis
+SET NAMES sjis;
+SET character_set_database = sjis;
+--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
+
+CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+# Tables should not be created because table names exist 
+CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `表表表`(`申申申`char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TEMPORARY TABLE `予予予`(`貼貼貼` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+CREATE TEMPORARY TABLE `構構構`(`能能能` char(1)) DEFAULT CHARSET = sjis 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 = sjis engine=MyISAM;
+CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TABLE `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TABLE `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+# Tables should not be created because table names exist 
+CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `表表表`(`申申申`char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TEMPORARY TABLE `予予予`(`貼貼貼` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+CREATE TEMPORARY TABLE `構構構`(`能能能` char(1)) DEFAULT CHARSET = sjis 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 = sjis engine=HEAP;
+CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+# Tables should not be created because table names exist 
+CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `表表表`(`申申申`char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TEMPORARY TABLE `予予予`(`貼貼貼` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TEMPORARY TABLE `構構構`(`能能能` char(1)) DEFAULT CHARSET = sjis 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 = sjis engine=BDB;
+CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+# Tables should not be created because table names exist 
+CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE IF NOT EXISTS `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE IF NOT EXISTS `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE IF NOT EXISTS `表表表`(`申申申`char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TEMPORARY TABLE `予予予`(`貼貼貼` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TEMPORARY TABLE `構構構`(`能能能` char(1)) DEFAULT CHARSET = sjis 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 `構構構`;
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 100755
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 `常瘴�瘴�畫;
diff --git a/mysql-test/suite/jp/t/jp_create_tbl_ujis.test b/mysql-test/suite/jp/t/jp_create_tbl_ujis.test
new file mode 100755
index 00000000000..ac70facdce9
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_create_tbl_ujis.test
@@ -0,0 +1,314 @@
+--source include/have_ujis.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 ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `竺竺竺`(`叱叱叱` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE `軸軸軸`(`執執執` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE `､｢､｢､｢`(`､ｫ､ｫ､ｫ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE `､､､､､､`(`､ｭ､ｭ､ｭ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE `常ﾝ常ﾝ常ﾝ`(`床｡床｡床｡` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE `常ﾞ常ﾞ常ﾞ`(`床｢床｢床｢` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+# Tables should not be created because table names exist 
+CREATE TABLE IF NOT EXISTS `竺竺竺`(`叱叱叱` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `軸軸軸`(`執執執` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `､｢､｢､｢`(`､ｫ､ｫ､ｫ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `､､､､､､`(`､ｭ､ｭ､ｭ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `常ﾝ常ﾝ常ﾝ`(`床｡床｡床｡` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `常ﾞ常ﾞ常ﾞ`(`床｢床｢床｢` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `宍宍宍`(`失失失` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `､ｦ､ｦ､ｦ`(`､ｯ､ｯ､ｯ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TABLE IF NOT EXISTS `常ﾟ常ﾟ常ﾟ`(`床｣床｣床｣`char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TEMPORARY TABLE `雫雫雫`(`嫉嫉嫉` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TEMPORARY TABLE `七七七`(`室室室` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TEMPORARY TABLE `､ｨ､ｨ､ｨ`(`､ｱ､ｱ､ｱ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TEMPORARY TABLE `､ｪ､ｪ､ｪ`(`､ｳ､ｳ､ｳ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TEMPORARY TABLE `常熄�熄�濮(`床､床､床､` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+CREATE TEMPORARY TABLE `常瘴�瘴�畫(`床･床･床･` char(1)) DEFAULT CHARSET = ujis 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 = ujis engine=MyISAM;
+CREATE TABLE `軸軸軸`(`執執執` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TABLE `､｢､｢､｢`(`､ｫ､ｫ､ｫ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TABLE `､､､､､､`(`､ｭ､ｭ､ｭ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TABLE `常ﾝ常ﾝ常ﾝ`(`床｡床｡床｡` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TABLE `常ﾞ常ﾞ常ﾞ`(`床｢床｢床｢` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+# Tables should not be created because table names exist
+CREATE TABLE IF NOT EXISTS `竺竺竺`(`叱叱叱` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `軸軸軸`(`執執執` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `､｢､｢､｢`(`､ｫ､ｫ､ｫ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `､､､､､､`(`､ｭ､ｭ､ｭ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `常ﾝ常ﾝ常ﾝ`(`床｡床｡床｡` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `常ﾞ常ﾞ常ﾞ`(`床｢床｢床｢` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `宍宍宍`(`失失失` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `､ｦ､ｦ､ｦ`(`､ｯ､ｯ､ｯ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `常ﾟ常ﾟ常ﾟ`(`床｣床｣床｣`char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TEMPORARY TABLE `雫雫雫`(`嫉嫉嫉` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TEMPORARY TABLE `七七七`(`室室室` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TEMPORARY TABLE `､ｨ､ｨ､ｨ`(`､ｱ､ｱ､ｱ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TEMPORARY TABLE `､ｪ､ｪ､ｪ`(`､ｳ､ｳ､ｳ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TEMPORARY TABLE `常熄�熄�濮(`床､床､床､` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+CREATE TEMPORARY TABLE `常瘴�瘴�畫(`床･床･床･` char(1)) DEFAULT CHARSET = ujis 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 = ujis engine=HEAP;
+CREATE TABLE `軸軸軸`(`執執執` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE `､｢､｢､｢`(`､ｫ､ｫ､ｫ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE `､､､､､､`(`､ｭ､ｭ､ｭ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE `常ﾝ常ﾝ常ﾝ`(`床｡床｡床｡` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE `常ﾞ常ﾞ常ﾞ`(`床｢床｢床｢` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+# Tables should not be created because table names exist
+CREATE TABLE IF NOT EXISTS `竺竺竺`(`叱叱叱` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `軸軸軸`(`執執執` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `､｢､｢､｢`(`､ｫ､ｫ､ｫ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `､､､､､､`(`､ｭ､ｭ､ｭ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `常ﾝ常ﾝ常ﾝ`(`床｡床｡床｡` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `常ﾞ常ﾞ常ﾞ`(`床｢床｢床｢` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `宍宍宍`(`失失失` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `､ｦ､ｦ､ｦ`(`､ｯ､ｯ､ｯ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `常ﾟ常ﾟ常ﾟ`(`床｣床｣床｣`char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TEMPORARY TABLE `雫雫雫`(`嫉嫉嫉` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TEMPORARY TABLE `七七七`(`室室室` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TEMPORARY TABLE `､ｨ､ｨ､ｨ`(`､ｱ､ｱ､ｱ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TEMPORARY TABLE `､ｪ､ｪ､ｪ`(`､ｳ､ｳ､ｳ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TEMPORARY TABLE `常熄�熄�濮(`床､床､床､` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TEMPORARY TABLE `常瘴�瘴�畫(`床･床･床･` char(1)) DEFAULT CHARSET = ujis 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 = ujis engine=BDB;
+CREATE TABLE `軸軸軸`(`執執執` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TABLE `､｢､｢､｢`(`､ｫ､ｫ､ｫ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TABLE `､､､､､､`(`､ｭ､ｭ､ｭ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TABLE `常ﾝ常ﾝ常ﾝ`(`床｡床｡床｡` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TABLE `常ﾞ常ﾞ常ﾞ`(`床｢床｢床｢` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+# Tables should not be created because table names exist
+CREATE TABLE IF NOT EXISTS `竺竺竺`(`叱叱叱` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TABLE IF NOT EXISTS `軸軸軸`(`執執執` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TABLE IF NOT EXISTS `､｢､｢､｢`(`､ｫ､ｫ､ｫ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TABLE IF NOT EXISTS `､､､､､､`(`､ｭ､ｭ､ｭ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TABLE IF NOT EXISTS `常ﾝ常ﾝ常ﾝ`(`床｡床｡床｡` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TABLE IF NOT EXISTS `常ﾞ常ﾞ常ﾞ`(`床｢床｢床｢` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `宍宍宍`(`失失失` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TABLE IF NOT EXISTS `､ｦ､ｦ､ｦ`(`､ｯ､ｯ､ｯ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TABLE IF NOT EXISTS `常ﾟ常ﾟ常ﾟ`(`床｣床｣床｣`char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TEMPORARY TABLE `雫雫雫`(`嫉嫉嫉` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TEMPORARY TABLE `七七七`(`室室室` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TEMPORARY TABLE `､ｨ､ｨ､ｨ`(`､ｱ､ｱ､ｱ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TEMPORARY TABLE `､ｪ､ｪ､ｪ`(`､ｳ､ｳ､ｳ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TEMPORARY TABLE `常熄�熄�濮(`床､床､床､` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TEMPORARY TABLE `常瘴�瘴�畫(`床･床･床･` char(1)) DEFAULT CHARSET = ujis 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 `常瘴�瘴�畫;
diff --git a/mysql-test/suite/jp/t/jp_create_tbl_utf8.test b/mysql-test/suite/jp/t/jp_create_tbl_utf8.test
new file mode 100755
index 00000000000..5c816eb169a
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_create_tbl_utf8.test
@@ -0,0 +1,312 @@
+--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 utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｽｱ�ｽｱ�ｽｱ`(`�ｽｶ�ｽｶ�ｽｶ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE `�ｽｲ�ｽｲ�ｽｲ`(`�ｽｷ�ｽｷ�ｽｷ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE `縺ゅ≠縺Ａ(`縺九°縺義 char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE `縺�縺�縺Я(`縺阪″縺港 char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE `鮴夜ｾ夜ｾ冒(`荳ゆｸゆｸＡ char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE `鮴鈴ｾ鈴ｾ輿(`荳�荳�荳Я char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+# Tables should not be created because table names exist 
+CREATE TABLE IF NOT EXISTS `�ｽｱ�ｽｱ�ｽｱ`(`�ｽｶ�ｽｶ�ｽｶ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `�ｽｲ�ｽｲ�ｽｲ`(`�ｽｷ�ｽｷ�ｽｷ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `縺ゅ≠縺Ａ(`縺九°縺義 char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `縺�縺�縺Я(`縺阪″縺港 char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `鮴夜ｾ夜ｾ冒(`荳ゆｸゆｸＡ char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `鮴鈴ｾ鈴ｾ輿(`荳�荳�荳Я char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `�ｽｳ�ｽｳ�ｽｳ`(`�ｽｸ�ｽｸ�ｽｸ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `縺�縺�縺�`(`縺上￥縺汁 char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TABLE IF NOT EXISTS `鮴樣ｾ樣ｾ杼(`荳�荳�荳�`char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TEMPORARY TABLE `�ｽｴ�ｽｴ�ｽｴ`(`�ｽｹ�ｽｹ�ｽｹ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TEMPORARY TABLE `�ｽｵ�ｽｵ�ｽｵ`(`�ｽｺ�ｽｺ�ｽｺ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TEMPORARY TABLE `縺医∴縺�`(`縺代¢縺疏 char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TEMPORARY TABLE `縺翫♀縺柿(`縺薙％縺伝 char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TEMPORARY TABLE `鮴｡鮴｡鮴｡`(`荳御ｸ御ｸ形 char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+CREATE TEMPORARY TABLE `鮴｢鮴｢鮴｢`(`荳剃ｸ剃ｸ蛋 char(1)) DEFAULT CHARSET = utf8 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 = utf8 engine=MyISAM;
+CREATE TABLE `�ｽｲ�ｽｲ�ｽｲ`(`�ｽｷ�ｽｷ�ｽｷ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TABLE `縺ゅ≠縺Ａ(`縺九°縺義 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TABLE `縺�縺�縺Я(`縺阪″縺港 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TABLE `鮴夜ｾ夜ｾ冒(`荳ゆｸゆｸＡ char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TABLE `鮴鈴ｾ鈴ｾ輿(`荳�荳�荳Я char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+# Tables should not be created because table names exist
+CREATE TABLE IF NOT EXISTS `�ｽｱ�ｽｱ�ｽｱ`(`�ｽｶ�ｽｶ�ｽｶ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `�ｽｲ�ｽｲ�ｽｲ`(`�ｽｷ�ｽｷ�ｽｷ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `縺ゅ≠縺Ａ(`縺九°縺義 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `縺�縺�縺Я(`縺阪″縺港 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `鮴夜ｾ夜ｾ冒(`荳ゆｸゆｸＡ char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `鮴鈴ｾ鈴ｾ輿(`荳�荳�荳Я char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `�ｽｳ�ｽｳ�ｽｳ`(`�ｽｸ�ｽｸ�ｽｸ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `縺�縺�縺�`(`縺上￥縺汁 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TABLE IF NOT EXISTS `鮴樣ｾ樣ｾ杼(`荳�荳�荳�`char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TEMPORARY TABLE `�ｽｴ�ｽｴ�ｽｴ`(`�ｽｹ�ｽｹ�ｽｹ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TEMPORARY TABLE `�ｽｵ�ｽｵ�ｽｵ`(`�ｽｺ�ｽｺ�ｽｺ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TEMPORARY TABLE `縺医∴縺�`(`縺代¢縺疏 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TEMPORARY TABLE `縺翫♀縺柿(`縺薙％縺伝 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TEMPORARY TABLE `鮴｡鮴｡鮴｡`(`荳御ｸ御ｸ形 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+CREATE TEMPORARY TABLE `鮴｢鮴｢鮴｢`(`荳剃ｸ剃ｸ蛋 char(1)) DEFAULT CHARSET = utf8 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 = utf8 engine=HEAP;
+CREATE TABLE `�ｽｲ�ｽｲ�ｽｲ`(`�ｽｷ�ｽｷ�ｽｷ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `縺ゅ≠縺Ａ(`縺九°縺義 char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `縺�縺�縺Я(`縺阪″縺港 char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `鮴夜ｾ夜ｾ冒(`荳ゆｸゆｸＡ char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `鮴鈴ｾ鈴ｾ輿(`荳�荳�荳Я char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+# Tables should not be created because table names exist
+CREATE TABLE IF NOT EXISTS `�ｽｱ�ｽｱ�ｽｱ`(`�ｽｶ�ｽｶ�ｽｶ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `�ｽｲ�ｽｲ�ｽｲ`(`�ｽｷ�ｽｷ�ｽｷ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `縺ゅ≠縺Ａ(`縺九°縺義 char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `縺�縺�縺Я(`縺阪″縺港 char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `鮴夜ｾ夜ｾ冒(`荳ゆｸゆｸＡ char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `鮴鈴ｾ鈴ｾ輿(`荳�荳�荳Я char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `�ｽｳ�ｽｳ�ｽｳ`(`�ｽｸ�ｽｸ�ｽｸ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `縺�縺�縺�`(`縺上￥縺汁 char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `鮴樣ｾ樣ｾ杼(`荳�荳�荳�`char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TEMPORARY TABLE `�ｽｴ�ｽｴ�ｽｴ`(`�ｽｹ�ｽｹ�ｽｹ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TEMPORARY TABLE `�ｽｵ�ｽｵ�ｽｵ`(`�ｽｺ�ｽｺ�ｽｺ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TEMPORARY TABLE `縺医∴縺�`(`縺代¢縺疏 char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TEMPORARY TABLE `縺翫♀縺柿(`縺薙％縺伝 char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TEMPORARY TABLE `鮴｡鮴｡鮴｡`(`荳御ｸ御ｸ形 char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TEMPORARY TABLE `鮴｢鮴｢鮴｢`(`荳剃ｸ剃ｸ蛋 char(1)) DEFAULT CHARSET = utf8 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 = utf8 engine=BDB;
+CREATE TABLE `�ｽｲ�ｽｲ�ｽｲ`(`�ｽｷ�ｽｷ�ｽｷ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE `縺ゅ≠縺Ａ(`縺九°縺義 char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE `縺�縺�縺Я(`縺阪″縺港 char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE `鮴夜ｾ夜ｾ冒(`荳ゆｸゆｸＡ char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE `鮴鈴ｾ鈴ｾ輿(`荳�荳�荳Я char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+# Tables should not be created because table names exist
+CREATE TABLE IF NOT EXISTS `�ｽｱ�ｽｱ�ｽｱ`(`�ｽｶ�ｽｶ�ｽｶ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE IF NOT EXISTS `�ｽｲ�ｽｲ�ｽｲ`(`�ｽｷ�ｽｷ�ｽｷ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE IF NOT EXISTS `縺ゅ≠縺Ａ(`縺九°縺義 char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE IF NOT EXISTS `縺�縺�縺Я(`縺阪″縺港 char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE IF NOT EXISTS `鮴夜ｾ夜ｾ冒(`荳ゆｸゆｸＡ char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE IF NOT EXISTS `鮴鈴ｾ鈴ｾ輿(`荳�荳�荳Я char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+# Tables should be created
+CREATE TABLE IF NOT EXISTS `�ｽｳ�ｽｳ�ｽｳ`(`�ｽｸ�ｽｸ�ｽｸ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE IF NOT EXISTS `縺�縺�縺�`(`縺上￥縺汁 char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE IF NOT EXISTS `鮴樣ｾ樣ｾ杼(`荳�荳�荳�`char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TEMPORARY TABLE `�ｽｴ�ｽｴ�ｽｴ`(`�ｽｹ�ｽｹ�ｽｹ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TEMPORARY TABLE `�ｽｵ�ｽｵ�ｽｵ`(`�ｽｺ�ｽｺ�ｽｺ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TEMPORARY TABLE `縺医∴縺�`(`縺代¢縺疏 char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TEMPORARY TABLE `縺翫♀縺柿(`縺薙％縺伝 char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TEMPORARY TABLE `鮴｡鮴｡鮴｡`(`荳御ｸ御ｸ形 char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TEMPORARY TABLE `鮴｢鮴｢鮴｢`(`荳剃ｸ剃ｸ蛋 char(1)) DEFAULT CHARSET = utf8 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 `鮴｢鮴｢鮴｢`;
diff --git a/mysql-test/suite/jp/t/jp_enum_sjis.test b/mysql-test/suite/jp/t/jp_enum_sjis.test
new file mode 100755
index 00000000000..2ea1bf320e0
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_enum_sjis.test
@@ -0,0 +1,153 @@
+--character_set sjis
+--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 t1;
+--enable_warnings
+
+#
+# Test ENUM values with Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` ENUM('ソ','十','表'), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` ENUM('ソ','十','表'), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('ソ','十','表'), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` ENUM('ソ','十','表'), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱ'),('ｲ'),('ｳ');
+INSERT INTO `Ｔ２` VALUES ('あ'),('い'),('う');
+INSERT INTO `Ｔ３` VALUES ('ソ'),('十'),('表');
+INSERT INTO `Ｔ４` VALUES ('ｱ'),('ｲ'),('ｳ');
+INSERT INTO `Ｔ５` VALUES ('あ'),('い'),('う');
+INSERT INTO `Ｔ６` VALUES ('ソ'),('十'),('表');
+INSERT INTO `Ｔ７` VALUES ('ｱ'),('ｲ'),('ｳ');
+INSERT INTO `Ｔ８` VALUES ('あ'),('い'),('う');
+INSERT INTO `Ｔ９` VALUES ('ソ'),('十'),('表');
+INSERT INTO `Ｔ１０` VALUES ('ｱ'),('ｲ'),('ｳ');
+INSERT INTO `Ｔ１１` VALUES ('あ'),('い'),('う');
+INSERT INTO `Ｔ１２` VALUES ('ソ'),('十'),('表');
+
+SELECT * FROM `Ｔ１`;
+SELECT * FROM `Ｔ２`;
+SELECT * FROM `Ｔ３`;
+SELECT * FROM `Ｔ４`;
+SELECT * FROM `Ｔ５`;
+SELECT * FROM `Ｔ６`;
+SELECT * FROM `Ｔ７`;
+SELECT * FROM `Ｔ８`;
+SELECT * FROM `Ｔ９`;
+SELECT * FROM `Ｔ１０`;
+SELECT * FROM `Ｔ１１`;
+SELECT * FROM `Ｔ１２`;
+
+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 `Ｔ１２`;
+
+DESC `Ｔ１`;
+DESC `Ｔ２`;
+DESC `Ｔ３`;
+DESC `Ｔ４`;
+DESC `Ｔ５`;
+DESC `Ｔ６`;
+DESC `Ｔ７`;
+DESC `Ｔ８`;
+DESC `Ｔ９`;
+DESC `Ｔ１０`;
+DESC `Ｔ１１`;
+DESC `Ｔ１２`;
+
+#
+# Test problem with enum values after the colum with  NOT NULL restriction
+#
+
+ALTER TABLE `Ｔ１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ３` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ４` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ５` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ６` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ７` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ８` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ９` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ１０` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ１１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ１２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+
+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 `Ｔ１２`;
+
+#
+# Test to distinguish 0x9353 and 0x9373
+# bug #6206 need to be fixed
+
+#CREATE TABLE t1(c1 enum('鉄','都')) default character set = sjis;
+#INSERT INTO t1 VALUES('鉄'),('都');
+#SELECT * FROM t1 WHERE c1 LIKE '鉄';
+#DROP TABLE t1;
+
+DESC `Ｔ１`;
+DESC `Ｔ２`;
+DESC `Ｔ３`;
+DESC `Ｔ４`;
+DESC `Ｔ５`;
+DESC `Ｔ６`;
+DESC `Ｔ７`;
+DESC `Ｔ８`;
+DESC `Ｔ９`;
+DESC `Ｔ１０`;
+DESC `Ｔ１１`;
+DESC `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_enum_ucs2.test b/mysql-test/suite/jp/t/jp_enum_ucs2.test
new file mode 100755
index 00000000000..2239ebab478
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_enum_ucs2.test
@@ -0,0 +1,149 @@
+--source include/have_ucs2.inc
+
+# half-with kana is not handled correctly in 4.1
+# because of bug #5174
+# It will be fixed in 5.0
+
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test ENUM values with Japanese characters in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺'),('軸'),('宍');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢'),('､､'),('､ｦ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺'),('軸'),('宍');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢'),('､､'),('､ｦ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺'),('軸'),('宍');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢'),('､､'),('､ｦ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺'),('軸'),('宍');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢'),('､､'),('､ｦ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+
+SELECT * FROM `｣ﾔ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｲ`;
+SELECT * FROM `｣ﾔ｣ｳ`;
+SELECT * FROM `｣ﾔ｣ｴ`;
+SELECT * FROM `｣ﾔ｣ｵ`;
+SELECT * FROM `｣ﾔ｣ｶ`;
+SELECT * FROM `｣ﾔ｣ｷ`;
+SELECT * FROM `｣ﾔ｣ｸ`;
+SELECT * FROM `｣ﾔ｣ｹ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ`;
+
+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 `｣ﾔ｣ｱ｣ｲ`;
+
+DESC `｣ﾔ｣ｱ`;
+DESC `｣ﾔ｣ｲ`;
+DESC `｣ﾔ｣ｳ`;
+DESC `｣ﾔ｣ｴ`;
+DESC `｣ﾔ｣ｵ`;
+DESC `｣ﾔ｣ｶ`;
+DESC `｣ﾔ｣ｷ`;
+DESC `｣ﾔ｣ｸ`;
+DESC `｣ﾔ｣ｹ`;
+DESC `｣ﾔ｣ｱ｣ｰ`;
+DESC `｣ﾔ｣ｱ｣ｱ`;
+DESC `｣ﾔ｣ｱ｣ｲ`;
+
+#
+# Test problem with enum values after the colum with  NOT NULL restriction
+# Cannot test until the bug#7302 is fixed
+
+#ALTER TABLE `｣ﾔ｣ｱ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+#ALTER TABLE `｣ﾔ｣ｲ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+#ALTER TABLE `｣ﾔ｣ｳ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+#ALTER TABLE `｣ﾔ｣ｴ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+#ALTER TABLE `｣ﾔ｣ｵ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+#ALTER TABLE `｣ﾔ｣ｶ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+#ALTER TABLE `｣ﾔ｣ｷ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+#ALTER TABLE `｣ﾔ｣ｸ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+#ALTER TABLE `｣ﾔ｣ｹ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+#ALTER TABLE `｣ﾔ｣ｱ｣ｰ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+#ALTER TABLE `｣ﾔ｣ｱ｣ｱ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+#ALTER TABLE `｣ﾔ｣ｱ｣ｲ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+
+#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 `｣ﾔ｣ｱ｣ｲ`;
+
+#DESC `｣ﾔ｣ｱ`;
+#DESC `｣ﾔ｣ｲ`;
+#DESC `｣ﾔ｣ｳ`;
+#DESC `｣ﾔ｣ｴ`;
+#DESC `｣ﾔ｣ｵ`;
+#DESC `｣ﾔ｣ｶ`;
+#DESC `｣ﾔ｣ｷ`;
+#DESC `｣ﾔ｣ｸ`;
+#DESC `｣ﾔ｣ｹ`;
+#DESC `｣ﾔ｣ｱ｣ｰ`;
+#DESC `｣ﾔ｣ｱ｣ｱ`;
+#DESC `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_enum_ujis.test b/mysql-test/suite/jp/t/jp_enum_ujis.test
new file mode 100755
index 00000000000..da41165aad0
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_enum_ujis.test
@@ -0,0 +1,144 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test ENUM values with Japanese characters in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺'),('軸'),('宍');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢'),('､､'),('､ｦ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺'),('軸'),('宍');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢'),('､､'),('､ｦ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺'),('軸'),('宍');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢'),('､､'),('､ｦ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺'),('軸'),('宍');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢'),('､､'),('､ｦ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+
+SELECT * FROM `｣ﾔ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｲ`;
+SELECT * FROM `｣ﾔ｣ｳ`;
+SELECT * FROM `｣ﾔ｣ｴ`;
+SELECT * FROM `｣ﾔ｣ｵ`;
+SELECT * FROM `｣ﾔ｣ｶ`;
+SELECT * FROM `｣ﾔ｣ｷ`;
+SELECT * FROM `｣ﾔ｣ｸ`;
+SELECT * FROM `｣ﾔ｣ｹ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ`;
+
+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 `｣ﾔ｣ｱ｣ｲ`;
+
+DESC `｣ﾔ｣ｱ`;
+DESC `｣ﾔ｣ｲ`;
+DESC `｣ﾔ｣ｳ`;
+DESC `｣ﾔ｣ｴ`;
+DESC `｣ﾔ｣ｵ`;
+DESC `｣ﾔ｣ｶ`;
+DESC `｣ﾔ｣ｷ`;
+DESC `｣ﾔ｣ｸ`;
+DESC `｣ﾔ｣ｹ`;
+DESC `｣ﾔ｣ｱ｣ｰ`;
+DESC `｣ﾔ｣ｱ｣ｱ`;
+DESC `｣ﾔ｣ｱ｣ｲ`;
+
+#
+# Test problem with enum values after the colum with  NOT NULL restriction
+#
+
+ALTER TABLE `｣ﾔ｣ｱ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｲ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｳ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｴ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｵ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｶ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｷ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｸ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｹ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｱ｣ｰ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｱ｣ｱ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｱ｣ｲ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+
+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 `｣ﾔ｣ｱ｣ｲ`;
+
+DESC `｣ﾔ｣ｱ`;
+DESC `｣ﾔ｣ｲ`;
+DESC `｣ﾔ｣ｳ`;
+DESC `｣ﾔ｣ｴ`;
+DESC `｣ﾔ｣ｵ`;
+DESC `｣ﾔ｣ｶ`;
+DESC `｣ﾔ｣ｷ`;
+DESC `｣ﾔ｣ｸ`;
+DESC `｣ﾔ｣ｹ`;
+DESC `｣ﾔ｣ｱ｣ｰ`;
+DESC `｣ﾔ｣ｱ｣ｱ`;
+DESC `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_enum_utf8.test b/mysql-test/suite/jp/t/jp_enum_utf8.test
new file mode 100755
index 00000000000..4ce3576b604
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_enum_utf8.test
@@ -0,0 +1,142 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test ENUM values with Japanese characters in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 ENUM('�ｽｱ','�ｽｲ','�ｽｳ'), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 ENUM('縺�','縺�','縺�'), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 ENUM('鮴�','鮴�','鮴�'), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 ENUM('�ｽｱ','�ｽｲ','�ｽｳ'), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 ENUM('縺�','縺�','縺�'), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 ENUM('鮴�','鮴�','鮴�'), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 ENUM('�ｽｱ','�ｽｲ','�ｽｳ'), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 ENUM('縺�','縺�','縺�'), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 ENUM('鮴�','鮴�','鮴�'), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 ENUM('�ｽｱ','�ｽｲ','�ｽｳ'), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 ENUM('縺�','縺�','縺�'), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 ENUM('鮴�','鮴�','鮴�'), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ'),('�ｽｲ'),('�ｽｳ');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺�'),('縺�'),('縺�');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴�'),('鮴�'),('鮴�');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ'),('�ｽｲ'),('�ｽｳ');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺�'),('縺�'),('縺�');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴�'),('鮴�'),('鮴�');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ'),('�ｽｲ'),('�ｽｳ');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺�'),('縺�'),('縺�');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴�'),('鮴�'),('鮴�');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ'),('�ｽｲ'),('�ｽｳ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺�'),('縺�'),('縺�');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴�'),('鮴�'),('鮴�');
+
+SELECT * FROM `�ｼｴ�ｼ疏;
+SELECT * FROM `�ｼｴ�ｼ蛋;
+SELECT * FROM `�ｼｴ�ｼ伝;
+SELECT * FROM `�ｼｴ�ｼ覗;
+SELECT * FROM `�ｼｴ�ｼ描;
+SELECT * FROM `�ｼｴ�ｼ冒;
+SELECT * FROM `�ｼｴ�ｼ輿;
+SELECT * FROM `�ｼｴ�ｼ倭;
+SELECT * FROM `�ｼｴ�ｼ兪;
+SELECT * FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT * FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT * FROM `�ｼｴ�ｼ托ｼ蛋;
+
+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 `�ｼｴ�ｼ托ｼ蛋;
+
+DESC `�ｼｴ�ｼ疏;
+DESC `�ｼｴ�ｼ蛋;
+DESC `�ｼｴ�ｼ伝;
+DESC `�ｼｴ�ｼ覗;
+DESC `�ｼｴ�ｼ描;
+DESC `�ｼｴ�ｼ冒;
+DESC `�ｼｴ�ｼ輿;
+DESC `�ｼｴ�ｼ倭;
+DESC `�ｼｴ�ｼ兪;
+DESC `�ｼｴ�ｼ托ｼ秦;
+DESC `�ｼｴ�ｼ托ｼ疏;
+DESC `�ｼｴ�ｼ托ｼ蛋;
+
+#
+# Test problem with enum values after the colum with  NOT NULL restriction
+#
+
+ALTER TABLE `�ｼｴ�ｼ疏 ADD `�ｼ｣�ｼ蛋 CHAR(1) NOT NULL FIRST;
+ALTER TABLE `�ｼｴ�ｼ蛋 ADD `�ｼ｣�ｼ蛋 CHAR(1) NOT NULL FIRST;
+ALTER TABLE `�ｼｴ�ｼ伝 ADD `�ｼ｣�ｼ蛋 CHAR(1) NOT NULL FIRST;
+ALTER TABLE `�ｼｴ�ｼ覗 ADD `�ｼ｣�ｼ蛋 CHAR(1) NOT NULL FIRST;
+ALTER TABLE `�ｼｴ�ｼ描 ADD `�ｼ｣�ｼ蛋 CHAR(1) NOT NULL FIRST;
+ALTER TABLE `�ｼｴ�ｼ冒 ADD `�ｼ｣�ｼ蛋 CHAR(1) NOT NULL FIRST;
+ALTER TABLE `�ｼｴ�ｼ輿 ADD `�ｼ｣�ｼ蛋 CHAR(1) NOT NULL FIRST;
+ALTER TABLE `�ｼｴ�ｼ倭 ADD `�ｼ｣�ｼ蛋 CHAR(1) NOT NULL FIRST;
+ALTER TABLE `�ｼｴ�ｼ兪 ADD `�ｼ｣�ｼ蛋 CHAR(1) NOT NULL FIRST;
+ALTER TABLE `�ｼｴ�ｼ托ｼ秦 ADD `�ｼ｣�ｼ蛋 CHAR(1) NOT NULL FIRST;
+ALTER TABLE `�ｼｴ�ｼ托ｼ疏 ADD `�ｼ｣�ｼ蛋 CHAR(1) NOT NULL FIRST;
+ALTER TABLE `�ｼｴ�ｼ托ｼ蛋 ADD `�ｼ｣�ｼ蛋 CHAR(1) NOT NULL FIRST;
+
+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 `�ｼｴ�ｼ托ｼ蛋;
+
+DESC `�ｼｴ�ｼ疏;
+DESC `�ｼｴ�ｼ蛋;
+DESC `�ｼｴ�ｼ伝;
+DESC `�ｼｴ�ｼ覗;
+DESC `�ｼｴ�ｼ描;
+DESC `�ｼｴ�ｼ冒;
+DESC `�ｼｴ�ｼ輿;
+DESC `�ｼｴ�ｼ倭;
+DESC `�ｼｴ�ｼ兪;
+DESC `�ｼｴ�ｼ托ｼ秦;
+DESC `�ｼｴ�ｼ托ｼ疏;
+DESC `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_insert_sjis.test b/mysql-test/suite/jp/t/jp_insert_sjis.test
new file mode 100755
index 00000000000..0266ad1eaca
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_insert_sjis.test
@@ -0,0 +1,354 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test INSERT() function with Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ２` VALUES ('あいうえお');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ５` VALUES ('あいうえお');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ８` VALUES ('あいうえお');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構');
+
+#InnoDB
+SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,1,2,'ｶｷ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,1,3,'ｶｷｸ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,1,4,'ｶｷｸｹ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,1,5,'ｶｷｸｹｺ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,2,1,'ｷ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,2,2,'ｷｸ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,2,3,'ｷｸｹ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,2,4,'ｷｸｹｺ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,3,1,'ｸ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,3,2,'ｸｹ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,3,3,'ｸｹｺ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,4,1,'ｹ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,4,2,'ｹｺ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,5,1,'ｺ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,1,1,' ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,1,2,'  ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,1,3,'   ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,1,4,'    ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,1,5,'     ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,2,1,' ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,2,2,'  ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,2,3,'   ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,2,4,'    ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,3,1,' ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,3,2,'  ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,3,3,'   ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,4,1,' ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,4,2,'  ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,5,1,' ') FROM `Ｔ１`;
+SELECT INSERT(`Ｃ１`,1,1,'か') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,1,2,'かき') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,1,3,'かきく') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,1,4,'かきくけ') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,1,5,'かきくけこ') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,2,1,'き') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,2,2,'きく') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,2,3,'きくけ') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,2,4,'きくけこ') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,3,1,'く') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,3,2,'くけ') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,3,3,'くけこ') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,4,1,'け') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,4,2,'けこ') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,5,1,'こ') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,1,1,'　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,1,2,'　　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,1,3,'　　　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,1,4,'　　　　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,1,5,'　　　　　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,2,1,'　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,2,2,'　　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,2,3,'　　　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,2,4,'　　　　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,3,1,'　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,3,2,'　　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,3,3,'　　　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,4,1,'　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,4,2,'　　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,5,1,'　') FROM `Ｔ２`;
+SELECT INSERT(`Ｃ１`,1,1,'能') FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,1,2,'能能' ) FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,1,3,'能能能' ) FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,1,4,'能能能能' ) FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,1,5,'能能能能能' ) FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,2,1,'能') FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,2,2,'能能' ) FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,2,3,'能能能' ) FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,2,4,'能能能能' ) FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,3,1,'能') FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,3,2,'能能' ) FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,3,3,'能能能' ) FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,4,1,'能') FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,4,2,'能能' ) FROM `Ｔ３`;
+SELECT INSERT(`Ｃ１`,5,1,'能') FROM `Ｔ３`;
+
+#MyISAM
+SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,1,2,'ｶｷ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,1,3,'ｶｷｸ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,1,4,'ｶｷｸｹ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,1,5,'ｶｷｸｹｺ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,2,1,'ｷ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,2,2,'ｷｸ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,2,3,'ｷｸｹ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,2,4,'ｷｸｹｺ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,3,1,'ｸ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,3,2,'ｸｹ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,3,3,'ｸｹｺ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,4,1,'ｹ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,4,2,'ｹｺ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,5,1,'ｺ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,1,1,' ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,1,2,'  ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,1,3,'   ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,1,4,'    ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,1,5,'     ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,2,1,' ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,2,2,'  ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,2,3,'   ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,2,4,'    ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,3,1,' ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,3,2,'  ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,3,3,'   ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,4,1,' ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,4,2,'  ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,5,1,' ') FROM `Ｔ４`;
+SELECT INSERT(`Ｃ１`,1,1,'か') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,1,2,'かき') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,1,3,'かきく') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,1,4,'かきくけ') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,1,5,'かきくけこ') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,2,1,'き') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,2,2,'きく') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,2,3,'きくけ') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,2,4,'きくけこ') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,3,1,'く') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,3,2,'くけ') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,3,3,'くけこ') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,4,1,'け') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,4,2,'けこ') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,5,1,'こ') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,1,1,'　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,1,2,'　　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,1,3,'　　　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,1,4,'　　　　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,1,5,'　　　　　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,2,1,'　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,2,2,'　　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,2,3,'　　　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,2,4,'　　　　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,3,1,'　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,3,2,'　　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,3,3,'　　　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,4,1,'　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,4,2,'　　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,5,1,'　') FROM `Ｔ５`;
+SELECT INSERT(`Ｃ１`,1,1,'能') FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,1,2,'能能' ) FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,1,3,'能能能' ) FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,1,4,'能能能能' ) FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,1,5,'能能能能能' ) FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,2,1,'能') FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,2,2,'能能') FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,2,3,'能能能' ) FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,2,4,'能能能能' ) FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,3,1,'能') FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,3,2,'能能' ) FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,3,3,'能能能' ) FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,4,1,'能') FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,4,2,'能能' ) FROM `Ｔ６`;
+SELECT INSERT(`Ｃ１`,5,1,'能') FROM `Ｔ６`;
+
+#HEAP
+SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,1,2,'ｶｷ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,1,3,'ｶｷｸ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,1,4,'ｶｷｸｹ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,1,5,'ｶｷｸｹｺ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,2,1,'ｷ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,2,2,'ｷｸ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,2,3,'ｷｸｹ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,2,4,'ｷｸｹｺ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,3,1,'ｸ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,3,2,'ｸｹ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,3,3,'ｸｹｺ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,4,1,'ｹ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,4,2,'ｹｺ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,5,1,'ｺ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,1,1,' ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,1,2,'  ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,1,3,'   ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,1,4,'    ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,1,5,'     ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,2,1,' ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,2,2,'  ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,2,3,'   ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,2,4,'    ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,3,1,' ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,3,2,'  ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,3,3,'   ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,4,1,' ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,4,2,'  ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,5,1,' ') FROM `Ｔ７`;
+SELECT INSERT(`Ｃ１`,1,1,'か') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,1,2,'かき') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,1,3,'かきく') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,1,4,'かきくけ') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,1,5,'かきくけこ') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,2,1,'き') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,2,2,'きく') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,2,3,'きくけ') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,2,4,'きくけこ') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,3,1,'く') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,3,2,'くけ') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,3,3,'くけこ') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,4,1,'け') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,4,2,'けこ') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,5,1,'こ') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,1,1,'　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,1,2,'　　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,1,3,'　　　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,1,4,'　　　　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,1,5,'　　　　　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,2,1,'　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,2,2,'　　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,2,3,'　　　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,2,4,'　　　　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,3,1,'　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,3,2,'　　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,3,3,'　　　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,4,1,'　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,4,2,'　　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,5,1,'　') FROM `Ｔ８`;
+SELECT INSERT(`Ｃ１`,1,1,'能') FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,1,2,'能能' ) FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,1,3,'能能能' ) FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,1,4,'能能能能' ) FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,1,5,'能能能能能' ) FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,2,1,'能') FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,2,2,'能能' ) FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,2,3,'能能能' ) FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,2,4,'能能能能' ) FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,3,1,'能') FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,3,2,'能能' ) FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,3,3,'能能能' ) FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,4,1,'能') FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,4,2,'能能' ) FROM `Ｔ９`;
+SELECT INSERT(`Ｃ１`,5,1,'能') FROM `Ｔ９`;
+
+#BDB
+SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,1,2,'ｶｷ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,1,3,'ｶｷｸ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,1,4,'ｶｷｸｹ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,1,5,'ｶｷｸｹｺ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,2,1,'ｷ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,2,2,'ｷｸ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,2,3,'ｷｸｹ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,2,4,'ｷｸｹｺ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,3,1,'ｸ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,3,2,'ｸｹ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,3,3,'ｸｹｺ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,4,1,'ｹ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,4,2,'ｹｺ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,5,1,'ｺ') FROM `Ｔ１０`;
+SELECT INSERT(`Ｃ１`,1,1,'か') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,1,2,'かき') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,1,3,'かきく') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,1,4,'かきくけ') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,1,5,'かきくけこ') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,2,1,'き') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,2,2,'きく') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,2,3,'きくけ') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,2,4,'きくけこ') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,3,1,'く') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,3,2,'くけ') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,3,3,'くけこ') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,4,1,'け') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,4,2,'けこ') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,5,1,'こ') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,1,1,'　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,1,2,'　　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,1,3,'　　　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,1,4,'　　　　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,1,5,'　　　　　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,2,1,'　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,2,2,'　　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,2,3,'　　　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,2,4,'　　　　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,3,1,'　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,3,2,'　　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,3,3,'　　　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,4,1,'　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,4,2,'　　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,5,1,'　') FROM `Ｔ１１`;
+SELECT INSERT(`Ｃ１`,1,1,'能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,1,2,'能能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,1,3,'能能能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,1,4,'能能能能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,1,5,'能能能能能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,2,1,'能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,2,2,'能能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,2,3,'能能能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,2,4,'能能能能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,3,1,'能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,3,2,'能能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,3,3,'能能能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,4,1,'能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,4,2,'能能') FROM `Ｔ１２`;
+SELECT INSERT(`Ｃ１`,5,1,'能') FROM `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_insert_ucs2.test b/mysql-test/suite/jp/t/jp_insert_ucs2.test
new file mode 100755
index 00000000000..9b0a02e57d8
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_insert_ucs2.test
@@ -0,0 +1,356 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test INSERT() function with Japanese characters in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+#InnoDB
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'叱叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'叱叱叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'叱叱叱叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'叱叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'叱叱叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'叱叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,' ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'  ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'   ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'    ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'     ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,' ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'  ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'   ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'    ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,' ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'  ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'   ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,' ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'  ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,' ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'､ｫ､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'｡｡｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'床｡') FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'床｡床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'床｡') FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'床｡') FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'床｡') FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'床｡') FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'叱叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'叱叱叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'叱叱叱叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'叱叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'叱叱叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'叱叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,' ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'  ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'   ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'    ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'     ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,' ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'  ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'   ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'    ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,' ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'  ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'   ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,' ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'  ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,' ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'､ｫ､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'｡｡｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'床｡') FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'床｡床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'床｡') FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'床｡床｡') FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'床｡') FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'床｡') FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'床｡') FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'叱叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'叱叱叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'叱叱叱叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'叱叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'叱叱叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'叱叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,' ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'  ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'   ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'    ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'     ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,' ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'  ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'   ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'    ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,' ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'  ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'   ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,' ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'  ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,' ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'､ｫ､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'｡｡｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'床｡') FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'床｡床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'床｡') FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'床｡') FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'床｡') FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'床｡') FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'叱叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'叱叱叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'叱叱叱叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'叱叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'叱叱叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'叱叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'､ｫ､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'｡｡｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'床｡床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'床｡床｡床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'床｡床｡床｡床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'床｡床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'床｡床｡床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'床｡床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_insert_ujis.test b/mysql-test/suite/jp/t/jp_insert_ujis.test
new file mode 100755
index 00000000000..7b6d2838386
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_insert_ujis.test
@@ -0,0 +1,356 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test INSERT() function with Japanese characters in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+SET collation_connection = ujis_japanese_ci;
+
+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 = 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 = 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 = 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 ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+#InnoDB
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'叱叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'叱叱叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'叱叱叱叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'叱叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'叱叱叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'叱叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'叱叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'叱') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,' ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'  ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'   ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'    ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'     ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,' ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'  ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'   ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'    ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,' ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'  ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'   ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,' ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'  ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,' ') FROM `｣ﾔ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'､ｫ､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'､ｫ') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'｡｡｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'｡｡｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'｡｡') FROM `｣ﾔ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'床｡') FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'床｡床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'床｡') FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'床｡') FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'床｡') FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'床｡床｡' ) FROM `｣ﾔ｣ｳ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'床｡') FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'叱叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'叱叱叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'叱叱叱叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'叱叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'叱叱叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'叱叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'叱叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'叱') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,' ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'  ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'   ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'    ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'     ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,' ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'  ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'   ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'    ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,' ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'  ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'   ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,' ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'  ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,' ') FROM `｣ﾔ｣ｴ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'､ｫ､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'､ｫ') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'｡｡｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'｡｡｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'｡｡') FROM `｣ﾔ｣ｵ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'床｡') FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'床｡床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'床｡') FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'床｡床｡') FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'床｡') FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'床｡') FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'床｡床｡' ) FROM `｣ﾔ｣ｶ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'床｡') FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'叱叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'叱叱叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'叱叱叱叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'叱叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'叱叱叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'叱叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'叱叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'叱') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,' ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'  ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'   ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'    ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'     ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,' ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'  ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'   ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'    ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,' ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'  ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'   ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,' ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'  ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,' ') FROM `｣ﾔ｣ｷ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'､ｫ､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'､ｫ') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'｡｡｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'｡｡｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'｡｡') FROM `｣ﾔ｣ｸ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'床｡') FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'床｡床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'床｡') FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'床｡床｡床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'床｡') FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'床｡床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'床｡') FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'床｡床｡' ) FROM `｣ﾔ｣ｹ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'床｡') FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'叱叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'叱叱叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'叱叱叱叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'叱叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'叱叱叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'叱叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'叱叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'叱') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'､ｫ､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'､ｫ､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'､ｫ､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'､ｫ､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'､ｫ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'｡｡｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'｡｡｡｡｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'｡｡｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'｡｡｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'｡｡') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,1,'床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,2,'床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,3,'床｡床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,4,'床｡床｡床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,1,5,'床｡床｡床｡床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,1,'床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,2,'床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,3,'床｡床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,2,4,'床｡床｡床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,1,'床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,2,'床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,3,3,'床｡床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,1,'床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,4,2,'床｡床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSERT(`｣ﾃ｣ｱ`,5,1,'床｡') FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_insert_utf8.test b/mysql-test/suite/jp/t/jp_insert_utf8.test
new file mode 100755
index 00000000000..ef6acb90063
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_insert_utf8.test
@@ -0,0 +1,353 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test INSERT() function with Japanese characters in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+
+#InnoDB
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'�ｽｶ�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'�ｽｶ�ｽｶ�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'�ｽｶ�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'�ｽｶ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,' ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'  ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'   ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'    ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'     ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,' ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'  ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'   ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'    ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,' ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'  ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'   ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,' ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'  ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,' ') FROM `�ｼｴ�ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'縺�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'縺九°') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'縺九°縺�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'縺九°縺九°') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'縺九°縺九°縺�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'縺�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'縺九°') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'縺九°縺�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'縺九°縺九°') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'縺�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'縺九°') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'縺九°縺�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'縺�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'縺九°') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'縺�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'縲�縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'縲�縲�縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'縲�縲�縲�縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'縲�縲�縲�縲�縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'縲�縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'縲�縲�縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'縲�縲�縲�縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'縲�縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'縲�縲�縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'縲�縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'縲�') FROM `�ｼｴ�ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'荳�') FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'荳ゆｸ�' ) FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'荳ゆｸゆｸ�' ) FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'荳ゆｸゆｸゆｸ�' ) FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'荳ゆｸゆｸゆｸゆｸ�' ) FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'荳�') FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'荳ゆｸ�' ) FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'荳ゆｸゆｸ�' ) FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'荳ゆｸゆｸゆｸ�' ) FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'荳�') FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'荳ゆｸ�' ) FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'荳ゆｸゆｸ�' ) FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'荳�') FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'荳ゆｸ�' ) FROM `�ｼｴ�ｼ伝;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'荳�') FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'�ｽｶ�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'�ｽｶ�ｽｶ�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'�ｽｶ�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'�ｽｶ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,' ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'  ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'   ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'    ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'     ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,' ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'  ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'   ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'    ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,' ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'  ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'   ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,' ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'  ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,' ') FROM `�ｼｴ�ｼ覗;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'縺�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'縺九°') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'縺九°縺�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'縺九°縺九°') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'縺九°縺九°縺�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'縺�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'縺九°') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'縺九°縺�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'縺九°縺九°') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'縺�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'縺九°') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'縺九°縺�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'縺�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'縺九°') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'縺�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'縲�縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'縲�縲�縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'縲�縲�縲�縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'縲�縲�縲�縲�縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'縲�縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'縲�縲�縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'縲�縲�縲�縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'縲�縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'縲�縲�縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'縲�縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'縲�') FROM `�ｼｴ�ｼ描;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'荳�') FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'荳ゆｸ�' ) FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'荳ゆｸゆｸ�' ) FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'荳ゆｸゆｸゆｸ�' ) FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'荳ゆｸゆｸゆｸゆｸ�' ) FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'荳�') FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'荳ゆｸ�') FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'荳ゆｸゆｸ�' ) FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'荳ゆｸゆｸゆｸ�' ) FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'荳�') FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'荳ゆｸ�' ) FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'荳ゆｸゆｸ�' ) FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'荳�') FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'荳ゆｸ�' ) FROM `�ｼｴ�ｼ冒;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'荳�') FROM `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'�ｽｶ�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'�ｽｶ�ｽｶ�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'�ｽｶ�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'�ｽｶ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,' ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'  ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'   ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'    ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'     ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,' ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'  ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'   ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'    ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,' ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'  ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'   ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,' ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'  ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,' ') FROM `�ｼｴ�ｼ輿;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'縺�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'縺九°') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'縺九°縺�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'縺九°縺九°') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'縺九°縺九°縺�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'縺�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'縺九°') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'縺九°縺�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'縺九°縺九°') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'縺�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'縺九°') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'縺九°縺�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'縺�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'縺九°') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'縺�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'縲�縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'縲�縲�縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'縲�縲�縲�縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'縲�縲�縲�縲�縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'縲�縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'縲�縲�縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'縲�縲�縲�縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'縲�縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'縲�縲�縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'縲�縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'縲�') FROM `�ｼｴ�ｼ倭;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'荳�') FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'荳ゆｸ�' ) FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'荳ゆｸゆｸ�' ) FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'荳ゆｸゆｸゆｸ�' ) FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'荳ゆｸゆｸゆｸゆｸ�' ) FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'荳�') FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'荳ゆｸ�' ) FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'荳ゆｸゆｸ�' ) FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'荳ゆｸゆｸゆｸ�' ) FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'荳�') FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'荳ゆｸ�' ) FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'荳ゆｸゆｸ�' ) FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'荳�') FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'荳ゆｸ�' ) FROM `�ｼｴ�ｼ兪;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'荳�') FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'�ｽｶ�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'�ｽｶ�ｽｶ�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'�ｽｶ�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'�ｽｶ�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'�ｽｶ�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'�ｽｶ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'縺�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'縺九°') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'縺九°縺�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'縺九°縺九°') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'縺九°縺九°縺�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'縺�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'縺九°') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'縺九°縺�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'縺九°縺九°') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'縺�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'縺九°') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'縺九°縺�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'縺�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'縺九°') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'縺�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'縲�縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'縲�縲�縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'縲�縲�縲�縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'縲�縲�縲�縲�縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'縲�縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'縲�縲�縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'縲�縲�縲�縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'縲�縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'縲�縲�縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'縲�縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'縲�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,1,'荳�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,2,'荳ゆｸ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,3,'荳ゆｸゆｸ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,4,'荳ゆｸゆｸゆｸ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,1,5,'荳ゆｸゆｸゆｸゆｸ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,1,'荳�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,2,'荳ゆｸ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,3,'荳ゆｸゆｸ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,2,4,'荳ゆｸゆｸゆｸ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,1,'荳�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,2,'荳ゆｸ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,3,3,'荳ゆｸゆｸ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,1,'荳�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,4,2,'荳ゆｸ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSERT(`�ｼ｣�ｼ疏,5,1,'荳�') FROM `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_instr_sjis.test b/mysql-test/suite/jp/t/jp_instr_sjis.test
new file mode 100755
index 00000000000..c19b5f2b14c
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_instr_sjis.test
@@ -0,0 +1,139 @@
+--character_set sjis
+--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 `Ｔ１０`;
+--enable_warnings
+
+#
+# Test INSTR() function with Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ２` VALUES ('あいうえお');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ５` VALUES ('あいうえお');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ８` VALUES ('あいうえお');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構');
+
+#InnoDB
+SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１`;
+SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ１`;
+SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ１`;
+SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ１`;
+SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ１`;
+SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ１`;
+SELECT INSTR(`Ｃ１`,'あ') from `Ｔ２`;
+SELECT INSTR(`Ｃ１`,'い') from `Ｔ２`;
+SELECT INSTR(`Ｃ１`,'う') from `Ｔ２`;
+SELECT INSTR(`Ｃ１`,'え') from `Ｔ２`;
+SELECT INSTR(`Ｃ１`,'お') from `Ｔ２`;
+SELECT INSTR(`Ｃ１`,'ん') from `Ｔ２`;
+SELECT INSTR(`Ｃ１`,'ソ') from `Ｔ３`;
+SELECT INSTR(`Ｃ１`,'十') from `Ｔ３`;
+SELECT INSTR(`Ｃ１`,'表') from `Ｔ３`;
+SELECT INSTR(`Ｃ１`,'予') from `Ｔ３`;
+SELECT INSTR(`Ｃ１`,'構') from `Ｔ３`;
+SELECT INSTR(`Ｃ１`,'噂') from `Ｔ３`;
+
+#MyISAM
+SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ４`;
+SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ４`;
+SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ４`;
+SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ４`;
+SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ４`;
+SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ４`;
+SELECT INSTR(`Ｃ１`,'あ') from `Ｔ５`;
+SELECT INSTR(`Ｃ１`,'い') from `Ｔ５`;
+SELECT INSTR(`Ｃ１`,'う') from `Ｔ５`;
+SELECT INSTR(`Ｃ１`,'え') from `Ｔ５`;
+SELECT INSTR(`Ｃ１`,'お') from `Ｔ５`;
+SELECT INSTR(`Ｃ１`,'ん') from `Ｔ５`;
+SELECT INSTR(`Ｃ１`,'ソ') from `Ｔ６`;
+SELECT INSTR(`Ｃ１`,'十') from `Ｔ６`;
+SELECT INSTR(`Ｃ１`,'表') from `Ｔ６`;
+SELECT INSTR(`Ｃ１`,'予') from `Ｔ６`;
+SELECT INSTR(`Ｃ１`,'構') from `Ｔ６`;
+SELECT INSTR(`Ｃ１`,'噂') from `Ｔ６`;
+
+#HEAP
+SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ７`;
+SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ７`;
+SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ７`;
+SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ７`;
+SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ７`;
+SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ７`;
+SELECT INSTR(`Ｃ１`,'あ') from `Ｔ８`;
+SELECT INSTR(`Ｃ１`,'い') from `Ｔ８`;
+SELECT INSTR(`Ｃ１`,'う') from `Ｔ８`;
+SELECT INSTR(`Ｃ１`,'え') from `Ｔ８`;
+SELECT INSTR(`Ｃ１`,'お') from `Ｔ８`;
+SELECT INSTR(`Ｃ１`,'ん') from `Ｔ８`;
+SELECT INSTR(`Ｃ１`,'ソ') from `Ｔ９`;
+SELECT INSTR(`Ｃ１`,'十') from `Ｔ９`;
+SELECT INSTR(`Ｃ１`,'表') from `Ｔ９`;
+SELECT INSTR(`Ｃ１`,'予') from `Ｔ９`;
+SELECT INSTR(`Ｃ１`,'構') from `Ｔ９`;
+SELECT INSTR(`Ｃ１`,'噂') from `Ｔ９`;
+
+#BDB
+SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１０`;
+SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ１０`;
+SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ１０`;
+SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ１０`;
+SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ１０`;
+SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ１０`;
+SELECT INSTR(`Ｃ１`,'あ') from `Ｔ１１`;
+SELECT INSTR(`Ｃ１`,'い') from `Ｔ１１`;
+SELECT INSTR(`Ｃ１`,'う') from `Ｔ１１`;
+SELECT INSTR(`Ｃ１`,'え') from `Ｔ１１`;
+SELECT INSTR(`Ｃ１`,'お') from `Ｔ１１`;
+SELECT INSTR(`Ｃ１`,'ん') from `Ｔ１１`;
+SELECT INSTR(`Ｃ１`,'ソ') from `Ｔ１２`;
+SELECT INSTR(`Ｃ１`,'十') from `Ｔ１２`;
+SELECT INSTR(`Ｃ１`,'表') from `Ｔ１２`;
+SELECT INSTR(`Ｃ１`,'予') from `Ｔ１２`;
+SELECT INSTR(`Ｃ１`,'構') from `Ｔ１２`;
+SELECT INSTR(`Ｃ１`,'噂') from `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_instr_ucs2.test b/mysql-test/suite/jp/t/jp_instr_ucs2.test
new file mode 100755
index 00000000000..b8f83961e90
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_instr_ucs2.test
@@ -0,0 +1,141 @@
+--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 `｣ﾔ｣ｱ｣ｰ`;
+--enable_warnings
+
+#
+# Test INSTR() function with Japanese characters in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+#InnoDB
+SELECT INSTR(`｣ﾃ｣ｱ`,'竺') from `｣ﾔ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'軸') from `｣ﾔ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'宍') from `｣ﾔ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'雫') from `｣ﾔ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'七') from `｣ﾔ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'爵') from `｣ﾔ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､｢') from `｣ﾔ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､､') from `｣ﾔ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｦ') from `｣ﾔ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｨ') from `｣ﾔ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｪ') from `｣ﾔ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､�') from `｣ﾔ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾜ') from `｣ﾔ｣ｳ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾝ') from `｣ﾔ｣ｳ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾞ') from `｣ﾔ｣ｳ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾟ') from `｣ﾔ｣ｳ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常�') from `｣ﾔ｣ｳ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'床｡') from `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT INSTR(`｣ﾃ｣ｱ`,'竺') from `｣ﾔ｣ｴ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'軸') from `｣ﾔ｣ｴ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'宍') from `｣ﾔ｣ｴ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'雫') from `｣ﾔ｣ｴ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'七') from `｣ﾔ｣ｴ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'爵') from `｣ﾔ｣ｴ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､｢') from `｣ﾔ｣ｵ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､､') from `｣ﾔ｣ｵ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｦ') from `｣ﾔ｣ｵ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｨ') from `｣ﾔ｣ｵ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｪ') from `｣ﾔ｣ｵ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､�') from `｣ﾔ｣ｵ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾜ') from `｣ﾔ｣ｶ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾝ') from `｣ﾔ｣ｶ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾞ') from `｣ﾔ｣ｶ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾟ') from `｣ﾔ｣ｶ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常�') from `｣ﾔ｣ｶ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'床｡') from `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT INSTR(`｣ﾃ｣ｱ`,'竺') from `｣ﾔ｣ｷ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'軸') from `｣ﾔ｣ｷ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'宍') from `｣ﾔ｣ｷ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'雫') from `｣ﾔ｣ｷ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'七') from `｣ﾔ｣ｷ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'爵') from `｣ﾔ｣ｷ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､｢') from `｣ﾔ｣ｸ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､､') from `｣ﾔ｣ｸ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｦ') from `｣ﾔ｣ｸ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｨ') from `｣ﾔ｣ｸ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｪ') from `｣ﾔ｣ｸ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､�') from `｣ﾔ｣ｸ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾜ') from `｣ﾔ｣ｹ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾝ') from `｣ﾔ｣ｹ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾞ') from `｣ﾔ｣ｹ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾟ') from `｣ﾔ｣ｹ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常�') from `｣ﾔ｣ｹ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'床｡') from `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT INSTR(`｣ﾃ｣ｱ`,'竺') from `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'軸') from `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'宍') from `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'雫') from `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'七') from `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'爵') from `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､｢') from `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､､') from `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｦ') from `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｨ') from `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｪ') from `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､�') from `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾜ') from `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾝ') from `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾞ') from `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾟ') from `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常�') from `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'床｡') from `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_instr_ujis.test b/mysql-test/suite/jp/t/jp_instr_ujis.test
new file mode 100755
index 00000000000..696e1147372
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_instr_ujis.test
@@ -0,0 +1,140 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｰ`;
+--enable_warnings
+
+#
+# Test INSTR() function with Japanese characters in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+#InnoDB
+SELECT INSTR(`｣ﾃ｣ｱ`,'竺') from `｣ﾔ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'軸') from `｣ﾔ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'宍') from `｣ﾔ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'雫') from `｣ﾔ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'七') from `｣ﾔ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'爵') from `｣ﾔ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､｢') from `｣ﾔ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､､') from `｣ﾔ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｦ') from `｣ﾔ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｨ') from `｣ﾔ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｪ') from `｣ﾔ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､�') from `｣ﾔ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾜ') from `｣ﾔ｣ｳ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾝ') from `｣ﾔ｣ｳ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾞ') from `｣ﾔ｣ｳ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾟ') from `｣ﾔ｣ｳ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常�') from `｣ﾔ｣ｳ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'床｡') from `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT INSTR(`｣ﾃ｣ｱ`,'竺') from `｣ﾔ｣ｴ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'軸') from `｣ﾔ｣ｴ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'宍') from `｣ﾔ｣ｴ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'雫') from `｣ﾔ｣ｴ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'七') from `｣ﾔ｣ｴ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'爵') from `｣ﾔ｣ｴ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､｢') from `｣ﾔ｣ｵ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､､') from `｣ﾔ｣ｵ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｦ') from `｣ﾔ｣ｵ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｨ') from `｣ﾔ｣ｵ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｪ') from `｣ﾔ｣ｵ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､�') from `｣ﾔ｣ｵ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾜ') from `｣ﾔ｣ｶ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾝ') from `｣ﾔ｣ｶ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾞ') from `｣ﾔ｣ｶ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾟ') from `｣ﾔ｣ｶ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常�') from `｣ﾔ｣ｶ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'床｡') from `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT INSTR(`｣ﾃ｣ｱ`,'竺') from `｣ﾔ｣ｷ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'軸') from `｣ﾔ｣ｷ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'宍') from `｣ﾔ｣ｷ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'雫') from `｣ﾔ｣ｷ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'七') from `｣ﾔ｣ｷ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'爵') from `｣ﾔ｣ｷ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､｢') from `｣ﾔ｣ｸ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､､') from `｣ﾔ｣ｸ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｦ') from `｣ﾔ｣ｸ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｨ') from `｣ﾔ｣ｸ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｪ') from `｣ﾔ｣ｸ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､�') from `｣ﾔ｣ｸ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾜ') from `｣ﾔ｣ｹ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾝ') from `｣ﾔ｣ｹ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾞ') from `｣ﾔ｣ｹ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾟ') from `｣ﾔ｣ｹ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常�') from `｣ﾔ｣ｹ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'床｡') from `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT INSTR(`｣ﾃ｣ｱ`,'竺') from `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'軸') from `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'宍') from `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'雫') from `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'七') from `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'爵') from `｣ﾔ｣ｱ｣ｰ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､｢') from `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､､') from `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｦ') from `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｨ') from `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､ｪ') from `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'､�') from `｣ﾔ｣ｱ｣ｱ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾜ') from `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾝ') from `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾞ') from `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常ﾟ') from `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'常�') from `｣ﾔ｣ｱ｣ｲ`;
+SELECT INSTR(`｣ﾃ｣ｱ`,'床｡') from `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_instr_utf8.test b/mysql-test/suite/jp/t/jp_instr_utf8.test
new file mode 100755
index 00000000000..b25b72bc8d0
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_instr_utf8.test
@@ -0,0 +1,138 @@
+--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 `�ｼｴ�ｼ托ｼ秦;
+--enable_warnings
+
+#
+# Test INSTR() function with Japanese characters in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+
+#InnoDB
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｱ') from `�ｼｴ�ｼ疏;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｲ') from `�ｼｴ�ｼ疏;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｳ') from `�ｼｴ�ｼ疏;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｴ') from `�ｼｴ�ｼ疏;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｵ') from `�ｼｴ�ｼ疏;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｾ�') from `�ｼｴ�ｼ疏;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ蛋;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ蛋;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ蛋;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ蛋;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ蛋;
+SELECT INSTR(`�ｼ｣�ｼ疏,'繧�') from `�ｼｴ�ｼ蛋;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ伝;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ伝;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ伝;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ伝;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴｡') from `�ｼｴ�ｼ伝;
+SELECT INSTR(`�ｼ｣�ｼ疏,'荳�') from `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｱ') from `�ｼｴ�ｼ覗;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｲ') from `�ｼｴ�ｼ覗;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｳ') from `�ｼｴ�ｼ覗;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｴ') from `�ｼｴ�ｼ覗;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｵ') from `�ｼｴ�ｼ覗;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｾ�') from `�ｼｴ�ｼ覗;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ描;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ描;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ描;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ描;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ描;
+SELECT INSTR(`�ｼ｣�ｼ疏,'繧�') from `�ｼｴ�ｼ描;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ冒;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ冒;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ冒;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ冒;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴｡') from `�ｼｴ�ｼ冒;
+SELECT INSTR(`�ｼ｣�ｼ疏,'荳�') from `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｱ') from `�ｼｴ�ｼ輿;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｲ') from `�ｼｴ�ｼ輿;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｳ') from `�ｼｴ�ｼ輿;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｴ') from `�ｼｴ�ｼ輿;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｵ') from `�ｼｴ�ｼ輿;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｾ�') from `�ｼｴ�ｼ輿;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ倭;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ倭;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ倭;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ倭;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ倭;
+SELECT INSTR(`�ｼ｣�ｼ疏,'繧�') from `�ｼｴ�ｼ倭;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ兪;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ兪;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ兪;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ兪;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴｡') from `�ｼｴ�ｼ兪;
+SELECT INSTR(`�ｼ｣�ｼ疏,'荳�') from `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｱ') from `�ｼｴ�ｼ托ｼ秦;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｲ') from `�ｼｴ�ｼ托ｼ秦;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｳ') from `�ｼｴ�ｼ托ｼ秦;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｴ') from `�ｼｴ�ｼ托ｼ秦;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｽｵ') from `�ｼｴ�ｼ托ｼ秦;
+SELECT INSTR(`�ｼ｣�ｼ疏,'�ｾ�') from `�ｼｴ�ｼ托ｼ秦;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ托ｼ疏;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ托ｼ疏;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ托ｼ疏;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ托ｼ疏;
+SELECT INSTR(`�ｼ｣�ｼ疏,'縺�') from `�ｼｴ�ｼ托ｼ疏;
+SELECT INSTR(`�ｼ｣�ｼ疏,'繧�') from `�ｼｴ�ｼ托ｼ疏;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴�') from `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSTR(`�ｼ｣�ｼ疏,'鮴｡') from `�ｼｴ�ｼ托ｼ蛋;
+SELECT INSTR(`�ｼ｣�ｼ疏,'荳�') from `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_join_sjis.test b/mysql-test/suite/jp/t/jp_join_sjis.test
new file mode 100755
index 00000000000..30b23913929
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_join_sjis.test
@@ -0,0 +1,218 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test table JOIN using Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+
+#insert the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+INSERT INTO `Ｔ１a` VALUES ('ｱ'),('ｶ'),('ｻ');
+INSERT INTO `Ｔ１b` VALUES ('ｱ');
+INSERT INTO `Ｔ２a` VALUES ('あ'),('か'),('さ');
+INSERT INTO `Ｔ２b` VALUES ('あ');
+INSERT INTO `Ｔ３a` VALUES ('ソ'),('十'),('表');
+INSERT INTO `Ｔ３b` VALUES ('ソ');
+INSERT INTO `Ｔ４a` VALUES ('ｱ'),('ｶ'),('ｻ');
+INSERT INTO `Ｔ４b` VALUES ('ｱ');
+INSERT INTO `Ｔ５a` VALUES ('あ'),('か'),('さ');
+INSERT INTO `Ｔ５b` VALUES ('あ');
+INSERT INTO `Ｔ６a` VALUES ('ソ'),('十'),('表');
+INSERT INTO `Ｔ６b` VALUES ('ソ');
+INSERT INTO `Ｔ７a` VALUES ('ｱ'),('ｶ'),('ｻ');
+INSERT INTO `Ｔ７b` VALUES ('ｱ');
+INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ');
+INSERT INTO `Ｔ８b` VALUES ('あ');
+INSERT INTO `Ｔ９a` VALUES ('ソ'),('十'),('表');
+INSERT INTO `Ｔ９b` VALUES ('ソ');
+INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ');
+INSERT INTO `Ｔ１０b` VALUES ('ｱ');
+INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ');
+INSERT INTO `Ｔ１１b` VALUES ('あ');
+INSERT INTO `Ｔ１２a` VALUES ('ソ'),('十'),('表');
+INSERT INTO `Ｔ１２b` VALUES ('ソ');
+
+#Test for innodb
+SELECT * FROM `Ｔ１a` JOIN `Ｔ１b`;
+SELECT * FROM `Ｔ１a` INNER JOIN `Ｔ１b`;
+SELECT * FROM `Ｔ１a` JOIN `Ｔ１b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１a` INNER JOIN `Ｔ１b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１a` CROSS JOIN `Ｔ１b`;
+SELECT * FROM `Ｔ１a` LEFT JOIN `Ｔ１b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１a` LEFT JOIN `Ｔ１b` ON (`Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`);
+SELECT * FROM `Ｔ１b` RIGHT JOIN `Ｔ１a` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１b` RIGHT JOIN `Ｔ１a` ON (`Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`);
+SELECT * FROM `Ｔ２a` JOIN `Ｔ２b`;
+SELECT * FROM `Ｔ２a` INNER JOIN `Ｔ２b`;
+SELECT * FROM `Ｔ２a` JOIN `Ｔ２b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ２a` INNER JOIN `Ｔ２b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ２a` CROSS JOIN `Ｔ２b`;
+SELECT * FROM `Ｔ２a` LEFT JOIN `Ｔ２b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ２a` LEFT JOIN `Ｔ２b` ON (`Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`);
+SELECT * FROM `Ｔ２b` RIGHT JOIN `Ｔ２a` USING (`Ｃ１`);
+SELECT * FROM `Ｔ２b` RIGHT JOIN `Ｔ２a` ON (`Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`);
+SELECT * FROM `Ｔ３a` JOIN `Ｔ３b`;
+SELECT * FROM `Ｔ３a` INNER JOIN `Ｔ３b`;
+SELECT * FROM `Ｔ３a` JOIN `Ｔ３b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ３a` INNER JOIN `Ｔ３b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ３a` CROSS JOIN `Ｔ３b`;
+SELECT * FROM `Ｔ３a` LEFT JOIN `Ｔ３b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ３a` LEFT JOIN `Ｔ３b` ON (`Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`);
+SELECT * FROM `Ｔ３b` RIGHT JOIN `Ｔ３a` USING (`Ｃ１`);
+SELECT * FROM `Ｔ３b` RIGHT JOIN `Ｔ３a` ON (`Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`);
+
+#Test for myisam
+SELECT * FROM `Ｔ４a` JOIN `Ｔ４b`;
+SELECT * FROM `Ｔ４a` INNER JOIN `Ｔ４b`;
+SELECT * FROM `Ｔ４a` JOIN `Ｔ４b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ４a` INNER JOIN `Ｔ４b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ４a` CROSS JOIN `Ｔ４b`;
+SELECT * FROM `Ｔ４a` LEFT JOIN `Ｔ４b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ４a` LEFT JOIN `Ｔ４b` ON (`Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`);
+SELECT * FROM `Ｔ４b` RIGHT JOIN `Ｔ４a` USING (`Ｃ１`);
+SELECT * FROM `Ｔ４b` RIGHT JOIN `Ｔ４a` ON (`Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`);
+SELECT * FROM `Ｔ５a` JOIN `Ｔ５b`;
+SELECT * FROM `Ｔ５a` INNER JOIN `Ｔ５b`;
+SELECT * FROM `Ｔ５a` JOIN `Ｔ５b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ５a` INNER JOIN `Ｔ５b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ５a` CROSS JOIN `Ｔ５b`;
+SELECT * FROM `Ｔ５a` LEFT JOIN `Ｔ５b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ５a` LEFT JOIN `Ｔ５b` ON (`Ｔ５a`.`Ｃ１` = `Ｔ５b`.`Ｃ１`);
+SELECT * FROM `Ｔ５b` RIGHT JOIN `Ｔ５a` USING (`Ｃ１`);
+SELECT * FROM `Ｔ５b` RIGHT JOIN `Ｔ５a` ON (`Ｔ５a`.`Ｃ１` = `Ｔ５b`.`Ｃ１`);
+SELECT * FROM `Ｔ６a` JOIN `Ｔ６b`;
+SELECT * FROM `Ｔ６a` INNER JOIN `Ｔ６b`;
+SELECT * FROM `Ｔ６a` JOIN `Ｔ６b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ６a` INNER JOIN `Ｔ６b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ６a` CROSS JOIN `Ｔ６b`;
+SELECT * FROM `Ｔ６a` LEFT JOIN `Ｔ６b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ６a` LEFT JOIN `Ｔ６b` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`);
+SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` USING (`Ｃ１`);
+SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`);
+
+#Test for heap
+SELECT * FROM `Ｔ７a` JOIN `Ｔ７b`;
+SELECT * FROM `Ｔ７a` INNER JOIN `Ｔ７b`;
+SELECT * FROM `Ｔ７a` JOIN `Ｔ７b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ７a` INNER JOIN `Ｔ７b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ７a` CROSS JOIN `Ｔ７b`;
+SELECT * FROM `Ｔ７a` LEFT JOIN `Ｔ７b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ７a` LEFT JOIN `Ｔ７b` ON (`Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`);
+SELECT * FROM `Ｔ７b` RIGHT JOIN `Ｔ７a` USING (`Ｃ１`);
+SELECT * FROM `Ｔ７b` RIGHT JOIN `Ｔ７a` ON (`Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`);
+SELECT * FROM `Ｔ８a` JOIN `Ｔ８b`;
+SELECT * FROM `Ｔ８a` INNER JOIN `Ｔ８b`;
+SELECT * FROM `Ｔ８a` JOIN `Ｔ８b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ８a` INNER JOIN `Ｔ８b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ８a` CROSS JOIN `Ｔ８b`;
+SELECT * FROM `Ｔ８a` LEFT JOIN `Ｔ８b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ８a` LEFT JOIN `Ｔ８b` ON (`Ｔ８a`.`Ｃ１` = `Ｔ８b`.`Ｃ１`);
+SELECT * FROM `Ｔ８b` RIGHT JOIN `Ｔ８a` USING (`Ｃ１`);
+SELECT * FROM `Ｔ８b` RIGHT JOIN `Ｔ８a` ON (`Ｔ８a`.`Ｃ１` = `Ｔ８b`.`Ｃ１`);
+SELECT * FROM `Ｔ９a` JOIN `Ｔ９b`;
+SELECT * FROM `Ｔ９a` INNER JOIN `Ｔ９b`;
+SELECT * FROM `Ｔ９a` JOIN `Ｔ９b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ９a` INNER JOIN `Ｔ９b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ９a` CROSS JOIN `Ｔ９b`;
+SELECT * FROM `Ｔ９a` LEFT JOIN `Ｔ９b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ９a` LEFT JOIN `Ｔ９b` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
+SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` USING (`Ｃ１`);
+SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
+
+#Test for heap
+SELECT * FROM `Ｔ１０a` JOIN `Ｔ１０b`;
+SELECT * FROM `Ｔ１０a` INNER JOIN `Ｔ１０b`;
+SELECT * FROM `Ｔ１０a` JOIN `Ｔ１０b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１０a` INNER JOIN `Ｔ１０b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１０a` CROSS JOIN `Ｔ１０b`;
+SELECT * FROM `Ｔ１０a` LEFT JOIN `Ｔ１０b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１０a` LEFT JOIN `Ｔ１０b` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
+SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
+SELECT * FROM `Ｔ１１a` JOIN `Ｔ１１b`;
+SELECT * FROM `Ｔ１１a` INNER JOIN `Ｔ１１b`;
+SELECT * FROM `Ｔ１１a` JOIN `Ｔ１１b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１１a` INNER JOIN `Ｔ１１b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１１a` CROSS JOIN `Ｔ１１b`;
+SELECT * FROM `Ｔ１１a` LEFT JOIN `Ｔ１１b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１１a` LEFT JOIN `Ｔ１１b` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
+SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
+SELECT * FROM `Ｔ１２a` JOIN `Ｔ１２b`;
+SELECT * FROM `Ｔ１２a` INNER JOIN `Ｔ１２b`;
+SELECT * FROM `Ｔ１２a` JOIN `Ｔ１２b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１２a` INNER JOIN `Ｔ１２b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１２a` CROSS JOIN `Ｔ１２b`;
+SELECT * FROM `Ｔ１２a` LEFT JOIN `Ｔ１２b` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１２a` LEFT JOIN `Ｔ１２b` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
+SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` USING (`Ｃ１`);
+SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
+
+DROP TABLE `Ｔ１a`;
+DROP TABLE `Ｔ１b`;
+DROP TABLE `Ｔ２a`;
+DROP TABLE `Ｔ２b`;
+DROP TABLE `Ｔ３a`;
+DROP TABLE `Ｔ３b`;
+DROP TABLE `Ｔ４a`;
+DROP TABLE `Ｔ４b`;
+DROP TABLE `Ｔ５a`;
+DROP TABLE `Ｔ５b`;
+DROP TABLE `Ｔ６a`;
+DROP TABLE `Ｔ６b`;
+DROP TABLE `Ｔ７a`;
+DROP TABLE `Ｔ７b`;
+DROP TABLE `Ｔ８a`;
+DROP TABLE `Ｔ８b`;
+DROP TABLE `Ｔ９a`;
+DROP TABLE `Ｔ９b`;
+DROP TABLE `Ｔ１０a`;
+DROP TABLE `Ｔ１０b`;
+DROP TABLE `Ｔ１１a`;
+DROP TABLE `Ｔ１１b`;
+DROP TABLE `Ｔ１２a`;
+DROP TABLE `Ｔ１２b`;
diff --git a/mysql-test/suite/jp/t/jp_join_ucs2.test b/mysql-test/suite/jp/t/jp_join_ucs2.test
new file mode 100755
index 00000000000..27e49203dd2
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_join_ucs2.test
@@ -0,0 +1,220 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test table JOIN using Japanese characters 
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｵa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｵb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｶa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｶb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｷa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｷb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｸa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｸb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｹa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｹb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+
+#insert the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+INSERT INTO `｣ﾔ｣ｱa` VALUES ('竺'),('叱'),('悉');
+INSERT INTO `｣ﾔ｣ｱb` VALUES ('竺');
+INSERT INTO `｣ﾔ｣ｲa` VALUES ('､｢'),('､ｫ'),('､ｵ');
+INSERT INTO `｣ﾔ｣ｲb` VALUES ('､｢');
+INSERT INTO `｣ﾔ｣ｳa` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｳb` VALUES ('常ﾜ');
+INSERT INTO `｣ﾔ｣ｴa` VALUES ('竺'),('叱'),('悉');
+INSERT INTO `｣ﾔ｣ｴb` VALUES ('竺');
+INSERT INTO `｣ﾔ｣ｵa` VALUES ('､｢'),('､ｫ'),('､ｵ');
+INSERT INTO `｣ﾔ｣ｵb` VALUES ('､｢');
+INSERT INTO `｣ﾔ｣ｶa` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｶb` VALUES ('常ﾜ');
+INSERT INTO `｣ﾔ｣ｷa` VALUES ('竺'),('叱'),('悉');
+INSERT INTO `｣ﾔ｣ｷb` VALUES ('竺');
+INSERT INTO `｣ﾔ｣ｸa` VALUES ('､｢'),('､ｫ'),('､ｵ');
+INSERT INTO `｣ﾔ｣ｸb` VALUES ('､｢');
+INSERT INTO `｣ﾔ｣ｹa` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｹb` VALUES ('常ﾜ');
+INSERT INTO `｣ﾔ｣ｱ｣ｰa` VALUES ('竺'),('叱'),('悉');
+INSERT INTO `｣ﾔ｣ｱ｣ｰb` VALUES ('竺');
+INSERT INTO `｣ﾔ｣ｱ｣ｱa` VALUES ('､｢'),('､ｫ'),('､ｵ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱb` VALUES ('､｢');
+INSERT INTO `｣ﾔ｣ｱ｣ｲa` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲb` VALUES ('常ﾜ');
+
+#Test for innodb
+SELECT * FROM `｣ﾔ｣ｱa` JOIN `｣ﾔ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱa` INNER JOIN `｣ﾔ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱa` JOIN `｣ﾔ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱa` INNER JOIN `｣ﾔ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱa` CROSS JOIN `｣ﾔ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱa` LEFT JOIN `｣ﾔ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱa` LEFT JOIN `｣ﾔ｣ｱb` ON (`｣ﾔ｣ｱa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱb` RIGHT JOIN `｣ﾔ｣ｱa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱb` RIGHT JOIN `｣ﾔ｣ｱa` ON (`｣ﾔ｣ｱa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲa` JOIN `｣ﾔ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｲa` INNER JOIN `｣ﾔ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｲa` JOIN `｣ﾔ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲa` INNER JOIN `｣ﾔ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲa` CROSS JOIN `｣ﾔ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｲa` LEFT JOIN `｣ﾔ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲa` LEFT JOIN `｣ﾔ｣ｲb` ON (`｣ﾔ｣ｲa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｲb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲb` RIGHT JOIN `｣ﾔ｣ｲa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲb` RIGHT JOIN `｣ﾔ｣ｲa` ON (`｣ﾔ｣ｲa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｲb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳa` JOIN `｣ﾔ｣ｳb`;
+SELECT * FROM `｣ﾔ｣ｳa` INNER JOIN `｣ﾔ｣ｳb`;
+SELECT * FROM `｣ﾔ｣ｳa` JOIN `｣ﾔ｣ｳb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳa` INNER JOIN `｣ﾔ｣ｳb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳa` CROSS JOIN `｣ﾔ｣ｳb`;
+SELECT * FROM `｣ﾔ｣ｳa` LEFT JOIN `｣ﾔ｣ｳb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳa` LEFT JOIN `｣ﾔ｣ｳb` ON (`｣ﾔ｣ｳa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｳb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳb` RIGHT JOIN `｣ﾔ｣ｳa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳb` RIGHT JOIN `｣ﾔ｣ｳa` ON (`｣ﾔ｣ｳa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｳb`.`｣ﾃ｣ｱ`);
+
+#Test for myisam
+SELECT * FROM `｣ﾔ｣ｴa` JOIN `｣ﾔ｣ｴb`;
+SELECT * FROM `｣ﾔ｣ｴa` INNER JOIN `｣ﾔ｣ｴb`;
+SELECT * FROM `｣ﾔ｣ｴa` JOIN `｣ﾔ｣ｴb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴa` INNER JOIN `｣ﾔ｣ｴb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴa` CROSS JOIN `｣ﾔ｣ｴb`;
+SELECT * FROM `｣ﾔ｣ｴa` LEFT JOIN `｣ﾔ｣ｴb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴa` LEFT JOIN `｣ﾔ｣ｴb` ON (`｣ﾔ｣ｴa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｴb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴb` RIGHT JOIN `｣ﾔ｣ｴa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴb` RIGHT JOIN `｣ﾔ｣ｴa` ON (`｣ﾔ｣ｴa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｴb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵa` JOIN `｣ﾔ｣ｵb`;
+SELECT * FROM `｣ﾔ｣ｵa` INNER JOIN `｣ﾔ｣ｵb`;
+SELECT * FROM `｣ﾔ｣ｵa` JOIN `｣ﾔ｣ｵb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵa` INNER JOIN `｣ﾔ｣ｵb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵa` CROSS JOIN `｣ﾔ｣ｵb`;
+SELECT * FROM `｣ﾔ｣ｵa` LEFT JOIN `｣ﾔ｣ｵb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵa` LEFT JOIN `｣ﾔ｣ｵb` ON (`｣ﾔ｣ｵa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｵb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵb` RIGHT JOIN `｣ﾔ｣ｵa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵb` RIGHT JOIN `｣ﾔ｣ｵa` ON (`｣ﾔ｣ｵa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｵb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶa` JOIN `｣ﾔ｣ｶb`;
+SELECT * FROM `｣ﾔ｣ｶa` INNER JOIN `｣ﾔ｣ｶb`;
+SELECT * FROM `｣ﾔ｣ｶa` JOIN `｣ﾔ｣ｶb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶa` INNER JOIN `｣ﾔ｣ｶb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶa` CROSS JOIN `｣ﾔ｣ｶb`;
+SELECT * FROM `｣ﾔ｣ｶa` LEFT JOIN `｣ﾔ｣ｶb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶa` LEFT JOIN `｣ﾔ｣ｶb` ON (`｣ﾔ｣ｶa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｶb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶb` RIGHT JOIN `｣ﾔ｣ｶa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶb` RIGHT JOIN `｣ﾔ｣ｶa` ON (`｣ﾔ｣ｶa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｶb`.`｣ﾃ｣ｱ`);
+
+#Test for heap
+SELECT * FROM `｣ﾔ｣ｷa` JOIN `｣ﾔ｣ｷb`;
+SELECT * FROM `｣ﾔ｣ｷa` INNER JOIN `｣ﾔ｣ｷb`;
+SELECT * FROM `｣ﾔ｣ｷa` JOIN `｣ﾔ｣ｷb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷa` INNER JOIN `｣ﾔ｣ｷb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷa` CROSS JOIN `｣ﾔ｣ｷb`;
+SELECT * FROM `｣ﾔ｣ｷa` LEFT JOIN `｣ﾔ｣ｷb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷa` LEFT JOIN `｣ﾔ｣ｷb` ON (`｣ﾔ｣ｷa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｷb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷb` RIGHT JOIN `｣ﾔ｣ｷa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷb` RIGHT JOIN `｣ﾔ｣ｷa` ON (`｣ﾔ｣ｷa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｷb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸa` JOIN `｣ﾔ｣ｸb`;
+SELECT * FROM `｣ﾔ｣ｸa` INNER JOIN `｣ﾔ｣ｸb`;
+SELECT * FROM `｣ﾔ｣ｸa` JOIN `｣ﾔ｣ｸb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸa` INNER JOIN `｣ﾔ｣ｸb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸa` CROSS JOIN `｣ﾔ｣ｸb`;
+SELECT * FROM `｣ﾔ｣ｸa` LEFT JOIN `｣ﾔ｣ｸb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸa` LEFT JOIN `｣ﾔ｣ｸb` ON (`｣ﾔ｣ｸa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｸb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸb` RIGHT JOIN `｣ﾔ｣ｸa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸb` RIGHT JOIN `｣ﾔ｣ｸa` ON (`｣ﾔ｣ｸa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｸb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹa` JOIN `｣ﾔ｣ｹb`;
+SELECT * FROM `｣ﾔ｣ｹa` INNER JOIN `｣ﾔ｣ｹb`;
+SELECT * FROM `｣ﾔ｣ｹa` JOIN `｣ﾔ｣ｹb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹa` INNER JOIN `｣ﾔ｣ｹb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹa` CROSS JOIN `｣ﾔ｣ｹb`;
+SELECT * FROM `｣ﾔ｣ｹa` LEFT JOIN `｣ﾔ｣ｹb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹa` LEFT JOIN `｣ﾔ｣ｹb` ON (`｣ﾔ｣ｹa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｹb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹb` RIGHT JOIN `｣ﾔ｣ｹa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹb` RIGHT JOIN `｣ﾔ｣ｹa` ON (`｣ﾔ｣ｹa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｹb`.`｣ﾃ｣ｱ`);
+
+#Test for heap
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` JOIN `｣ﾔ｣ｱ｣ｰb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` INNER JOIN `｣ﾔ｣ｱ｣ｰb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` JOIN `｣ﾔ｣ｱ｣ｰb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` INNER JOIN `｣ﾔ｣ｱ｣ｰb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` CROSS JOIN `｣ﾔ｣ｱ｣ｰb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` LEFT JOIN `｣ﾔ｣ｱ｣ｰb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` LEFT JOIN `｣ﾔ｣ｱ｣ｰb` ON (`｣ﾔ｣ｱ｣ｰa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｰb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｰb` RIGHT JOIN `｣ﾔ｣ｱ｣ｰa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｰb` RIGHT JOIN `｣ﾔ｣ｱ｣ｰa` ON (`｣ﾔ｣ｱ｣ｰa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｰb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` JOIN `｣ﾔ｣ｱ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` INNER JOIN `｣ﾔ｣ｱ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` JOIN `｣ﾔ｣ｱ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` INNER JOIN `｣ﾔ｣ｱ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` CROSS JOIN `｣ﾔ｣ｱ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` LEFT JOIN `｣ﾔ｣ｱ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` LEFT JOIN `｣ﾔ｣ｱ｣ｱb` ON (`｣ﾔ｣ｱ｣ｱa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｱb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｱb` RIGHT JOIN `｣ﾔ｣ｱ｣ｱa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｱb` RIGHT JOIN `｣ﾔ｣ｱ｣ｱa` ON (`｣ﾔ｣ｱ｣ｱa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｱb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` JOIN `｣ﾔ｣ｱ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` INNER JOIN `｣ﾔ｣ｱ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` JOIN `｣ﾔ｣ｱ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` INNER JOIN `｣ﾔ｣ｱ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` CROSS JOIN `｣ﾔ｣ｱ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` LEFT JOIN `｣ﾔ｣ｱ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` LEFT JOIN `｣ﾔ｣ｱ｣ｲb` ON (`｣ﾔ｣ｱ｣ｲa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｲb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｲb` RIGHT JOIN `｣ﾔ｣ｱ｣ｲa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｲb` RIGHT JOIN `｣ﾔ｣ｱ｣ｲa` ON (`｣ﾔ｣ｱ｣ｲa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｲb`.`｣ﾃ｣ｱ`);
+
+DROP TABLE `｣ﾔ｣ｱa`;
+DROP TABLE `｣ﾔ｣ｱb`;
+DROP TABLE `｣ﾔ｣ｲa`;
+DROP TABLE `｣ﾔ｣ｲb`;
+DROP TABLE `｣ﾔ｣ｳa`;
+DROP TABLE `｣ﾔ｣ｳb`;
+DROP TABLE `｣ﾔ｣ｴa`;
+DROP TABLE `｣ﾔ｣ｴb`;
+DROP TABLE `｣ﾔ｣ｵa`;
+DROP TABLE `｣ﾔ｣ｵb`;
+DROP TABLE `｣ﾔ｣ｶa`;
+DROP TABLE `｣ﾔ｣ｶb`;
+DROP TABLE `｣ﾔ｣ｷa`;
+DROP TABLE `｣ﾔ｣ｷb`;
+DROP TABLE `｣ﾔ｣ｸa`;
+DROP TABLE `｣ﾔ｣ｸb`;
+DROP TABLE `｣ﾔ｣ｹa`;
+DROP TABLE `｣ﾔ｣ｹb`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰa`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰb`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱa`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱb`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲa`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲb`;
diff --git a/mysql-test/suite/jp/t/jp_join_ujis.test b/mysql-test/suite/jp/t/jp_join_ujis.test
new file mode 100755
index 00000000000..079f260cc26
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_join_ujis.test
@@ -0,0 +1,219 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test table JOIN using Japanese characters 
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｵa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｵb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｶa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｶb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｷa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｷb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｸa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｸb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｹa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｹb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+
+#insert the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+INSERT INTO `｣ﾔ｣ｱa` VALUES ('竺'),('叱'),('悉');
+INSERT INTO `｣ﾔ｣ｱb` VALUES ('竺');
+INSERT INTO `｣ﾔ｣ｲa` VALUES ('､｢'),('､ｫ'),('､ｵ');
+INSERT INTO `｣ﾔ｣ｲb` VALUES ('､｢');
+INSERT INTO `｣ﾔ｣ｳa` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｳb` VALUES ('常ﾜ');
+INSERT INTO `｣ﾔ｣ｴa` VALUES ('竺'),('叱'),('悉');
+INSERT INTO `｣ﾔ｣ｴb` VALUES ('竺');
+INSERT INTO `｣ﾔ｣ｵa` VALUES ('､｢'),('､ｫ'),('､ｵ');
+INSERT INTO `｣ﾔ｣ｵb` VALUES ('､｢');
+INSERT INTO `｣ﾔ｣ｶa` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｶb` VALUES ('常ﾜ');
+INSERT INTO `｣ﾔ｣ｷa` VALUES ('竺'),('叱'),('悉');
+INSERT INTO `｣ﾔ｣ｷb` VALUES ('竺');
+INSERT INTO `｣ﾔ｣ｸa` VALUES ('､｢'),('､ｫ'),('､ｵ');
+INSERT INTO `｣ﾔ｣ｸb` VALUES ('､｢');
+INSERT INTO `｣ﾔ｣ｹa` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｹb` VALUES ('常ﾜ');
+INSERT INTO `｣ﾔ｣ｱ｣ｰa` VALUES ('竺'),('叱'),('悉');
+INSERT INTO `｣ﾔ｣ｱ｣ｰb` VALUES ('竺');
+INSERT INTO `｣ﾔ｣ｱ｣ｱa` VALUES ('､｢'),('､ｫ'),('､ｵ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱb` VALUES ('､｢');
+INSERT INTO `｣ﾔ｣ｱ｣ｲa` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲb` VALUES ('常ﾜ');
+
+#Test for innodb
+SELECT * FROM `｣ﾔ｣ｱa` JOIN `｣ﾔ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱa` INNER JOIN `｣ﾔ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱa` JOIN `｣ﾔ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱa` INNER JOIN `｣ﾔ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱa` CROSS JOIN `｣ﾔ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱa` LEFT JOIN `｣ﾔ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱa` LEFT JOIN `｣ﾔ｣ｱb` ON (`｣ﾔ｣ｱa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱb` RIGHT JOIN `｣ﾔ｣ｱa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱb` RIGHT JOIN `｣ﾔ｣ｱa` ON (`｣ﾔ｣ｱa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲa` JOIN `｣ﾔ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｲa` INNER JOIN `｣ﾔ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｲa` JOIN `｣ﾔ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲa` INNER JOIN `｣ﾔ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲa` CROSS JOIN `｣ﾔ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｲa` LEFT JOIN `｣ﾔ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲa` LEFT JOIN `｣ﾔ｣ｲb` ON (`｣ﾔ｣ｲa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｲb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲb` RIGHT JOIN `｣ﾔ｣ｲa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲb` RIGHT JOIN `｣ﾔ｣ｲa` ON (`｣ﾔ｣ｲa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｲb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳa` JOIN `｣ﾔ｣ｳb`;
+SELECT * FROM `｣ﾔ｣ｳa` INNER JOIN `｣ﾔ｣ｳb`;
+SELECT * FROM `｣ﾔ｣ｳa` JOIN `｣ﾔ｣ｳb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳa` INNER JOIN `｣ﾔ｣ｳb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳa` CROSS JOIN `｣ﾔ｣ｳb`;
+SELECT * FROM `｣ﾔ｣ｳa` LEFT JOIN `｣ﾔ｣ｳb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳa` LEFT JOIN `｣ﾔ｣ｳb` ON (`｣ﾔ｣ｳa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｳb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳb` RIGHT JOIN `｣ﾔ｣ｳa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳb` RIGHT JOIN `｣ﾔ｣ｳa` ON (`｣ﾔ｣ｳa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｳb`.`｣ﾃ｣ｱ`);
+
+#Test for myisam
+SELECT * FROM `｣ﾔ｣ｴa` JOIN `｣ﾔ｣ｴb`;
+SELECT * FROM `｣ﾔ｣ｴa` INNER JOIN `｣ﾔ｣ｴb`;
+SELECT * FROM `｣ﾔ｣ｴa` JOIN `｣ﾔ｣ｴb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴa` INNER JOIN `｣ﾔ｣ｴb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴa` CROSS JOIN `｣ﾔ｣ｴb`;
+SELECT * FROM `｣ﾔ｣ｴa` LEFT JOIN `｣ﾔ｣ｴb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴa` LEFT JOIN `｣ﾔ｣ｴb` ON (`｣ﾔ｣ｴa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｴb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴb` RIGHT JOIN `｣ﾔ｣ｴa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴb` RIGHT JOIN `｣ﾔ｣ｴa` ON (`｣ﾔ｣ｴa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｴb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵa` JOIN `｣ﾔ｣ｵb`;
+SELECT * FROM `｣ﾔ｣ｵa` INNER JOIN `｣ﾔ｣ｵb`;
+SELECT * FROM `｣ﾔ｣ｵa` JOIN `｣ﾔ｣ｵb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵa` INNER JOIN `｣ﾔ｣ｵb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵa` CROSS JOIN `｣ﾔ｣ｵb`;
+SELECT * FROM `｣ﾔ｣ｵa` LEFT JOIN `｣ﾔ｣ｵb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵa` LEFT JOIN `｣ﾔ｣ｵb` ON (`｣ﾔ｣ｵa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｵb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵb` RIGHT JOIN `｣ﾔ｣ｵa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵb` RIGHT JOIN `｣ﾔ｣ｵa` ON (`｣ﾔ｣ｵa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｵb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶa` JOIN `｣ﾔ｣ｶb`;
+SELECT * FROM `｣ﾔ｣ｶa` INNER JOIN `｣ﾔ｣ｶb`;
+SELECT * FROM `｣ﾔ｣ｶa` JOIN `｣ﾔ｣ｶb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶa` INNER JOIN `｣ﾔ｣ｶb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶa` CROSS JOIN `｣ﾔ｣ｶb`;
+SELECT * FROM `｣ﾔ｣ｶa` LEFT JOIN `｣ﾔ｣ｶb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶa` LEFT JOIN `｣ﾔ｣ｶb` ON (`｣ﾔ｣ｶa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｶb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶb` RIGHT JOIN `｣ﾔ｣ｶa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶb` RIGHT JOIN `｣ﾔ｣ｶa` ON (`｣ﾔ｣ｶa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｶb`.`｣ﾃ｣ｱ`);
+
+#Test for heap
+SELECT * FROM `｣ﾔ｣ｷa` JOIN `｣ﾔ｣ｷb`;
+SELECT * FROM `｣ﾔ｣ｷa` INNER JOIN `｣ﾔ｣ｷb`;
+SELECT * FROM `｣ﾔ｣ｷa` JOIN `｣ﾔ｣ｷb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷa` INNER JOIN `｣ﾔ｣ｷb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷa` CROSS JOIN `｣ﾔ｣ｷb`;
+SELECT * FROM `｣ﾔ｣ｷa` LEFT JOIN `｣ﾔ｣ｷb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷa` LEFT JOIN `｣ﾔ｣ｷb` ON (`｣ﾔ｣ｷa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｷb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷb` RIGHT JOIN `｣ﾔ｣ｷa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷb` RIGHT JOIN `｣ﾔ｣ｷa` ON (`｣ﾔ｣ｷa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｷb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸa` JOIN `｣ﾔ｣ｸb`;
+SELECT * FROM `｣ﾔ｣ｸa` INNER JOIN `｣ﾔ｣ｸb`;
+SELECT * FROM `｣ﾔ｣ｸa` JOIN `｣ﾔ｣ｸb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸa` INNER JOIN `｣ﾔ｣ｸb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸa` CROSS JOIN `｣ﾔ｣ｸb`;
+SELECT * FROM `｣ﾔ｣ｸa` LEFT JOIN `｣ﾔ｣ｸb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸa` LEFT JOIN `｣ﾔ｣ｸb` ON (`｣ﾔ｣ｸa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｸb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸb` RIGHT JOIN `｣ﾔ｣ｸa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸb` RIGHT JOIN `｣ﾔ｣ｸa` ON (`｣ﾔ｣ｸa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｸb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹa` JOIN `｣ﾔ｣ｹb`;
+SELECT * FROM `｣ﾔ｣ｹa` INNER JOIN `｣ﾔ｣ｹb`;
+SELECT * FROM `｣ﾔ｣ｹa` JOIN `｣ﾔ｣ｹb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹa` INNER JOIN `｣ﾔ｣ｹb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹa` CROSS JOIN `｣ﾔ｣ｹb`;
+SELECT * FROM `｣ﾔ｣ｹa` LEFT JOIN `｣ﾔ｣ｹb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹa` LEFT JOIN `｣ﾔ｣ｹb` ON (`｣ﾔ｣ｹa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｹb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹb` RIGHT JOIN `｣ﾔ｣ｹa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹb` RIGHT JOIN `｣ﾔ｣ｹa` ON (`｣ﾔ｣ｹa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｹb`.`｣ﾃ｣ｱ`);
+
+#Test for heap
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` JOIN `｣ﾔ｣ｱ｣ｰb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` INNER JOIN `｣ﾔ｣ｱ｣ｰb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` JOIN `｣ﾔ｣ｱ｣ｰb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` INNER JOIN `｣ﾔ｣ｱ｣ｰb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` CROSS JOIN `｣ﾔ｣ｱ｣ｰb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` LEFT JOIN `｣ﾔ｣ｱ｣ｰb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｰa` LEFT JOIN `｣ﾔ｣ｱ｣ｰb` ON (`｣ﾔ｣ｱ｣ｰa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｰb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｰb` RIGHT JOIN `｣ﾔ｣ｱ｣ｰa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｰb` RIGHT JOIN `｣ﾔ｣ｱ｣ｰa` ON (`｣ﾔ｣ｱ｣ｰa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｰb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` JOIN `｣ﾔ｣ｱ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` INNER JOIN `｣ﾔ｣ｱ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` JOIN `｣ﾔ｣ｱ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` INNER JOIN `｣ﾔ｣ｱ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` CROSS JOIN `｣ﾔ｣ｱ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` LEFT JOIN `｣ﾔ｣ｱ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｱa` LEFT JOIN `｣ﾔ｣ｱ｣ｱb` ON (`｣ﾔ｣ｱ｣ｱa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｱb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｱb` RIGHT JOIN `｣ﾔ｣ｱ｣ｱa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｱb` RIGHT JOIN `｣ﾔ｣ｱ｣ｱa` ON (`｣ﾔ｣ｱ｣ｱa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｱb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` JOIN `｣ﾔ｣ｱ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` INNER JOIN `｣ﾔ｣ｱ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` JOIN `｣ﾔ｣ｱ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` INNER JOIN `｣ﾔ｣ｱ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` CROSS JOIN `｣ﾔ｣ｱ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` LEFT JOIN `｣ﾔ｣ｱ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｲa` LEFT JOIN `｣ﾔ｣ｱ｣ｲb` ON (`｣ﾔ｣ｱ｣ｲa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｲb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｲb` RIGHT JOIN `｣ﾔ｣ｱ｣ｲa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱ｣ｲb` RIGHT JOIN `｣ﾔ｣ｱ｣ｲa` ON (`｣ﾔ｣ｱ｣ｲa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｲb`.`｣ﾃ｣ｱ`);
+
+DROP TABLE `｣ﾔ｣ｱa`;
+DROP TABLE `｣ﾔ｣ｱb`;
+DROP TABLE `｣ﾔ｣ｲa`;
+DROP TABLE `｣ﾔ｣ｲb`;
+DROP TABLE `｣ﾔ｣ｳa`;
+DROP TABLE `｣ﾔ｣ｳb`;
+DROP TABLE `｣ﾔ｣ｴa`;
+DROP TABLE `｣ﾔ｣ｴb`;
+DROP TABLE `｣ﾔ｣ｵa`;
+DROP TABLE `｣ﾔ｣ｵb`;
+DROP TABLE `｣ﾔ｣ｶa`;
+DROP TABLE `｣ﾔ｣ｶb`;
+DROP TABLE `｣ﾔ｣ｷa`;
+DROP TABLE `｣ﾔ｣ｷb`;
+DROP TABLE `｣ﾔ｣ｸa`;
+DROP TABLE `｣ﾔ｣ｸb`;
+DROP TABLE `｣ﾔ｣ｹa`;
+DROP TABLE `｣ﾔ｣ｹb`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰa`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰb`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱa`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱb`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲa`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲb`;
diff --git a/mysql-test/suite/jp/t/jp_join_utf8.test b/mysql-test/suite/jp/t/jp_join_utf8.test
new file mode 100755
index 00000000000..0b2f033f8bb
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_join_utf8.test
@@ -0,0 +1,217 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test table JOIN using Japanese characters in utf8
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疎` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ礎` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ誕` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ鍛` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ殿` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ澱` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蚤` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ巴` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ病` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ秒` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ紡` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ肪` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ預` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ傭` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ和` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ話` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ兮` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ冀` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ紳` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ臣` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疎` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ礎` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ誕` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ鍛` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+
+#insert the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+INSERT INTO `�ｼｴ�ｼ疎` VALUES ('�ｽｱ'),('�ｽｶ'),('�ｽｻ');
+INSERT INTO `�ｼｴ�ｼ礎` VALUES ('�ｽｱ');
+INSERT INTO `�ｼｴ�ｼ誕` VALUES ('縺�'),('縺�'),('縺�');
+INSERT INTO `�ｼｴ�ｼ鍛` VALUES ('縺�');
+INSERT INTO `�ｼｴ�ｼ殿` VALUES ('鮴�'),('鮴�'),('鮴�');
+INSERT INTO `�ｼｴ�ｼ澱` VALUES ('鮴�');
+INSERT INTO `�ｼｴ�ｼ蚤` VALUES ('�ｽｱ'),('�ｽｶ'),('�ｽｻ');
+INSERT INTO `�ｼｴ�ｼ巴` VALUES ('�ｽｱ');
+INSERT INTO `�ｼｴ�ｼ病` VALUES ('縺�'),('縺�'),('縺�');
+INSERT INTO `�ｼｴ�ｼ秒` VALUES ('縺�');
+INSERT INTO `�ｼｴ�ｼ紡` VALUES ('鮴�'),('鮴�'),('鮴�');
+INSERT INTO `�ｼｴ�ｼ肪` VALUES ('鮴�');
+INSERT INTO `�ｼｴ�ｼ預` VALUES ('�ｽｱ'),('�ｽｶ'),('�ｽｻ');
+INSERT INTO `�ｼｴ�ｼ傭` VALUES ('�ｽｱ');
+INSERT INTO `�ｼｴ�ｼ和` VALUES ('縺�'),('縺�'),('縺�');
+INSERT INTO `�ｼｴ�ｼ話` VALUES ('縺�');
+INSERT INTO `�ｼｴ�ｼ兮` VALUES ('鮴�'),('鮴�'),('鮴�');
+INSERT INTO `�ｼｴ�ｼ冀` VALUES ('鮴�');
+INSERT INTO `�ｼｴ�ｼ托ｼ紳` VALUES ('�ｽｱ'),('�ｽｶ'),('�ｽｻ');
+INSERT INTO `�ｼｴ�ｼ托ｼ臣` VALUES ('�ｽｱ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疎` VALUES ('縺�'),('縺�'),('縺�');
+INSERT INTO `�ｼｴ�ｼ托ｼ礎` VALUES ('縺�');
+INSERT INTO `�ｼｴ�ｼ托ｼ誕` VALUES ('鮴�'),('鮴�'),('鮴�');
+INSERT INTO `�ｼｴ�ｼ托ｼ鍛` VALUES ('鮴�');
+
+#Test for innodb
+SELECT * FROM `�ｼｴ�ｼ疎` JOIN `�ｼｴ�ｼ礎`;
+SELECT * FROM `�ｼｴ�ｼ疎` INNER JOIN `�ｼｴ�ｼ礎`;
+SELECT * FROM `�ｼｴ�ｼ疎` JOIN `�ｼｴ�ｼ礎` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ疎` INNER JOIN `�ｼｴ�ｼ礎` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ疎` CROSS JOIN `�ｼｴ�ｼ礎`;
+SELECT * FROM `�ｼｴ�ｼ疎` LEFT JOIN `�ｼｴ�ｼ礎` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ疎` LEFT JOIN `�ｼｴ�ｼ礎` ON (`�ｼｴ�ｼ疎`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ礎`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ礎` RIGHT JOIN `�ｼｴ�ｼ疎` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ礎` RIGHT JOIN `�ｼｴ�ｼ疎` ON (`�ｼｴ�ｼ疎`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ礎`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ誕` JOIN `�ｼｴ�ｼ鍛`;
+SELECT * FROM `�ｼｴ�ｼ誕` INNER JOIN `�ｼｴ�ｼ鍛`;
+SELECT * FROM `�ｼｴ�ｼ誕` JOIN `�ｼｴ�ｼ鍛` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ誕` INNER JOIN `�ｼｴ�ｼ鍛` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ誕` CROSS JOIN `�ｼｴ�ｼ鍛`;
+SELECT * FROM `�ｼｴ�ｼ誕` LEFT JOIN `�ｼｴ�ｼ鍛` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ誕` LEFT JOIN `�ｼｴ�ｼ鍛` ON (`�ｼｴ�ｼ誕`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ鍛`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ鍛` RIGHT JOIN `�ｼｴ�ｼ誕` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ鍛` RIGHT JOIN `�ｼｴ�ｼ誕` ON (`�ｼｴ�ｼ誕`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ鍛`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ殿` JOIN `�ｼｴ�ｼ澱`;
+SELECT * FROM `�ｼｴ�ｼ殿` INNER JOIN `�ｼｴ�ｼ澱`;
+SELECT * FROM `�ｼｴ�ｼ殿` JOIN `�ｼｴ�ｼ澱` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ殿` INNER JOIN `�ｼｴ�ｼ澱` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ殿` CROSS JOIN `�ｼｴ�ｼ澱`;
+SELECT * FROM `�ｼｴ�ｼ殿` LEFT JOIN `�ｼｴ�ｼ澱` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ殿` LEFT JOIN `�ｼｴ�ｼ澱` ON (`�ｼｴ�ｼ殿`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ澱`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ澱` RIGHT JOIN `�ｼｴ�ｼ殿` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ澱` RIGHT JOIN `�ｼｴ�ｼ殿` ON (`�ｼｴ�ｼ殿`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ澱`.`�ｼ｣�ｼ疏);
+
+#Test for myisam
+SELECT * FROM `�ｼｴ�ｼ蚤` JOIN `�ｼｴ�ｼ巴`;
+SELECT * FROM `�ｼｴ�ｼ蚤` INNER JOIN `�ｼｴ�ｼ巴`;
+SELECT * FROM `�ｼｴ�ｼ蚤` JOIN `�ｼｴ�ｼ巴` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ蚤` INNER JOIN `�ｼｴ�ｼ巴` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ蚤` CROSS JOIN `�ｼｴ�ｼ巴`;
+SELECT * FROM `�ｼｴ�ｼ蚤` LEFT JOIN `�ｼｴ�ｼ巴` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ蚤` LEFT JOIN `�ｼｴ�ｼ巴` ON (`�ｼｴ�ｼ蚤`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ巴`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ巴` RIGHT JOIN `�ｼｴ�ｼ蚤` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ巴` RIGHT JOIN `�ｼｴ�ｼ蚤` ON (`�ｼｴ�ｼ蚤`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ巴`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ病` JOIN `�ｼｴ�ｼ秒`;
+SELECT * FROM `�ｼｴ�ｼ病` INNER JOIN `�ｼｴ�ｼ秒`;
+SELECT * FROM `�ｼｴ�ｼ病` JOIN `�ｼｴ�ｼ秒` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ病` INNER JOIN `�ｼｴ�ｼ秒` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ病` CROSS JOIN `�ｼｴ�ｼ秒`;
+SELECT * FROM `�ｼｴ�ｼ病` LEFT JOIN `�ｼｴ�ｼ秒` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ病` LEFT JOIN `�ｼｴ�ｼ秒` ON (`�ｼｴ�ｼ病`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ秒`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ秒` RIGHT JOIN `�ｼｴ�ｼ病` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ秒` RIGHT JOIN `�ｼｴ�ｼ病` ON (`�ｼｴ�ｼ病`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ秒`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ紡` JOIN `�ｼｴ�ｼ肪`;
+SELECT * FROM `�ｼｴ�ｼ紡` INNER JOIN `�ｼｴ�ｼ肪`;
+SELECT * FROM `�ｼｴ�ｼ紡` JOIN `�ｼｴ�ｼ肪` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ紡` INNER JOIN `�ｼｴ�ｼ肪` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ紡` CROSS JOIN `�ｼｴ�ｼ肪`;
+SELECT * FROM `�ｼｴ�ｼ紡` LEFT JOIN `�ｼｴ�ｼ肪` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ紡` LEFT JOIN `�ｼｴ�ｼ肪` ON (`�ｼｴ�ｼ紡`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ肪`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ肪` RIGHT JOIN `�ｼｴ�ｼ紡` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ肪` RIGHT JOIN `�ｼｴ�ｼ紡` ON (`�ｼｴ�ｼ紡`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ肪`.`�ｼ｣�ｼ疏);
+
+#Test for heap
+SELECT * FROM `�ｼｴ�ｼ預` JOIN `�ｼｴ�ｼ傭`;
+SELECT * FROM `�ｼｴ�ｼ預` INNER JOIN `�ｼｴ�ｼ傭`;
+SELECT * FROM `�ｼｴ�ｼ預` JOIN `�ｼｴ�ｼ傭` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ預` INNER JOIN `�ｼｴ�ｼ傭` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ預` CROSS JOIN `�ｼｴ�ｼ傭`;
+SELECT * FROM `�ｼｴ�ｼ預` LEFT JOIN `�ｼｴ�ｼ傭` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ預` LEFT JOIN `�ｼｴ�ｼ傭` ON (`�ｼｴ�ｼ預`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ傭`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ傭` RIGHT JOIN `�ｼｴ�ｼ預` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ傭` RIGHT JOIN `�ｼｴ�ｼ預` ON (`�ｼｴ�ｼ預`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ傭`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ和` JOIN `�ｼｴ�ｼ話`;
+SELECT * FROM `�ｼｴ�ｼ和` INNER JOIN `�ｼｴ�ｼ話`;
+SELECT * FROM `�ｼｴ�ｼ和` JOIN `�ｼｴ�ｼ話` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ和` INNER JOIN `�ｼｴ�ｼ話` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ和` CROSS JOIN `�ｼｴ�ｼ話`;
+SELECT * FROM `�ｼｴ�ｼ和` LEFT JOIN `�ｼｴ�ｼ話` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ和` LEFT JOIN `�ｼｴ�ｼ話` ON (`�ｼｴ�ｼ和`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ話`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ話` RIGHT JOIN `�ｼｴ�ｼ和` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ話` RIGHT JOIN `�ｼｴ�ｼ和` ON (`�ｼｴ�ｼ和`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ話`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ兮` JOIN `�ｼｴ�ｼ冀`;
+SELECT * FROM `�ｼｴ�ｼ兮` INNER JOIN `�ｼｴ�ｼ冀`;
+SELECT * FROM `�ｼｴ�ｼ兮` JOIN `�ｼｴ�ｼ冀` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ兮` INNER JOIN `�ｼｴ�ｼ冀` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ兮` CROSS JOIN `�ｼｴ�ｼ冀`;
+SELECT * FROM `�ｼｴ�ｼ兮` LEFT JOIN `�ｼｴ�ｼ冀` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ兮` LEFT JOIN `�ｼｴ�ｼ冀` ON (`�ｼｴ�ｼ兮`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ冀`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ冀` RIGHT JOIN `�ｼｴ�ｼ兮` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ冀` RIGHT JOIN `�ｼｴ�ｼ兮` ON (`�ｼｴ�ｼ兮`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ冀`.`�ｼ｣�ｼ疏);
+
+#Test for heap
+SELECT * FROM `�ｼｴ�ｼ托ｼ紳` JOIN `�ｼｴ�ｼ托ｼ臣`;
+SELECT * FROM `�ｼｴ�ｼ托ｼ紳` INNER JOIN `�ｼｴ�ｼ托ｼ臣`;
+SELECT * FROM `�ｼｴ�ｼ托ｼ紳` JOIN `�ｼｴ�ｼ托ｼ臣` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ紳` INNER JOIN `�ｼｴ�ｼ托ｼ臣` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ紳` CROSS JOIN `�ｼｴ�ｼ托ｼ臣`;
+SELECT * FROM `�ｼｴ�ｼ托ｼ紳` LEFT JOIN `�ｼｴ�ｼ托ｼ臣` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ紳` LEFT JOIN `�ｼｴ�ｼ托ｼ臣` ON (`�ｼｴ�ｼ托ｼ紳`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ托ｼ臣`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ臣` RIGHT JOIN `�ｼｴ�ｼ托ｼ紳` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ臣` RIGHT JOIN `�ｼｴ�ｼ托ｼ紳` ON (`�ｼｴ�ｼ托ｼ紳`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ托ｼ臣`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ疎` JOIN `�ｼｴ�ｼ托ｼ礎`;
+SELECT * FROM `�ｼｴ�ｼ托ｼ疎` INNER JOIN `�ｼｴ�ｼ托ｼ礎`;
+SELECT * FROM `�ｼｴ�ｼ托ｼ疎` JOIN `�ｼｴ�ｼ托ｼ礎` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ疎` INNER JOIN `�ｼｴ�ｼ托ｼ礎` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ疎` CROSS JOIN `�ｼｴ�ｼ托ｼ礎`;
+SELECT * FROM `�ｼｴ�ｼ托ｼ疎` LEFT JOIN `�ｼｴ�ｼ托ｼ礎` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ疎` LEFT JOIN `�ｼｴ�ｼ托ｼ礎` ON (`�ｼｴ�ｼ托ｼ疎`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ托ｼ礎`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ礎` RIGHT JOIN `�ｼｴ�ｼ托ｼ疎` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ礎` RIGHT JOIN `�ｼｴ�ｼ托ｼ疎` ON (`�ｼｴ�ｼ托ｼ疎`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ托ｼ礎`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ誕` JOIN `�ｼｴ�ｼ托ｼ鍛`;
+SELECT * FROM `�ｼｴ�ｼ托ｼ誕` INNER JOIN `�ｼｴ�ｼ托ｼ鍛`;
+SELECT * FROM `�ｼｴ�ｼ托ｼ誕` JOIN `�ｼｴ�ｼ托ｼ鍛` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ誕` INNER JOIN `�ｼｴ�ｼ托ｼ鍛` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ誕` CROSS JOIN `�ｼｴ�ｼ托ｼ鍛`;
+SELECT * FROM `�ｼｴ�ｼ托ｼ誕` LEFT JOIN `�ｼｴ�ｼ托ｼ鍛` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ誕` LEFT JOIN `�ｼｴ�ｼ托ｼ鍛` ON (`�ｼｴ�ｼ托ｼ誕`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ托ｼ鍛`.`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ鍛` RIGHT JOIN `�ｼｴ�ｼ托ｼ誕` USING (`�ｼ｣�ｼ疏);
+SELECT * FROM `�ｼｴ�ｼ托ｼ鍛` RIGHT JOIN `�ｼｴ�ｼ托ｼ誕` ON (`�ｼｴ�ｼ托ｼ誕`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ托ｼ鍛`.`�ｼ｣�ｼ疏);
+
+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 `�ｼｴ�ｼ和`;
+DROP TABLE `�ｼｴ�ｼ話`;
+DROP TABLE `�ｼｴ�ｼ兮`;
+DROP TABLE `�ｼｴ�ｼ冀`;
+DROP TABLE `�ｼｴ�ｼ托ｼ紳`;
+DROP TABLE `�ｼｴ�ｼ托ｼ臣`;
+DROP TABLE `�ｼｴ�ｼ托ｼ疎`;
+DROP TABLE `�ｼｴ�ｼ托ｼ礎`;
+DROP TABLE `�ｼｴ�ｼ托ｼ誕`;
+DROP TABLE `�ｼｴ�ｼ托ｼ鍛`;
diff --git a/mysql-test/suite/jp/t/jp_left_sjis.test b/mysql-test/suite/jp/t/jp_left_sjis.test
new file mode 100755
index 00000000000..5d69d9892e2
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_left_sjis.test
@@ -0,0 +1,141 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test LEFT() function with Japanese character in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ５` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+
+#InnoDB
+SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ２`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ２`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ２`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ２`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ２`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ２`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ３`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ３`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ３`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ３`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ３`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ３`;
+
+#MyISAM
+SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ４`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ４`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ４`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ４`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ４`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ４`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ５`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ５`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ５`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ５`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ５`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ５`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ６`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ６`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ６`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ６`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ６`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ６`;
+
+#HEAP
+SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ７`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ７`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ７`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ７`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ７`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ７`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ８`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ８`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ８`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ８`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ８`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ８`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ９`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ９`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ９`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ９`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ９`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ９`;
+
+#BDB
+SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１０`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１０`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１０`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１０`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１０`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１０`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１１`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１１`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１１`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１１`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１１`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１１`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１２`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１２`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１２`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１２`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１２`;
+SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_left_ucs2.test b/mysql-test/suite/jp/t/jp_left_ucs2.test
new file mode 100755
index 00000000000..59d10b7d736
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_left_ucs2.test
@@ -0,0 +1,143 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test LEFT() function with Japanese character in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_left_ujis.test b/mysql-test/suite/jp/t/jp_left_ujis.test
new file mode 100755
index 00000000000..718639cd8a4
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_left_ujis.test
@@ -0,0 +1,142 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test LEFT() function with Japanese character in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LEFT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_left_utf8.test b/mysql-test/suite/jp/t/jp_left_utf8.test
new file mode 100755
index 00000000000..f9c99718e0f
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_left_utf8.test
@@ -0,0 +1,140 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test LEFT() function with Japanese character in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+
+#InnoDB
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LEFT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_length_sjis.test b/mysql-test/suite/jp/t/jp_length_sjis.test
new file mode 100755
index 00000000000..7023891b7f0
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_length_sjis.test
@@ -0,0 +1,81 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test LENGTH() function with Japanese character in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ５` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+
+#InnoDB
+SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１`;
+SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ２`;
+SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ３`;
+
+#MyISAM
+SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ４`;
+SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ５`;
+SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ６`;
+
+#HEAP
+SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ７`;
+SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ８`;
+SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ９`;
+
+#BDB
+SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１０`;
+SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１１`;
+SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_length_ucs2.test b/mysql-test/suite/jp/t/jp_length_ucs2.test
new file mode 100755
index 00000000000..9951c9b6cd1
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_length_ucs2.test
@@ -0,0 +1,83 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test LENGTH() function with Japanese character in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_length_ujis.test b/mysql-test/suite/jp/t/jp_length_ujis.test
new file mode 100755
index 00000000000..ac3aef2c768
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_length_ujis.test
@@ -0,0 +1,82 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test LENGTH() function with Japanese character in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LENGTH(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_length_utf8.test b/mysql-test/suite/jp/t/jp_length_utf8.test
new file mode 100755
index 00000000000..5c5021f37be
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_length_utf8.test
@@ -0,0 +1,80 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test LENGTH() function with Japanese character in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+
+#InnoDB
+SELECT `�ｼ｣�ｼ疏, LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT `�ｼ｣�ｼ疏, LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT `�ｼ｣�ｼ疏, LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT `�ｼ｣�ｼ疏, LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LENGTH(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_like_sjis.test b/mysql-test/suite/jp/t/jp_like_sjis.test
new file mode 100755
index 00000000000..5c41b9ff7ef
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_like_sjis.test
@@ -0,0 +1,168 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test LIKE pattern matching using Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ２`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ３`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ４`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ５`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ６`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ７`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ８`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ９`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１０`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ１１`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ１２`;
+
+#InnoDB
+SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE ' %';
+SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE '% %';
+SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE '% ';
+SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE 'ﾀ%';
+SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE '%ﾗﾘ%';
+SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE '%ｿ';
+SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
+SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
+SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
+SELECT * FROM `Ｔ２` WHERE `Ｃ１` LIKE '　%';
+SELECT * FROM `Ｔ２` WHERE `Ｃ１` LIKE '%　%';
+SELECT * FROM `Ｔ２` WHERE `Ｃ１` LIKE '%　';
+SELECT * FROM `Ｔ２` WHERE `Ｃ１` LIKE 'と%';
+SELECT * FROM `Ｔ２` WHERE `Ｃ１` LIKE '%あ%';
+SELECT * FROM `Ｔ２` WHERE `Ｃ１` LIKE '%わ';
+SELECT * FROM `Ｔ２` WHERE `Ｃ１` LIKE '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
+SELECT * FROM `Ｔ２` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
+SELECT * FROM `Ｔ２` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
+SELECT * FROM `Ｔ３` WHERE `Ｃ１` LIKE 'ソ%';
+SELECT * FROM `Ｔ３` WHERE `Ｃ１` LIKE '%暴%';
+SELECT * FROM `Ｔ３` WHERE `Ｃ１` LIKE '%杤';
+SELECT * FROM `Ｔ３` WHERE `Ｃ１` LIKE 'ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤%';
+SELECT * FROM `Ｔ３` WHERE `Ｃ１` LIKE '%ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤%';
+SELECT * FROM `Ｔ３` WHERE `Ｃ１` LIKE '%ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤';
+
+#MyISAM
+SELECT * FROM `Ｔ４` WHERE `Ｃ１` LIKE ' %';
+SELECT * FROM `Ｔ４` WHERE `Ｃ１` LIKE '% %';
+SELECT * FROM `Ｔ４` WHERE `Ｃ１` LIKE '% ';
+SELECT * FROM `Ｔ４` WHERE `Ｃ１` LIKE 'ﾀ%';
+SELECT * FROM `Ｔ４` WHERE `Ｃ１` LIKE '%ﾗﾘ%';
+SELECT * FROM `Ｔ４` WHERE `Ｃ１` LIKE '%ｿ';
+SELECT * FROM `Ｔ４` WHERE `Ｃ１` LIKE 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
+SELECT * FROM `Ｔ４` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
+SELECT * FROM `Ｔ４` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
+SELECT * FROM `Ｔ５` WHERE `Ｃ１` LIKE '　%';
+SELECT * FROM `Ｔ５` WHERE `Ｃ１` LIKE '%　%';
+SELECT * FROM `Ｔ５` WHERE `Ｃ１` LIKE '%　';
+SELECT * FROM `Ｔ５` WHERE `Ｃ１` LIKE 'と%';
+SELECT * FROM `Ｔ５` WHERE `Ｃ１` LIKE '%あ%';
+SELECT * FROM `Ｔ５` WHERE `Ｃ１` LIKE '%わ';
+SELECT * FROM `Ｔ５` WHERE `Ｃ１` LIKE '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
+SELECT * FROM `Ｔ５` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
+SELECT * FROM `Ｔ５` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
+SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE 'ソ%';
+SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '%暴%';
+SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '%杤';
+SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE 'ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤%';
+SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '%ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤%';
+SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '%ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤';
+
+#Heap
+SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE ' %';
+SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '% %';
+SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '% ';
+SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE 'ﾀ%';
+SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '%ﾗﾘ%';
+SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '%ｿ';
+SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
+SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
+SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
+SELECT * FROM `Ｔ８` WHERE `Ｃ１` LIKE '　%';
+SELECT * FROM `Ｔ８` WHERE `Ｃ１` LIKE '%　%';
+SELECT * FROM `Ｔ８` WHERE `Ｃ１` LIKE '%　';
+SELECT * FROM `Ｔ８` WHERE `Ｃ１` LIKE 'と%';
+SELECT * FROM `Ｔ８` WHERE `Ｃ１` LIKE '%あ%';
+SELECT * FROM `Ｔ８` WHERE `Ｃ１` LIKE '%わ';
+SELECT * FROM `Ｔ８` WHERE `Ｃ１` LIKE '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
+SELECT * FROM `Ｔ８` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
+SELECT * FROM `Ｔ８` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
+SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE 'ソ%';
+SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%暴%';
+SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%杤';
+SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE 'ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤%';
+SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤%';
+SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤';
+#BDB
+SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE ' %';
+SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% %';
+SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% ';
+SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ﾀ%';
+SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ﾗﾘ%';
+SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｿ';
+#SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
+#SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
+SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
+SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '　%';
+SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%　%';
+SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%　';
+SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE 'と%';
+SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%あ%';
+SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%わ';
+#SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
+#SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
+#SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
+SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE 'ソ%';
+SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%暴%';
+SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%杤';
+#SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE 'ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤%';
+#SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤%';
+#SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤';
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_like_ucs2.test b/mysql-test/suite/jp/t/jp_like_ucs2.test
new file mode 100755
index 00000000000..feae40de49e
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_like_ucs2.test
@@ -0,0 +1,271 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test LIKE pattern matching using Japanese characters in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+#Insert the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｲ` VALUES
+ ('｡｡｡｡｡｢｡｣｡､｡･｡ｦ｡ｧ｡ｨ｡ｩ｡ｪ｡ｫ｡ｬ｡ｭ｡ｮ｡ｯ｡ｰ｡ｱ｡ｲ｡ｳ')
+,('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('､ﾈ､ﾉ､ﾊ､ﾋ､ﾌ､ﾍ､ﾎ､ﾏ､ﾐ､ﾑ､ﾒ､ﾓ､ﾔ､ﾕ､ﾖ､ﾗ､ﾘ､ﾙ､ﾚ､ﾛ')
+,('､ﾜ､ﾝ､ﾞ､ﾟ､爨皃筅网荀螟讀遉隍鬢熙�､�､�､�､�')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｳ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｴ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｵ` VALUES
+ ('｡｡｡｡｡｢｡｣｡､｡･｡ｦ｡ｧ｡ｨ｡ｩ｡ｪ｡ｫ｡ｬ｡ｭ｡ｮ｡ｯ｡ｰ｡ｱ｡ｲ｡ｳ')
+,('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('､ﾈ､ﾉ､ﾊ､ﾋ､ﾌ､ﾍ､ﾎ､ﾏ､ﾐ､ﾑ､ﾒ､ﾓ､ﾔ､ﾕ､ﾖ､ﾗ､ﾘ､ﾙ､ﾚ､ﾛ')
+,('､ﾜ､ﾝ､ﾞ､ﾟ､爨皃筅网荀螟讀遉隍鬢熙�､�､�､�､�')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｶ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｷ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｸ` VALUES
+ ('｡｡｡｡｡｢｡｣｡､｡･｡ｦ｡ｧ｡ｨ｡ｩ｡ｪ｡ｫ｡ｬ｡ｭ｡ｮ｡ｯ｡ｰ｡ｱ｡ｲ｡ｳ')
+,('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('､ﾈ､ﾉ､ﾊ､ﾋ､ﾌ､ﾍ､ﾎ､ﾏ､ﾐ､ﾑ､ﾒ､ﾓ､ﾔ､ﾕ､ﾖ､ﾗ､ﾘ､ﾙ､ﾚ､ﾛ')
+,('､ﾜ､ﾝ､ﾞ､ﾟ､爨皃筅网荀螟讀遉隍鬢熙�､�､�､�､�')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｹ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES
+ ('｡｡｡｡｡｢｡｣｡､｡･｡ｦ｡ｧ｡ｨ｡ｩ｡ｪ｡ｫ｡ｬ｡ｭ｡ｮ｡ｯ｡ｰ｡ｱ｡ｲ｡ｳ')
+,('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('､ﾈ､ﾉ､ﾊ､ﾋ､ﾌ､ﾍ､ﾎ､ﾏ､ﾐ､ﾑ､ﾒ､ﾓ､ﾔ､ﾕ､ﾖ､ﾗ､ﾘ､ﾙ､ﾚ､ﾛ')
+,('､ﾜ､ﾝ､ﾞ､ﾟ､爨皃筅网荀螟讀遉隍鬢熙�､�､�､�､�')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+#INNODB
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE ' %';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '% %';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '% ';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '実%';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%邪借%';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%質';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '｡｡%';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡%';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '､ﾈ%';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%､｢%';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%､�';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ%';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｻ%';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` LIKE '%常ﾇ';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+#MyISAM
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE ' %';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '% %';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '% ';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '実%';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '%邪借%';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '%質';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '｡｡%';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡%';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '､ﾈ%';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '%､｢%';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '%､�';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ%';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｻ%';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` LIKE '%常ﾇ';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+#Heap
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE ' %';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '% %';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '% ';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '実%';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '%邪借%';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '%質';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '｡｡%';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡%';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '､ﾈ%';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '%､｢%';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '%､�';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ%';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｻ%';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` LIKE '%常ﾇ';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+#BDB
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE ' %';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '% %';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '% ';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '実%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '%邪借%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '%質';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '｡｡%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '､ﾈ%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%､｢%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%､�';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｻ%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%常ﾇ';
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_like_ujis.test b/mysql-test/suite/jp/t/jp_like_ujis.test
new file mode 100755
index 00000000000..29ef7c5d48b
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_like_ujis.test
@@ -0,0 +1,170 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test LIKE pattern matching using Japanese characters in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｱ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｲ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｳ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｴ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｵ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｶ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｷ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｸ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｹ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｰ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｱ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｲ`;
+
+#InnoDB
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE ' %';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '% %';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '% ';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '実%';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%邪借%';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%質';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '｡｡%';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡%';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '､ﾈ%';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%､｢%';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%､�';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ%';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｻ%';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` LIKE '%常ﾇ';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+#MyISAM
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE ' %';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '% %';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '% ';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '実%';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '%邪借%';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '%質';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '｡｡%';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡%';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '､ﾈ%';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '%､｢%';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '%､�';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ%';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｻ%';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` LIKE '%常ﾇ';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+#Heap
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE ' %';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '% %';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '% ';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '実%';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '%邪借%';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '%質';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '｡｡%';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡%';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '､ﾈ%';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '%､｢%';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '%､�';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ%';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｻ%';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` LIKE '%常ﾇ';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+#BDB
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE ' %';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '% %';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '% ';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '実%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '%邪借%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '%質';
+#SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+#SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` LIKE '%鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '｡｡%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%｡｡';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '､ﾈ%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%､｢%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%､�';
+#SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+#SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ%';
+#SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` LIKE '%｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｻ%';
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%常ﾇ';
+#SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+#SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ%';
+#SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` LIKE '%常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_like_utf8.test b/mysql-test/suite/jp/t/jp_like_utf8.test
new file mode 100755
index 00000000000..4247242029d
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_like_utf8.test
@@ -0,0 +1,168 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test LIKE pattern matching using Japanese characters in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ疏;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ蛋;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ伝;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ覗;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ描;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ冒;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ輿;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ倭;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ兪;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ秦;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ疏;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ蛋;
+
+#InnoDB
+SELECT * FROM `�ｼｴ�ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE ' %';
+SELECT * FROM `�ｼｴ�ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '% %';
+SELECT * FROM `�ｼｴ�ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '% ';
+SELECT * FROM `�ｼｴ�ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '�ｾ�%';
+SELECT * FROM `�ｼｴ�ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｾ暦ｾ�%';
+SELECT * FROM `�ｼｴ�ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｽｿ';
+SELECT * FROM `�ｼｴ�ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ%';
+SELECT * FROM `�ｼｴ�ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ%';
+SELECT * FROM `�ｼｴ�ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ';
+SELECT * FROM `�ｼｴ�ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '縲�%';
+SELECT * FROM `�ｼｴ�ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '%縲�%';
+SELECT * FROM `�ｼｴ�ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '%縲�';
+SELECT * FROM `�ｼｴ�ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '縺ｨ%';
+SELECT * FROM `�ｼｴ�ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '%縺�%';
+SELECT * FROM `�ｼｴ�ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '%繧�';
+SELECT * FROM `�ｼｴ�ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％%';
+SELECT * FROM `�ｼｴ�ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '%繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％%';
+SELECT * FROM `�ｼｴ�ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '%繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％';
+SELECT * FROM `�ｼｴ�ｼ伝 WHERE `�ｼ｣�ｼ疏 LIKE '鮠ｫ%';
+SELECT * FROM `�ｼｴ�ｼ伝 WHERE `�ｼ｣�ｼ疏 LIKE '%鮠ｺ%';
+SELECT * FROM `�ｼｴ�ｼ伝 WHERE `�ｼ｣�ｼ疏 LIKE '%鮨�';
+SELECT * FROM `�ｼｴ�ｼ伝 WHERE `�ｼ｣�ｼ疏 LIKE '鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�%';
+SELECT * FROM `�ｼｴ�ｼ伝 WHERE `�ｼ｣�ｼ疏 LIKE '%鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�%';
+SELECT * FROM `�ｼｴ�ｼ伝 WHERE `�ｼ｣�ｼ疏 LIKE '%鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�';
+
+#MyISAM
+SELECT * FROM `�ｼｴ�ｼ覗 WHERE `�ｼ｣�ｼ疏 LIKE ' %';
+SELECT * FROM `�ｼｴ�ｼ覗 WHERE `�ｼ｣�ｼ疏 LIKE '% %';
+SELECT * FROM `�ｼｴ�ｼ覗 WHERE `�ｼ｣�ｼ疏 LIKE '% ';
+SELECT * FROM `�ｼｴ�ｼ覗 WHERE `�ｼ｣�ｼ疏 LIKE '�ｾ�%';
+SELECT * FROM `�ｼｴ�ｼ覗 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｾ暦ｾ�%';
+SELECT * FROM `�ｼｴ�ｼ覗 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｽｿ';
+SELECT * FROM `�ｼｴ�ｼ覗 WHERE `�ｼ｣�ｼ疏 LIKE '�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ%';
+SELECT * FROM `�ｼｴ�ｼ覗 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ%';
+SELECT * FROM `�ｼｴ�ｼ覗 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ';
+SELECT * FROM `�ｼｴ�ｼ描 WHERE `�ｼ｣�ｼ疏 LIKE '縲�%';
+SELECT * FROM `�ｼｴ�ｼ描 WHERE `�ｼ｣�ｼ疏 LIKE '%縲�%';
+SELECT * FROM `�ｼｴ�ｼ描 WHERE `�ｼ｣�ｼ疏 LIKE '%縲�';
+SELECT * FROM `�ｼｴ�ｼ描 WHERE `�ｼ｣�ｼ疏 LIKE '縺ｨ%';
+SELECT * FROM `�ｼｴ�ｼ描 WHERE `�ｼ｣�ｼ疏 LIKE '%縺�%';
+SELECT * FROM `�ｼｴ�ｼ描 WHERE `�ｼ｣�ｼ疏 LIKE '%繧�';
+SELECT * FROM `�ｼｴ�ｼ描 WHERE `�ｼ｣�ｼ疏 LIKE '繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％%';
+SELECT * FROM `�ｼｴ�ｼ描 WHERE `�ｼ｣�ｼ疏 LIKE '%繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％%';
+SELECT * FROM `�ｼｴ�ｼ描 WHERE `�ｼ｣�ｼ疏 LIKE '%繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％';
+SELECT * FROM `�ｼｴ�ｼ冒 WHERE `�ｼ｣�ｼ疏 LIKE '鮠ｫ%';
+SELECT * FROM `�ｼｴ�ｼ冒 WHERE `�ｼ｣�ｼ疏 LIKE '%鮠ｺ%';
+SELECT * FROM `�ｼｴ�ｼ冒 WHERE `�ｼ｣�ｼ疏 LIKE '%鮨�';
+SELECT * FROM `�ｼｴ�ｼ冒 WHERE `�ｼ｣�ｼ疏 LIKE '鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�%';
+SELECT * FROM `�ｼｴ�ｼ冒 WHERE `�ｼ｣�ｼ疏 LIKE '%鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�%';
+SELECT * FROM `�ｼｴ�ｼ冒 WHERE `�ｼ｣�ｼ疏 LIKE '%鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�';
+
+#Heap
+SELECT * FROM `�ｼｴ�ｼ輿 WHERE `�ｼ｣�ｼ疏 LIKE ' %';
+SELECT * FROM `�ｼｴ�ｼ輿 WHERE `�ｼ｣�ｼ疏 LIKE '% %';
+SELECT * FROM `�ｼｴ�ｼ輿 WHERE `�ｼ｣�ｼ疏 LIKE '% ';
+SELECT * FROM `�ｼｴ�ｼ輿 WHERE `�ｼ｣�ｼ疏 LIKE '�ｾ�%';
+SELECT * FROM `�ｼｴ�ｼ輿 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｾ暦ｾ�%';
+SELECT * FROM `�ｼｴ�ｼ輿 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｽｿ';
+SELECT * FROM `�ｼｴ�ｼ輿 WHERE `�ｼ｣�ｼ疏 LIKE '�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ%';
+SELECT * FROM `�ｼｴ�ｼ輿 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ%';
+SELECT * FROM `�ｼｴ�ｼ輿 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ';
+SELECT * FROM `�ｼｴ�ｼ倭 WHERE `�ｼ｣�ｼ疏 LIKE '縲�%';
+SELECT * FROM `�ｼｴ�ｼ倭 WHERE `�ｼ｣�ｼ疏 LIKE '%縲�%';
+SELECT * FROM `�ｼｴ�ｼ倭 WHERE `�ｼ｣�ｼ疏 LIKE '%縲�';
+SELECT * FROM `�ｼｴ�ｼ倭 WHERE `�ｼ｣�ｼ疏 LIKE '縺ｨ%';
+SELECT * FROM `�ｼｴ�ｼ倭 WHERE `�ｼ｣�ｼ疏 LIKE '%縺�%';
+SELECT * FROM `�ｼｴ�ｼ倭 WHERE `�ｼ｣�ｼ疏 LIKE '%繧�';
+SELECT * FROM `�ｼｴ�ｼ倭 WHERE `�ｼ｣�ｼ疏 LIKE '繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％%';
+SELECT * FROM `�ｼｴ�ｼ倭 WHERE `�ｼ｣�ｼ疏 LIKE '%繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％%';
+SELECT * FROM `�ｼｴ�ｼ倭 WHERE `�ｼ｣�ｼ疏 LIKE '%繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％';
+SELECT * FROM `�ｼｴ�ｼ兪 WHERE `�ｼ｣�ｼ疏 LIKE '鮠ｫ%';
+SELECT * FROM `�ｼｴ�ｼ兪 WHERE `�ｼ｣�ｼ疏 LIKE '%鮠ｺ%';
+SELECT * FROM `�ｼｴ�ｼ兪 WHERE `�ｼ｣�ｼ疏 LIKE '%鮨�';
+SELECT * FROM `�ｼｴ�ｼ兪 WHERE `�ｼ｣�ｼ疏 LIKE '鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�%';
+SELECT * FROM `�ｼｴ�ｼ兪 WHERE `�ｼ｣�ｼ疏 LIKE '%鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�%';
+SELECT * FROM `�ｼｴ�ｼ兪 WHERE `�ｼ｣�ｼ疏 LIKE '%鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�';
+#BDB
+SELECT * FROM `�ｼｴ�ｼ托ｼ秦 WHERE `�ｼ｣�ｼ疏 LIKE ' %';
+SELECT * FROM `�ｼｴ�ｼ托ｼ秦 WHERE `�ｼ｣�ｼ疏 LIKE '% %';
+SELECT * FROM `�ｼｴ�ｼ托ｼ秦 WHERE `�ｼ｣�ｼ疏 LIKE '% ';
+SELECT * FROM `�ｼｴ�ｼ托ｼ秦 WHERE `�ｼ｣�ｼ疏 LIKE '�ｾ�%';
+SELECT * FROM `�ｼｴ�ｼ托ｼ秦 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｾ暦ｾ�%';
+SELECT * FROM `�ｼｴ�ｼ托ｼ秦 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｽｿ';
+#SELECT * FROM `�ｼｴ�ｼ托ｼ秦 WHERE `�ｼ｣�ｼ疏 LIKE '�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ%';
+#SELECT * FROM `�ｼｴ�ｼ托ｼ秦 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ%';
+#SELECT * FROM `�ｼｴ�ｼ托ｼ秦 WHERE `�ｼ｣�ｼ疏 LIKE '%�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ';
+SELECT * FROM `�ｼｴ�ｼ托ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '縲�%';
+SELECT * FROM `�ｼｴ�ｼ托ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '%縲�%';
+SELECT * FROM `�ｼｴ�ｼ托ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '%縲�';
+SELECT * FROM `�ｼｴ�ｼ托ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '縺ｨ%';
+SELECT * FROM `�ｼｴ�ｼ托ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '%縺�%';
+SELECT * FROM `�ｼｴ�ｼ托ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '%繧�';
+#SELECT * FROM `�ｼｴ�ｼ托ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％%';
+#SELECT * FROM `�ｼｴ�ｼ托ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '%繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％%';
+#SELECT * FROM `�ｼｴ�ｼ托ｼ疏 WHERE `�ｼ｣�ｼ疏 LIKE '%繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％';
+SELECT * FROM `�ｼｴ�ｼ托ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '鮠ｫ%';
+SELECT * FROM `�ｼｴ�ｼ托ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '%鮠ｺ%';
+SELECT * FROM `�ｼｴ�ｼ托ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '%鮨�';
+#SELECT * FROM `�ｼｴ�ｼ托ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�%';
+#SELECT * FROM `�ｼｴ�ｼ托ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '%鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�%';
+#SELECT * FROM `�ｼｴ�ｼ托ｼ蛋 WHERE `�ｼ｣�ｼ疏 LIKE '%鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�';
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_locate_sjis.test b/mysql-test/suite/jp/t/jp_locate_sjis.test
new file mode 100755
index 00000000000..92c671199b6
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_locate_sjis.test
@@ -0,0 +1,141 @@
+--character_set sjis
+--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 `Ｔ１０`;
+--enable_warnings
+
+#
+# Test LOCATE() function with Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ２` VALUES ('あいうえお');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ５` VALUES ('あいうえお');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ８` VALUES ('あいうえお');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構');
+
+#InnoDB
+SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１`;
+SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ１`;
+SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ１`;
+SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ１`;
+SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ１`;
+SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ１`;
+SELECT LOCATE('あ',`Ｃ１`) from `Ｔ２`;
+SELECT LOCATE('い',`Ｃ１`) from `Ｔ２`;
+SELECT LOCATE('う',`Ｃ１`) from `Ｔ２`;
+SELECT LOCATE('え',`Ｃ１`) from `Ｔ２`;
+SELECT LOCATE('お',`Ｃ１`) from `Ｔ２`;
+SELECT LOCATE('ん',`Ｃ１`) from `Ｔ２`;
+SELECT LOCATE('ソ',`Ｃ１`) from `Ｔ３`;
+SELECT LOCATE('十',`Ｃ１`) from `Ｔ３`;
+SELECT LOCATE('表',`Ｃ１`) from `Ｔ３`;
+SELECT LOCATE('予',`Ｃ１`) from `Ｔ３`;
+SELECT LOCATE('構',`Ｃ１`) from `Ｔ３`;
+SELECT LOCATE('噂',`Ｃ１`) from `Ｔ３`;
+
+#MyISAM
+SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ４`;
+SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ４`;
+SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ４`;
+SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ４`;
+SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ４`;
+SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ４`;
+SELECT LOCATE('あ',`Ｃ１`) from `Ｔ５`;
+SELECT LOCATE('い',`Ｃ１`) from `Ｔ５`;
+SELECT LOCATE('う',`Ｃ１`) from `Ｔ５`;
+SELECT LOCATE('え',`Ｃ１`) from `Ｔ５`;
+SELECT LOCATE('お',`Ｃ１`) from `Ｔ５`;
+SELECT LOCATE('ん',`Ｃ１`) from `Ｔ５`;
+SELECT LOCATE('ソ',`Ｃ１`) from `Ｔ６`;
+SELECT LOCATE('十',`Ｃ１`) from `Ｔ６`;
+SELECT LOCATE('表',`Ｃ１`) from `Ｔ６`;
+SELECT LOCATE('予',`Ｃ１`) from `Ｔ６`;
+SELECT LOCATE('構',`Ｃ１`) from `Ｔ６`;
+SELECT LOCATE('噂',`Ｃ１`) from `Ｔ６`;
+
+
+#HEAP
+SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ７`;
+SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ７`;
+SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ７`;
+SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ７`;
+SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ７`;
+SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ７`;
+SELECT LOCATE('あ',`Ｃ１`) from `Ｔ８`;
+SELECT LOCATE('い',`Ｃ１`) from `Ｔ８`;
+SELECT LOCATE('う',`Ｃ１`) from `Ｔ８`;
+SELECT LOCATE('え',`Ｃ１`) from `Ｔ８`;
+SELECT LOCATE('お',`Ｃ１`) from `Ｔ８`;
+SELECT LOCATE('ん',`Ｃ１`) from `Ｔ８`;
+SELECT LOCATE('ソ',`Ｃ１`) from `Ｔ９`;
+SELECT LOCATE('十',`Ｃ１`) from `Ｔ９`;
+SELECT LOCATE('表',`Ｃ１`) from `Ｔ９`;
+SELECT LOCATE('予',`Ｃ１`) from `Ｔ９`;
+SELECT LOCATE('構',`Ｃ１`) from `Ｔ９`;
+SELECT LOCATE('噂',`Ｃ１`) from `Ｔ９`;
+
+
+#BDB
+SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１０`;
+SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ１０`;
+SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ１０`;
+SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ１０`;
+SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ１０`;
+SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ１０`;
+SELECT LOCATE('あ',`Ｃ１`) from `Ｔ１１`;
+SELECT LOCATE('い',`Ｃ１`) from `Ｔ１１`;
+SELECT LOCATE('う',`Ｃ１`) from `Ｔ１１`;
+SELECT LOCATE('え',`Ｃ１`) from `Ｔ１１`;
+SELECT LOCATE('お',`Ｃ１`) from `Ｔ１１`;
+SELECT LOCATE('ん',`Ｃ１`) from `Ｔ１１`;
+SELECT LOCATE('ソ',`Ｃ１`) from `Ｔ１２`;
+SELECT LOCATE('十',`Ｃ１`) from `Ｔ１２`;
+SELECT LOCATE('表',`Ｃ１`) from `Ｔ１２`;
+SELECT LOCATE('予',`Ｃ１`) from `Ｔ１２`;
+SELECT LOCATE('構',`Ｃ１`) from `Ｔ１２`;
+SELECT LOCATE('噂',`Ｃ１`) from `Ｔ１２`;
+
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_locate_ucs2.test b/mysql-test/suite/jp/t/jp_locate_ucs2.test
new file mode 100755
index 00000000000..d00ad67235a
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_locate_ucs2.test
@@ -0,0 +1,144 @@
+--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 `｣ﾔ｣ｱ｣ｰ`;
+--enable_warnings
+
+#
+# Test LOCATE() function with Japanese characters in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+#InnoDB
+SELECT LOCATE('竺',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LOCATE('軸',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LOCATE('宍',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LOCATE('雫',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LOCATE('七',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LOCATE('爵',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LOCATE('､｢',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LOCATE('､､',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LOCATE('､ｦ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LOCATE('､ｨ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LOCATE('､ｪ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LOCATE('､�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LOCATE('常ﾜ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+SELECT LOCATE('常ﾝ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+SELECT LOCATE('常ﾞ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+SELECT LOCATE('常ﾟ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+SELECT LOCATE('常�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+SELECT LOCATE('床｡',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT LOCATE('竺',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LOCATE('軸',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LOCATE('宍',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LOCATE('雫',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LOCATE('七',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LOCATE('爵',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LOCATE('､｢',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LOCATE('､､',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LOCATE('､ｦ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LOCATE('､ｨ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LOCATE('､ｪ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LOCATE('､�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LOCATE('常ﾜ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+SELECT LOCATE('常ﾝ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+SELECT LOCATE('常ﾞ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+SELECT LOCATE('常ﾟ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+SELECT LOCATE('常�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+SELECT LOCATE('床｡',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+
+
+#HEAP
+SELECT LOCATE('竺',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LOCATE('軸',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LOCATE('宍',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LOCATE('雫',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LOCATE('七',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LOCATE('爵',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LOCATE('､｢',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LOCATE('､､',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LOCATE('､ｦ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LOCATE('､ｨ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LOCATE('､ｪ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LOCATE('､�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LOCATE('常ﾜ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+SELECT LOCATE('常ﾝ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+SELECT LOCATE('常ﾞ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+SELECT LOCATE('常ﾟ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+SELECT LOCATE('常�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+SELECT LOCATE('床｡',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+
+
+#BDB
+SELECT LOCATE('竺',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LOCATE('軸',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LOCATE('宍',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LOCATE('雫',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LOCATE('七',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LOCATE('爵',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LOCATE('､｢',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LOCATE('､､',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LOCATE('､ｦ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LOCATE('､ｨ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LOCATE('､ｪ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LOCATE('､�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LOCATE('常ﾜ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+SELECT LOCATE('常ﾝ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+SELECT LOCATE('常ﾞ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+SELECT LOCATE('常ﾟ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+SELECT LOCATE('常�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+SELECT LOCATE('床｡',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_locate_ujis.test b/mysql-test/suite/jp/t/jp_locate_ujis.test
new file mode 100755
index 00000000000..5375fad75db
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_locate_ujis.test
@@ -0,0 +1,143 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｰ`;
+--enable_warnings
+
+#
+# Test LOCATE() function with Japanese characters in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+#InnoDB
+SELECT LOCATE('竺',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LOCATE('軸',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LOCATE('宍',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LOCATE('雫',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LOCATE('七',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LOCATE('爵',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LOCATE('､｢',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LOCATE('､､',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LOCATE('､ｦ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LOCATE('､ｨ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LOCATE('､ｪ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LOCATE('､�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LOCATE('常ﾜ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+SELECT LOCATE('常ﾝ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+SELECT LOCATE('常ﾞ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+SELECT LOCATE('常ﾟ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+SELECT LOCATE('常�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+SELECT LOCATE('床｡',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT LOCATE('竺',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LOCATE('軸',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LOCATE('宍',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LOCATE('雫',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LOCATE('七',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LOCATE('爵',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LOCATE('､｢',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LOCATE('､､',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LOCATE('､ｦ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LOCATE('､ｨ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LOCATE('､ｪ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LOCATE('､�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LOCATE('常ﾜ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+SELECT LOCATE('常ﾝ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+SELECT LOCATE('常ﾞ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+SELECT LOCATE('常ﾟ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+SELECT LOCATE('常�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+SELECT LOCATE('床｡',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+
+
+#HEAP
+SELECT LOCATE('竺',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LOCATE('軸',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LOCATE('宍',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LOCATE('雫',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LOCATE('七',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LOCATE('爵',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LOCATE('､｢',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LOCATE('､､',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LOCATE('､ｦ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LOCATE('､ｨ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LOCATE('､ｪ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LOCATE('､�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LOCATE('常ﾜ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+SELECT LOCATE('常ﾝ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+SELECT LOCATE('常ﾞ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+SELECT LOCATE('常ﾟ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+SELECT LOCATE('常�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+SELECT LOCATE('床｡',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+
+
+#BDB
+SELECT LOCATE('竺',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LOCATE('軸',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LOCATE('宍',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LOCATE('雫',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LOCATE('七',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LOCATE('爵',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LOCATE('､｢',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LOCATE('､､',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LOCATE('､ｦ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LOCATE('､ｨ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LOCATE('､ｪ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LOCATE('､�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LOCATE('常ﾜ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+SELECT LOCATE('常ﾝ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+SELECT LOCATE('常ﾞ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+SELECT LOCATE('常ﾟ',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+SELECT LOCATE('常�',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+SELECT LOCATE('床｡',`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_locate_utf8.test b/mysql-test/suite/jp/t/jp_locate_utf8.test
new file mode 100755
index 00000000000..cbf6714e322
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_locate_utf8.test
@@ -0,0 +1,141 @@
+--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 `�ｼｴ�ｼ托ｼ秦;
+--enable_warnings
+
+#
+# Test LOCATE() function with Japanese characters in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+
+#InnoDB
+SELECT LOCATE('�ｽｱ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ疏;
+SELECT LOCATE('�ｽｲ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ疏;
+SELECT LOCATE('�ｽｳ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ疏;
+SELECT LOCATE('�ｽｴ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ疏;
+SELECT LOCATE('�ｽｵ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ疏;
+SELECT LOCATE('�ｾ�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ疏;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ蛋;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ蛋;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ蛋;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ蛋;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ蛋;
+SELECT LOCATE('繧�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ蛋;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ伝;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ伝;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ伝;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ伝;
+SELECT LOCATE('鮴｡',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ伝;
+SELECT LOCATE('荳�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT LOCATE('�ｽｱ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ覗;
+SELECT LOCATE('�ｽｲ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ覗;
+SELECT LOCATE('�ｽｳ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ覗;
+SELECT LOCATE('�ｽｴ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ覗;
+SELECT LOCATE('�ｽｵ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ覗;
+SELECT LOCATE('�ｾ�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ覗;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ描;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ描;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ描;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ描;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ描;
+SELECT LOCATE('繧�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ描;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ冒;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ冒;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ冒;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ冒;
+SELECT LOCATE('鮴｡',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ冒;
+SELECT LOCATE('荳�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ冒;
+
+
+#HEAP
+SELECT LOCATE('�ｽｱ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ輿;
+SELECT LOCATE('�ｽｲ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ輿;
+SELECT LOCATE('�ｽｳ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ輿;
+SELECT LOCATE('�ｽｴ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ輿;
+SELECT LOCATE('�ｽｵ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ輿;
+SELECT LOCATE('�ｾ�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ輿;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ倭;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ倭;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ倭;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ倭;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ倭;
+SELECT LOCATE('繧�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ倭;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ兪;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ兪;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ兪;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ兪;
+SELECT LOCATE('鮴｡',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ兪;
+SELECT LOCATE('荳�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ兪;
+
+
+#BDB
+SELECT LOCATE('�ｽｱ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ秦;
+SELECT LOCATE('�ｽｲ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ秦;
+SELECT LOCATE('�ｽｳ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ秦;
+SELECT LOCATE('�ｽｴ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ秦;
+SELECT LOCATE('�ｽｵ',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ秦;
+SELECT LOCATE('�ｾ�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ秦;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ疏;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ疏;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ疏;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ疏;
+SELECT LOCATE('縺�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ疏;
+SELECT LOCATE('繧�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ疏;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ蛋;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ蛋;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ蛋;
+SELECT LOCATE('鮴�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ蛋;
+SELECT LOCATE('鮴｡',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ蛋;
+SELECT LOCATE('荳�',`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ蛋;
+
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_lpad_sjis.test b/mysql-test/suite/jp/t/jp_lpad_sjis.test
new file mode 100755
index 00000000000..7038112cbc8
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_lpad_sjis.test
@@ -0,0 +1,81 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test LPAD() function with Japanese character in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ５` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+
+#InnoDB
+SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`;
+SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ２`;
+SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'暴') FROM `Ｔ３`;
+
+#MyISAM
+SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ４`;
+SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ５`;
+SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'暴' ) FROM `Ｔ６`;
+
+#HEAP
+SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ７`;
+SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ８`;
+SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'暴' ) FROM `Ｔ９`;
+
+#BDB
+SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`;
+SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`;
+SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'暴' ) FROM `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_lpad_ucs2.test b/mysql-test/suite/jp/t/jp_lpad_ucs2.test
new file mode 100755
index 00000000000..e3bead0855a
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_lpad_ucs2.test
@@ -0,0 +1,83 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test LPAD() function with Japanese character in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'床｢') FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'床｢' ) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'床｢' ) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'床｢' ) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_lpad_ujis.test b/mysql-test/suite/jp/t/jp_lpad_ujis.test
new file mode 100755
index 00000000000..eea4877ec3a
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_lpad_ujis.test
@@ -0,0 +1,82 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test LPAD() function with Japanese character in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'床｢') FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'床｢' ) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'床｢' ) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, LPAD(`｣ﾃ｣ｱ`,5,'床｢' ) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_lpad_utf8.test b/mysql-test/suite/jp/t/jp_lpad_utf8.test
new file mode 100755
index 00000000000..599bf5eba28
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_lpad_utf8.test
@@ -0,0 +1,80 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test LPAD() function with Japanese character in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+
+#InnoDB
+SELECT `�ｼ｣�ｼ疏, LPAD(`�ｼ｣�ｼ疏,5,'�ｽ｡') FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LPAD(`�ｼ｣�ｼ疏,5,'�ｼｸ') FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, LPAD(`�ｼ｣�ｼ疏,5,'荳�') FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT `�ｼ｣�ｼ疏, LPAD(`�ｼ｣�ｼ疏,5,'�ｽ｡') FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, LPAD(`�ｼ｣�ｼ疏,5,'�ｼｸ') FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, LPAD(`�ｼ｣�ｼ疏,5,'荳�' ) FROM `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT `�ｼ｣�ｼ疏, LPAD(`�ｼ｣�ｼ疏,5,'�ｽ｡') FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, LPAD(`�ｼ｣�ｼ疏,5,'�ｼｸ') FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, LPAD(`�ｼ｣�ｼ疏,5,'荳�' ) FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT `�ｼ｣�ｼ疏, LPAD(`�ｼ｣�ｼ疏,5,'�ｽ｡') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, LPAD(`�ｼ｣�ｼ疏,5,'�ｼｸ') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, LPAD(`�ｼ｣�ｼ疏,5,'荳�' ) FROM `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_ltrim_sjis.test b/mysql-test/suite/jp/t/jp_ltrim_sjis.test
new file mode 100755
index 00000000000..864238df07c
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_ltrim_sjis.test
@@ -0,0 +1,163 @@
+--character_set sjis
+--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 `Ｔ１０`;
+--enable_warnings
+
+#
+# Test LTRIM() function with Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ１` VALUES (' ｱｲｳｴｵ');
+INSERT INTO `Ｔ１` VALUES ('  ｱｲｳｴｵ');
+INSERT INTO `Ｔ１` VALUES ('   ｱｲｳｴｵ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ１` VALUES ('　ｱｲｳｴｵ');
+INSERT INTO `Ｔ１` VALUES ('　　ｱｲｳｴｵ');
+INSERT INTO `Ｔ１` VALUES ('　　　ｱｲｳｴｵ');
+INSERT INTO `Ｔ２` VALUES ('あいうえお');
+INSERT INTO `Ｔ２` VALUES (' あいうえお');
+INSERT INTO `Ｔ２` VALUES ('  あいうえお');
+INSERT INTO `Ｔ２` VALUES ('   あいうえお');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ２` VALUES ('　あいうえお');
+INSERT INTO `Ｔ２` VALUES ('　　あいうえお');
+INSERT INTO `Ｔ２` VALUES ('　　　あいうえお');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ３` VALUES (' ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('  ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('   ソ十表予構');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ３` VALUES ('　ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('　　ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('　　　ソ十表予構');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ４` VALUES (' ｱｲｳｴｵ');
+INSERT INTO `Ｔ４` VALUES ('  ｱｲｳｴｵ');
+INSERT INTO `Ｔ４` VALUES ('   ｱｲｳｴｵ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ４` VALUES ('　ｱｲｳｴｵ');
+INSERT INTO `Ｔ４` VALUES ('　　ｱｲｳｴｵ');
+INSERT INTO `Ｔ４` VALUES ('　　　ｱｲｳｴｵ');
+INSERT INTO `Ｔ５` VALUES ('あいうえお');
+INSERT INTO `Ｔ５` VALUES (' あいうえお');
+INSERT INTO `Ｔ５` VALUES ('  あいうえお');
+INSERT INTO `Ｔ５` VALUES ('   あいうえお');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ５` VALUES ('　あいうえお');
+INSERT INTO `Ｔ５` VALUES ('　　あいうえお');
+INSERT INTO `Ｔ５` VALUES ('　　　あいうえお');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ６` VALUES (' ソ十表予構');
+INSERT INTO `Ｔ６` VALUES ('  ソ十表予構');
+INSERT INTO `Ｔ６` VALUES ('   ソ十表予構');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ６` VALUES ('　ソ十表予構');
+INSERT INTO `Ｔ６` VALUES ('　　ソ十表予構');
+INSERT INTO `Ｔ６` VALUES ('　　　ソ十表予構');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ７` VALUES (' ｱｲｳｴｵ');
+INSERT INTO `Ｔ７` VALUES ('  ｱｲｳｴｵ');
+INSERT INTO `Ｔ７` VALUES ('   ｱｲｳｴｵ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ７` VALUES ('　ｱｲｳｴｵ');
+INSERT INTO `Ｔ７` VALUES ('　　ｱｲｳｴｵ');
+INSERT INTO `Ｔ７` VALUES ('　　　ｱｲｳｴｵ');
+INSERT INTO `Ｔ８` VALUES ('あいうえお');
+INSERT INTO `Ｔ８` VALUES (' あいうえお');
+INSERT INTO `Ｔ８` VALUES ('  あいうえお');
+INSERT INTO `Ｔ８` VALUES ('   あいうえお');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ８` VALUES ('　あいうえお');
+INSERT INTO `Ｔ８` VALUES ('　　あいうえお');
+INSERT INTO `Ｔ８` VALUES ('　　　あいうえお');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ９` VALUES (' ソ十表予構');
+INSERT INTO `Ｔ９` VALUES ('  ソ十表予構');
+INSERT INTO `Ｔ９` VALUES ('   ソ十表予構');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ９` VALUES ('　ソ十表予構');
+INSERT INTO `Ｔ９` VALUES ('　　ソ十表予構');
+INSERT INTO `Ｔ９` VALUES ('　　　ソ十表予構');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ１０` VALUES (' ｱｲｳｴｵ');
+INSERT INTO `Ｔ１０` VALUES ('  ｱｲｳｴｵ');
+INSERT INTO `Ｔ１０` VALUES ('   ｱｲｳｴｵ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ１０` VALUES ('　ｱｲｳｴｵ');
+INSERT INTO `Ｔ１０` VALUES ('　　ｱｲｳｴｵ');
+INSERT INTO `Ｔ１０` VALUES ('　　　ｱｲｳｴｵ');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお');
+INSERT INTO `Ｔ１１` VALUES (' あいうえお');
+INSERT INTO `Ｔ１１` VALUES ('  あいうえお');
+INSERT INTO `Ｔ１１` VALUES ('   あいうえお');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ１１` VALUES ('　あいうえお');
+INSERT INTO `Ｔ１１` VALUES ('　　あいうえお');
+INSERT INTO `Ｔ１１` VALUES ('　　　あいうえお');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ１２` VALUES (' ソ十表予構');
+INSERT INTO `Ｔ１２` VALUES ('  ソ十表予構');
+INSERT INTO `Ｔ１２` VALUES ('   ソ十表予構');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ１２` VALUES ('　ソ十表予構');
+INSERT INTO `Ｔ１２` VALUES ('　　ソ十表予構');
+INSERT INTO `Ｔ１２` VALUES ('　　　ソ十表予構');
+
+#InnoDB
+SELECT LTRIM(`Ｃ１`) from `Ｔ１`;
+SELECT LTRIM(`Ｃ１`) from `Ｔ２`;
+SELECT LTRIM(`Ｃ１`) from `Ｔ３`;
+
+#MyISAM
+SELECT LTRIM(`Ｃ１`) from `Ｔ４`;
+SELECT LTRIM(`Ｃ１`) from `Ｔ５`;
+SELECT LTRIM(`Ｃ１`) from `Ｔ６`;
+
+#HEAP
+SELECT LTRIM(`Ｃ１`) from `Ｔ７`;
+SELECT LTRIM(`Ｃ１`) from `Ｔ８`;
+SELECT LTRIM(`Ｃ１`) from `Ｔ９`;
+
+#BDB
+SELECT LTRIM(`Ｃ１`) from `Ｔ１０`;
+SELECT LTRIM(`Ｃ１`) from `Ｔ１１`;
+SELECT LTRIM(`Ｃ１`) from `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_ltrim_ucs2.test b/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
new file mode 100755
index 00000000000..0ae647f5222
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
@@ -0,0 +1,165 @@
+--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 `｣ﾔ｣ｱ｣ｰ`;
+--enable_warnings
+
+#
+# Test LTRIM() function with Japanese characters in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES (' 竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('  竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('   竺軸宍雫七');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('｡｡｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES (' ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('  ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('｡｡｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES (' 常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('  常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('｡｡｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES (' 竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('  竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('   竺軸宍雫七');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('｡｡｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES (' ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('  ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('｡｡｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES (' 常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('  常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('｡｡｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES (' 竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('  竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('   竺軸宍雫七');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('｡｡｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES (' ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('  ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('｡｡｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES (' 常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('  常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('｡｡｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES (' 竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('  竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('   竺軸宍雫七');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('｡｡｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES (' ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('  ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('｡｡｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES (' 常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('  常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('｡｡｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+#InnoDB
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_ltrim_ujis.test b/mysql-test/suite/jp/t/jp_ltrim_ujis.test
new file mode 100755
index 00000000000..64363aa330b
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_ltrim_ujis.test
@@ -0,0 +1,164 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｰ`;
+--enable_warnings
+
+#
+# Test LTRIM() function with Japanese characters in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES (' 竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('  竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('   竺軸宍雫七');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('｡｡｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES (' ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('  ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('｡｡｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES (' 常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('  常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('｡｡｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES (' 竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('  竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('   竺軸宍雫七');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('｡｡｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES (' ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('  ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('｡｡｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES (' 常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('  常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('｡｡｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES (' 竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('  竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('   竺軸宍雫七');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('｡｡｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES (' ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('  ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('｡｡｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES (' 常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('  常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('｡｡｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES (' 竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('  竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('   竺軸宍雫七');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('｡｡｡｡｡｡竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES (' ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('  ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('｡｡｡｡｡｡､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES (' 常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('  常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('｡｡｡｡｡｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+#InnoDB
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT LTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_ltrim_utf8.test b/mysql-test/suite/jp/t/jp_ltrim_utf8.test
new file mode 100755
index 00000000000..846ce11163b
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_ltrim_utf8.test
@@ -0,0 +1,162 @@
+--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 `�ｼｴ�ｼ托ｼ秦;
+--enable_warnings
+
+#
+# Test LTRIM() function with Japanese characters in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES (' �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('  �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('   �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('縲��ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('縲�縲��ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('縲�縲�縲��ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES (' 縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('  縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('   縺ゅ＞縺�縺医♀');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縲�縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縲�縲�縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縲�縲�縲�縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES (' 鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('  鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('   鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('縲�鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('縲�縲�鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('縲�縲�縲�鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES (' �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('  �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('   �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('縲��ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('縲�縲��ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('縲�縲�縲��ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ描 VALUES (' 縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('  縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('   縺ゅ＞縺�縺医♀');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縲�縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縲�縲�縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縲�縲�縲�縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES (' 鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('  鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('   鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('縲�鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('縲�縲�鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('縲�縲�縲�鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES (' �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('  �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('   �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('縲��ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('縲�縲��ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('縲�縲�縲��ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES (' 縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('  縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('   縺ゅ＞縺�縺医♀');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縲�縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縲�縲�縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縲�縲�縲�縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES (' 鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('  鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('   鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('縲�鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('縲�縲�鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('縲�縲�縲�鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES (' �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('  �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('   �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('縲��ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('縲�縲��ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('縲�縲�縲��ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES (' 縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('  縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('   縺ゅ＞縺�縺医♀');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縲�縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縲�縲�縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縲�縲�縲�縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES (' 鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('  鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('   鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('縲�鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('縲�縲�鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('縲�縲�縲�鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+
+#InnoDB
+SELECT LTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ疏;
+SELECT LTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ蛋;
+SELECT LTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT LTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ覗;
+SELECT LTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ描;
+SELECT LTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT LTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ輿;
+SELECT LTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ倭;
+SELECT LTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT LTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ秦;
+SELECT LTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ疏;
+SELECT LTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_ps_sjis.test b/mysql-test/suite/jp/t/jp_ps_sjis.test
new file mode 100755
index 00000000000..cc93dca2a79
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_ps_sjis.test
@@ -0,0 +1,454 @@
+--character_set sjis
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+DROP TABLE IF EXISTS t4;
+--enable_warnings
+
+#
+# Test Prepares Statement with Japanese character in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+### Test InnoDB ###
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = InnoDB;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = InnoDB;
+CREATE TABLE t3(
+ `ｱ`  char(1),
+ `あ` char(1),
+ `表` char(1)
+)DEFAULT CHARSET = sjis ENGINE = InnoDB;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE = InnoDB;
+
+INSERT INTO t1 VALUES ('xxx');
+INSERT INTO t2 VALUES ('ｱあ表');
+INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
+INSERT INTO t4 VALUES ('ｱ'),('あ'),('表');
+
+# Japanese parameter for column name
+# the parameter for stmt is not interpreted as column name
+PREPARE stmt1 FROM 'SELECT ? FROM t3';
+PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
+PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
+# Japanese parameter for function argument
+PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
+PREPARE stmt5 FROM 'SELECT CHARSET(?)';
+PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
+PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
+PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
+PREPARE stmt9 FROM 'SELECT LPAD(c1,10,?) FROM t1';
+PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
+PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
+PREPARE stmt12 FROM 'SELECT RPAD(c1,10,?) FROM t1';
+# Japanese parameter for UPDATE
+PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
+PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
+
+## Test jisx0201 ##
+SET @arg = 'ｱ';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+## Test jisx0208 ##
+SET @arg = 'あ';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+# Test jisx0212 ##
+SET @arg = '表';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+DEALLOCATE PREPARE stmt1;
+DEALLOCATE PREPARE stmt2;
+DEALLOCATE PREPARE stmt3;
+DEALLOCATE PREPARE stmt4;
+DEALLOCATE PREPARE stmt5;
+DEALLOCATE PREPARE stmt6;
+DEALLOCATE PREPARE stmt7;
+DEALLOCATE PREPARE stmt8;
+DEALLOCATE PREPARE stmt9;
+DEALLOCATE PREPARE stmt10;
+DEALLOCATE PREPARE stmt11;
+DEALLOCATE PREPARE stmt12;
+DEALLOCATE PREPARE stmt13;
+DEALLOCATE PREPARE stmt14;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+
+### Test MyISAM ###
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = MyISAM;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = MyISAM;
+CREATE TABLE t3(
+ `ｱ` char(1),
+ `あ` char(1),
+ `表` char(1)
+)DEFAULT CHARSET = sjis ENGINE = MyISAM;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE = MyISAM;
+
+INSERT INTO t1 VALUES ('xxx');
+INSERT INTO t2 VALUES ('ｱあ表');
+INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
+INSERT INTO t4 VALUES ('ｱ'),('あ'),('表' );
+
+# Japanese parameter for column name
+PREPARE stmt1 FROM 'SELECT ? FROM t3';
+PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
+PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
+# Japanese parameter for function argument
+PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
+PREPARE stmt5 FROM 'SELECT CHARSET(?)';
+PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
+PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
+PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
+PREPARE stmt9 FROM 'SELECT LPAD(c1,10,?) FROM t1';
+PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
+PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
+PREPARE stmt12 FROM 'SELECT RPAD(c1,10,?) FROM t1';
+# Japanese parameter for UPDATE
+PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
+PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
+
+## Test jisx0201 ##
+SET @arg = 'ｱ';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+## Test jisx0208 ##
+SET @arg = 'あ';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+## Test jisx0212 ##
+SET @arg = '表';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+DEALLOCATE PREPARE stmt1;
+DEALLOCATE PREPARE stmt2;
+DEALLOCATE PREPARE stmt3;
+DEALLOCATE PREPARE stmt4;
+DEALLOCATE PREPARE stmt5;
+DEALLOCATE PREPARE stmt6;
+DEALLOCATE PREPARE stmt7;
+DEALLOCATE PREPARE stmt8;
+DEALLOCATE PREPARE stmt9;
+DEALLOCATE PREPARE stmt10;
+DEALLOCATE PREPARE stmt11;
+DEALLOCATE PREPARE stmt12;
+DEALLOCATE PREPARE stmt13;
+DEALLOCATE PREPARE stmt14;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+
+### Test HEAP ###
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = HEAP;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = HEAP;
+CREATE TABLE t3(
+ `ｱ` char(1),
+ `あ` char(1),
+ `表` char(1)
+)DEFAULT CHARSET = sjis ENGINE = HEAP;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE =HEAP;
+
+INSERT INTO t1 VALUES ('xxx');
+INSERT INTO t2 VALUES ('ｱあ表');
+INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
+INSERT INTO t4 VALUES ('ｱ'),('あ'),('表' );
+
+# Japanese parameter for column name
+PREPARE stmt1 FROM 'SELECT ? FROM t3';
+PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
+PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
+# Japanese parameter for function argument
+PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
+PREPARE stmt5 FROM 'SELECT CHARSET(?)';
+PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
+PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
+PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
+PREPARE stmt9 FROM 'SELECT LPAD(c1,10,?) FROM t1';
+PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
+PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
+PREPARE stmt12 FROM 'SELECT RPAD(c1,10,?) FROM t1';
+# Japanese parameter for UPDATE
+PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
+PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
+
+## Test jisx0201 ##
+SET @arg = 'ｱ';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+## Test jisx0208 ##
+SET @arg = 'あ';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+## Test jisx0212 ##
+SET @arg = '表';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+DEALLOCATE PREPARE stmt1;
+DEALLOCATE PREPARE stmt2;
+DEALLOCATE PREPARE stmt3;
+DEALLOCATE PREPARE stmt4;
+DEALLOCATE PREPARE stmt5;
+DEALLOCATE PREPARE stmt6;
+DEALLOCATE PREPARE stmt7;
+DEALLOCATE PREPARE stmt8;
+DEALLOCATE PREPARE stmt9;
+DEALLOCATE PREPARE stmt10;
+DEALLOCATE PREPARE stmt11;
+DEALLOCATE PREPARE stmt12;
+DEALLOCATE PREPARE stmt13;
+DEALLOCATE PREPARE stmt14;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+
+### Test BDB ###
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = BDB;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = BDB;
+CREATE TABLE t3(
+ `ｱ` char(1),
+ `あ` char(1),
+ `表` char(1)
+)DEFAULT CHARSET = sjis ENGINE = BDB;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE = BDB;
+INSERT INTO t1 VALUES ('xxx');
+INSERT INTO t2 VALUES ('ｱあ表');
+INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
+INSERT INTO t4 VALUES ('ｱ'),('あ'),('表' );
+
+# Japanese parameter for column name
+PREPARE stmt1 FROM 'SELECT ? FROM t3';
+PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
+PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
+# Japanese parameter for function argument
+PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
+PREPARE stmt5 FROM 'SELECT CHARSET(?)';
+PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
+PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
+PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
+PREPARE stmt9 FROM 'SELECT LPAD(c1,10,?) FROM t1';
+PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
+PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
+PREPARE stmt12 FROM 'SELECT RPAD(c1,10,?) FROM t1';
+# Japanese parameter for UPDATE
+PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
+PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
+
+## Test jisx0201 ##
+SET @arg = 'ｱ';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t3;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t3;
+
+## Test jisx0208 ##
+SET @arg = 'あ';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+##Test jisx0212 ##
+SET @arg = '表';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+DEALLOCATE PREPARE stmt1;
+DEALLOCATE PREPARE stmt2;
+DEALLOCATE PREPARE stmt3;
+DEALLOCATE PREPARE stmt4;
+DEALLOCATE PREPARE stmt5;
+DEALLOCATE PREPARE stmt6;
+DEALLOCATE PREPARE stmt7;
+DEALLOCATE PREPARE stmt8;
+DEALLOCATE PREPARE stmt9;
+DEALLOCATE PREPARE stmt10;
+DEALLOCATE PREPARE stmt11;
+DEALLOCATE PREPARE stmt12;
+DEALLOCATE PREPARE stmt13;
+DEALLOCATE PREPARE stmt14;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
diff --git a/mysql-test/suite/jp/t/jp_ps_ujis.test b/mysql-test/suite/jp/t/jp_ps_ujis.test
new file mode 100755
index 00000000000..7d61c12e496
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_ps_ujis.test
@@ -0,0 +1,455 @@
+--source include/have_ujis.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+DROP TABLE IF EXISTS t4;
+--enable_warnings
+
+#
+# Test Prepares Statement with Japanese character in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+### Test InnoDB ###
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = InnoDB;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = InnoDB;
+CREATE TABLE t3(
+ `竺`  char(1),
+ `､｢` char(1),
+ `常ﾜ` char(1)
+)DEFAULT CHARSET = ujis ENGINE = InnoDB;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE = InnoDB;
+
+INSERT INTO t1 VALUES ('xxx');
+INSERT INTO t2 VALUES ('竺､｢常ﾜ');
+INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
+INSERT INTO t4 VALUES ('竺'),('､｢'),('常ﾜ');
+
+# Japanese parameter for column name
+# the parameter for stmt is not interpreted as column name
+PREPARE stmt1 FROM 'SELECT ? FROM t3';
+PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
+PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
+# Japanese parameter for function argument
+PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
+PREPARE stmt5 FROM 'SELECT CHARSET(?)';
+PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
+PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
+PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
+PREPARE stmt9 FROM 'SELECT LPAD(c1,9,?) FROM t1';
+PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
+PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
+PREPARE stmt12 FROM 'SELECT RPAD(c1,9,?) FROM t1';
+# Japanese parameter for UPDATE
+PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
+PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
+
+## Test jisx0201 ##
+SET @arg = '竺';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+## Test jisx0208 ##
+SET @arg = '､｢';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+# Test jisx0212 ##
+SET @arg = '常ﾜ';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+DEALLOCATE PREPARE stmt1;
+DEALLOCATE PREPARE stmt2;
+DEALLOCATE PREPARE stmt3;
+DEALLOCATE PREPARE stmt4;
+DEALLOCATE PREPARE stmt5;
+DEALLOCATE PREPARE stmt6;
+DEALLOCATE PREPARE stmt7;
+DEALLOCATE PREPARE stmt8;
+DEALLOCATE PREPARE stmt9;
+DEALLOCATE PREPARE stmt10;
+DEALLOCATE PREPARE stmt11;
+DEALLOCATE PREPARE stmt12;
+DEALLOCATE PREPARE stmt13;
+DEALLOCATE PREPARE stmt14;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+
+### Test MyISAM ###
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = MyISAM;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = MyISAM;
+CREATE TABLE t3(
+ `竺` char(1),
+ `､｢` char(1),
+ `常ﾜ` char(1)
+)DEFAULT CHARSET = ujis ENGINE = MyISAM;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE = MyISAM;
+
+INSERT INTO t1 VALUES ('xxx');
+INSERT INTO t2 VALUES ('竺､｢常ﾜ');
+INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
+INSERT INTO t4 VALUES ('竺'),('､｢'),('常ﾜ' );
+
+# Japanese parameter for column name
+PREPARE stmt1 FROM 'SELECT ? FROM t3';
+PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
+PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
+# Japanese parameter for function argument
+PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
+PREPARE stmt5 FROM 'SELECT CHARSET(?)';
+PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
+PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
+PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
+PREPARE stmt9 FROM 'SELECT LPAD(c1,9,?) FROM t1';
+PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
+PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
+PREPARE stmt12 FROM 'SELECT RPAD(c1,9,?) FROM t1';
+# Japanese parameter for UPDATE
+PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
+PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
+
+## Test jisx0201 ##
+SET @arg = '竺';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+## Test jisx0208 ##
+SET @arg = '､｢';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+## Test jisx0212 ##
+SET @arg = '常ﾜ';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+DEALLOCATE PREPARE stmt1;
+DEALLOCATE PREPARE stmt2;
+DEALLOCATE PREPARE stmt3;
+DEALLOCATE PREPARE stmt4;
+DEALLOCATE PREPARE stmt5;
+DEALLOCATE PREPARE stmt6;
+DEALLOCATE PREPARE stmt7;
+DEALLOCATE PREPARE stmt8;
+DEALLOCATE PREPARE stmt9;
+DEALLOCATE PREPARE stmt10;
+DEALLOCATE PREPARE stmt11;
+DEALLOCATE PREPARE stmt12;
+DEALLOCATE PREPARE stmt13;
+DEALLOCATE PREPARE stmt14;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+
+### Test HEAP ###
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = HEAP;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = HEAP;
+CREATE TABLE t3(
+ `竺` char(1),
+ `､｢` char(1),
+ `常ﾜ` char(1)
+)DEFAULT CHARSET = ujis ENGINE = HEAP;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE =HEAP;
+
+INSERT INTO t1 VALUES ('xxx');
+INSERT INTO t2 VALUES ('竺､｢常ﾜ');
+INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
+INSERT INTO t4 VALUES ('竺'),('､｢'),('常ﾜ' );
+
+# Japanese parameter for column name
+PREPARE stmt1 FROM 'SELECT ? FROM t3';
+PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
+PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
+# Japanese parameter for function argument
+PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
+PREPARE stmt5 FROM 'SELECT CHARSET(?)';
+PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
+PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
+PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
+PREPARE stmt9 FROM 'SELECT LPAD(c1,9,?) FROM t1';
+PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
+PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
+PREPARE stmt12 FROM 'SELECT RPAD(c1,9,?) FROM t1';
+# Japanese parameter for UPDATE
+PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
+PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
+
+## Test jisx0201 ##
+SET @arg = '竺';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+## Test jisx0208 ##
+SET @arg = '､｢';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+## Test jisx0212 ##
+SET @arg = '常ﾜ';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+DEALLOCATE PREPARE stmt1;
+DEALLOCATE PREPARE stmt2;
+DEALLOCATE PREPARE stmt3;
+DEALLOCATE PREPARE stmt4;
+DEALLOCATE PREPARE stmt5;
+DEALLOCATE PREPARE stmt6;
+DEALLOCATE PREPARE stmt7;
+DEALLOCATE PREPARE stmt8;
+DEALLOCATE PREPARE stmt9;
+DEALLOCATE PREPARE stmt10;
+DEALLOCATE PREPARE stmt11;
+DEALLOCATE PREPARE stmt12;
+DEALLOCATE PREPARE stmt13;
+DEALLOCATE PREPARE stmt14;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+
+### Test BDB ###
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = BDB;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = BDB;
+CREATE TABLE t3(
+ `竺` char(1),
+ `､｢` char(1),
+ `常ﾜ` char(1)
+)DEFAULT CHARSET = ujis ENGINE = BDB;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE = BDB;
+INSERT INTO t1 VALUES ('xxx');
+INSERT INTO t2 VALUES ('竺､｢常ﾜ');
+INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
+INSERT INTO t4 VALUES ('竺'),('､｢'),('常ﾜ' );
+
+# Japanese parameter for column name
+PREPARE stmt1 FROM 'SELECT ? FROM t3';
+PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
+PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
+# Japanese parameter for function argument
+PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
+PREPARE stmt5 FROM 'SELECT CHARSET(?)';
+PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
+PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
+PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
+PREPARE stmt9 FROM 'SELECT LPAD(c1,9,?) FROM t1';
+PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
+PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
+PREPARE stmt12 FROM 'SELECT RPAD(c1,9,?) FROM t1';
+# Japanese parameter for UPDATE
+PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
+PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
+
+## Test jisx0201 ##
+SET @arg = '竺';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t3;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t3;
+
+## Test jisx0208 ##
+SET @arg = '､｢';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+##Test jisx0212 ##
+SET @arg = '常ﾜ';
+EXECUTE stmt1 USING @arg;
+EXECUTE stmt2 USING @arg;
+EXECUTE stmt3 USING @arg;
+EXECUTE stmt4 USING @arg;
+EXECUTE stmt5 USING @arg;
+EXECUTE stmt6 USING @arg;
+EXECUTE stmt7 USING @arg;
+EXECUTE stmt8 USING @arg;
+EXECUTE stmt9 USING @arg;
+EXECUTE stmt10 USING @arg;
+EXECUTE stmt11 USING @arg;
+EXECUTE stmt12 USING @arg;
+EXECUTE stmt13 USING @arg;
+SELECT * FROM t4;
+EXECUTE stmt14 USING @arg;
+SELECT * FROM t4;
+
+DEALLOCATE PREPARE stmt1;
+DEALLOCATE PREPARE stmt2;
+DEALLOCATE PREPARE stmt3;
+DEALLOCATE PREPARE stmt4;
+DEALLOCATE PREPARE stmt5;
+DEALLOCATE PREPARE stmt6;
+DEALLOCATE PREPARE stmt7;
+DEALLOCATE PREPARE stmt8;
+DEALLOCATE PREPARE stmt9;
+DEALLOCATE PREPARE stmt10;
+DEALLOCATE PREPARE stmt11;
+DEALLOCATE PREPARE stmt12;
+DEALLOCATE PREPARE stmt13;
+DEALLOCATE PREPARE stmt14;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
diff --git a/mysql-test/suite/jp/t/jp_replace_sjis.test b/mysql-test/suite/jp/t/jp_replace_sjis.test
new file mode 100755
index 00000000000..811d3350a34
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_replace_sjis.test
@@ -0,0 +1,129 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test REPLACE() function with Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ２` VALUES ('あいうえお');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ５` VALUES ('あいうえお');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ８` VALUES ('あいうえお');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構');
+
+#InnoDB
+SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１`;
+SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ１`;
+SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ１`;
+SELECT REPLACE(`Ｃ１`,'ｴ','ｴｴ') FROM `Ｔ１`;
+SELECT REPLACE(`Ｃ１`,'ｵ','ｵｵ') FROM `Ｔ１`;
+SELECT REPLACE(`Ｃ１`,'あ','ああ') FROM `Ｔ２`;
+SELECT REPLACE(`Ｃ１`,'い','いい') FROM `Ｔ２`;
+SELECT REPLACE(`Ｃ１`,'う','うう') FROM `Ｔ２`;
+SELECT REPLACE(`Ｃ１`,'え','ええ') FROM `Ｔ２`;
+SELECT REPLACE(`Ｃ１`,'お','おお') FROM `Ｔ２`;
+SELECT REPLACE(`Ｃ１`,'ソ','ソソ') FROM `Ｔ３`;
+SELECT REPLACE(`Ｃ１`,'十','十十') FROM `Ｔ３`;
+SELECT REPLACE(`Ｃ１`,'表','表表') FROM `Ｔ３`;
+SELECT REPLACE(`Ｃ１`,'予','予予') FROM `Ｔ３`;
+SELECT REPLACE(`Ｃ１`,'構','構構') FROM `Ｔ３`;
+
+#MyISAM
+SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ４`;
+SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ４`;
+SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ４`;
+SELECT REPLACE(`Ｃ１`,'ｴ','ｴｴ') FROM `Ｔ４`;
+SELECT REPLACE(`Ｃ１`,'ｵ','ｵｵ') FROM `Ｔ４`;
+SELECT REPLACE(`Ｃ１`,'あ','ああ') FROM `Ｔ５`;
+SELECT REPLACE(`Ｃ１`,'い','いい') FROM `Ｔ５`;
+SELECT REPLACE(`Ｃ１`,'う','うう') FROM `Ｔ５`;
+SELECT REPLACE(`Ｃ１`,'え','ええ') FROM `Ｔ５`;
+SELECT REPLACE(`Ｃ１`,'お','おお') FROM `Ｔ５`;
+SELECT REPLACE(`Ｃ１`,'ソ','ソソ') FROM `Ｔ６`;
+SELECT REPLACE(`Ｃ１`,'十','十十') FROM `Ｔ６`;
+SELECT REPLACE(`Ｃ１`,'表','表表') FROM `Ｔ６`;
+SELECT REPLACE(`Ｃ１`,'予','予予') FROM `Ｔ６`;
+SELECT REPLACE(`Ｃ１`,'構','構構') FROM `Ｔ６`;
+
+#HEAP
+SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ７`;
+SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ７`;
+SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ７`;
+SELECT REPLACE(`Ｃ１`,'ｴ','ｴｴ') FROM `Ｔ７`;
+SELECT REPLACE(`Ｃ１`,'ｵ','ｵｵ') FROM `Ｔ７`;
+SELECT REPLACE(`Ｃ１`,'あ','ああ') FROM `Ｔ８`;
+SELECT REPLACE(`Ｃ１`,'い','いい') FROM `Ｔ８`;
+SELECT REPLACE(`Ｃ１`,'う','うう') FROM `Ｔ８`;
+SELECT REPLACE(`Ｃ１`,'え','ええ') FROM `Ｔ８`;
+SELECT REPLACE(`Ｃ１`,'お','おお') FROM `Ｔ８`;
+SELECT REPLACE(`Ｃ１`,'ソ','ソソ') FROM `Ｔ９`;
+SELECT REPLACE(`Ｃ１`,'十','十十') FROM `Ｔ９`;
+SELECT REPLACE(`Ｃ１`,'表','表表') FROM `Ｔ９`;
+SELECT REPLACE(`Ｃ１`,'予','予予') FROM `Ｔ９`;
+SELECT REPLACE(`Ｃ１`,'構','構構') FROM `Ｔ９`;
+
+#BDB
+SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１０`;
+SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ１０`;
+SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ１０`;
+SELECT REPLACE(`Ｃ１`,'ｴ','ｴｴ') FROM `Ｔ１０`;
+SELECT REPLACE(`Ｃ１`,'ｵ','ｵｵ') FROM `Ｔ１０`;
+SELECT REPLACE(`Ｃ１`,'あ','ああ') FROM `Ｔ１１`;
+SELECT REPLACE(`Ｃ１`,'い','いい') FROM `Ｔ１１`;
+SELECT REPLACE(`Ｃ１`,'う','うう') FROM `Ｔ１１`;
+SELECT REPLACE(`Ｃ１`,'え','ええ') FROM `Ｔ１１`;
+SELECT REPLACE(`Ｃ１`,'お','おお') FROM `Ｔ１１`;
+SELECT REPLACE(`Ｃ１`,'ソ','ソソ') FROM `Ｔ１２`;
+SELECT REPLACE(`Ｃ１`,'十','十十') FROM `Ｔ１２`;
+SELECT REPLACE(`Ｃ１`,'表','表表') FROM `Ｔ１２`;
+SELECT REPLACE(`Ｃ１`,'予','予予') FROM `Ｔ１２`;
+SELECT REPLACE(`Ｃ１`,'構','構構') FROM `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_replace_ucs2.test b/mysql-test/suite/jp/t/jp_replace_ucs2.test
new file mode 100755
index 00000000000..7739a30cd9c
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_replace_ucs2.test
@@ -0,0 +1,131 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test REPLACE() function with Japanese characters in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+#InnoDB
+SELECT REPLACE(`｣ﾃ｣ｱ`,'竺','竺竺') FROM `｣ﾔ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'軸','軸軸') FROM `｣ﾔ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'宍','宍宍') FROM `｣ﾔ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'雫','雫雫') FROM `｣ﾔ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'七','七七') FROM `｣ﾔ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､｢','､｢､｢') FROM `｣ﾔ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､､','､､､､') FROM `｣ﾔ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｦ','､ｦ､ｦ') FROM `｣ﾔ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｨ','､ｨ､ｨ') FROM `｣ﾔ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｪ','､ｪ､ｪ') FROM `｣ﾔ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾜ','常ﾜ常ﾜ') FROM `｣ﾔ｣ｳ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾝ','常ﾝ常ﾝ') FROM `｣ﾔ｣ｳ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾞ','常ﾞ常ﾞ') FROM `｣ﾔ｣ｳ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾟ','常ﾟ常ﾟ') FROM `｣ﾔ｣ｳ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常�','常熄��') FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT REPLACE(`｣ﾃ｣ｱ`,'竺','竺竺') FROM `｣ﾔ｣ｴ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'軸','軸軸') FROM `｣ﾔ｣ｴ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'宍','宍宍') FROM `｣ﾔ｣ｴ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'雫','雫雫') FROM `｣ﾔ｣ｴ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'七','七七') FROM `｣ﾔ｣ｴ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､｢','､｢､｢') FROM `｣ﾔ｣ｵ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､､','､､､､') FROM `｣ﾔ｣ｵ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｦ','､ｦ､ｦ') FROM `｣ﾔ｣ｵ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｨ','､ｨ､ｨ') FROM `｣ﾔ｣ｵ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｪ','､ｪ､ｪ') FROM `｣ﾔ｣ｵ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾜ','常ﾜ常ﾜ') FROM `｣ﾔ｣ｶ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾝ','常ﾝ常ﾝ') FROM `｣ﾔ｣ｶ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾞ','常ﾞ常ﾞ') FROM `｣ﾔ｣ｶ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾟ','常ﾟ常ﾟ') FROM `｣ﾔ｣ｶ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常�','常熄��') FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT REPLACE(`｣ﾃ｣ｱ`,'竺','竺竺') FROM `｣ﾔ｣ｷ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'軸','軸軸') FROM `｣ﾔ｣ｷ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'宍','宍宍') FROM `｣ﾔ｣ｷ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'雫','雫雫') FROM `｣ﾔ｣ｷ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'七','七七') FROM `｣ﾔ｣ｷ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､｢','､｢､｢') FROM `｣ﾔ｣ｸ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､､','､､､､') FROM `｣ﾔ｣ｸ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｦ','､ｦ､ｦ') FROM `｣ﾔ｣ｸ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｨ','､ｨ､ｨ') FROM `｣ﾔ｣ｸ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｪ','､ｪ､ｪ') FROM `｣ﾔ｣ｸ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾜ','常ﾜ常ﾜ') FROM `｣ﾔ｣ｹ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾝ','常ﾝ常ﾝ') FROM `｣ﾔ｣ｹ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾞ','常ﾞ常ﾞ') FROM `｣ﾔ｣ｹ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾟ','常ﾟ常ﾟ') FROM `｣ﾔ｣ｹ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常�','常熄��') FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT REPLACE(`｣ﾃ｣ｱ`,'竺','竺竺') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'軸','軸軸') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'宍','宍宍') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'雫','雫雫') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'七','七七') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､｢','､｢､｢') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､､','､､､､') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｦ','､ｦ､ｦ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｨ','､ｨ､ｨ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｪ','､ｪ､ｪ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾜ','常ﾜ常ﾜ') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾝ','常ﾝ常ﾝ') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾞ','常ﾞ常ﾞ') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾟ','常ﾟ常ﾟ') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常�','常熄��') FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_replace_ujis.test b/mysql-test/suite/jp/t/jp_replace_ujis.test
new file mode 100755
index 00000000000..3d8724e63d5
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_replace_ujis.test
@@ -0,0 +1,130 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test REPLACE() function with Japanese characters in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+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 = 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 = 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 = 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 ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+#InnoDB
+SELECT REPLACE(`｣ﾃ｣ｱ`,'竺','竺竺') FROM `｣ﾔ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'軸','軸軸') FROM `｣ﾔ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'宍','宍宍') FROM `｣ﾔ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'雫','雫雫') FROM `｣ﾔ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'七','七七') FROM `｣ﾔ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､｢','､｢､｢') FROM `｣ﾔ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､､','､､､､') FROM `｣ﾔ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｦ','､ｦ､ｦ') FROM `｣ﾔ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｨ','､ｨ､ｨ') FROM `｣ﾔ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｪ','､ｪ､ｪ') FROM `｣ﾔ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾜ','常ﾜ常ﾜ') FROM `｣ﾔ｣ｳ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾝ','常ﾝ常ﾝ') FROM `｣ﾔ｣ｳ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾞ','常ﾞ常ﾞ') FROM `｣ﾔ｣ｳ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾟ','常ﾟ常ﾟ') FROM `｣ﾔ｣ｳ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常�','常熄��') FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT REPLACE(`｣ﾃ｣ｱ`,'竺','竺竺') FROM `｣ﾔ｣ｴ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'軸','軸軸') FROM `｣ﾔ｣ｴ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'宍','宍宍') FROM `｣ﾔ｣ｴ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'雫','雫雫') FROM `｣ﾔ｣ｴ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'七','七七') FROM `｣ﾔ｣ｴ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､｢','､｢､｢') FROM `｣ﾔ｣ｵ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､､','､､､､') FROM `｣ﾔ｣ｵ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｦ','､ｦ､ｦ') FROM `｣ﾔ｣ｵ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｨ','､ｨ､ｨ') FROM `｣ﾔ｣ｵ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｪ','､ｪ､ｪ') FROM `｣ﾔ｣ｵ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾜ','常ﾜ常ﾜ') FROM `｣ﾔ｣ｶ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾝ','常ﾝ常ﾝ') FROM `｣ﾔ｣ｶ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾞ','常ﾞ常ﾞ') FROM `｣ﾔ｣ｶ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾟ','常ﾟ常ﾟ') FROM `｣ﾔ｣ｶ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常�','常熄��') FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT REPLACE(`｣ﾃ｣ｱ`,'竺','竺竺') FROM `｣ﾔ｣ｷ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'軸','軸軸') FROM `｣ﾔ｣ｷ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'宍','宍宍') FROM `｣ﾔ｣ｷ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'雫','雫雫') FROM `｣ﾔ｣ｷ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'七','七七') FROM `｣ﾔ｣ｷ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､｢','､｢､｢') FROM `｣ﾔ｣ｸ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､､','､､､､') FROM `｣ﾔ｣ｸ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｦ','､ｦ､ｦ') FROM `｣ﾔ｣ｸ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｨ','､ｨ､ｨ') FROM `｣ﾔ｣ｸ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｪ','､ｪ､ｪ') FROM `｣ﾔ｣ｸ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾜ','常ﾜ常ﾜ') FROM `｣ﾔ｣ｹ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾝ','常ﾝ常ﾝ') FROM `｣ﾔ｣ｹ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾞ','常ﾞ常ﾞ') FROM `｣ﾔ｣ｹ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾟ','常ﾟ常ﾟ') FROM `｣ﾔ｣ｹ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常�','常熄��') FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT REPLACE(`｣ﾃ｣ｱ`,'竺','竺竺') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'軸','軸軸') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'宍','宍宍') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'雫','雫雫') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'七','七七') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､｢','､｢､｢') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､､','､､､､') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｦ','､ｦ､ｦ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｨ','､ｨ､ｨ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'､ｪ','､ｪ､ｪ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾜ','常ﾜ常ﾜ') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾝ','常ﾝ常ﾝ') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾞ','常ﾞ常ﾞ') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常ﾟ','常ﾟ常ﾟ') FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT REPLACE(`｣ﾃ｣ｱ`,'常�','常熄��') FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_replace_utf8.test b/mysql-test/suite/jp/t/jp_replace_utf8.test
new file mode 100755
index 00000000000..1d89a43648b
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_replace_utf8.test
@@ -0,0 +1,128 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test REPLACE() function with Japanese characters in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+
+#InnoDB
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｱ','�ｽｱ�ｽｱ') FROM `�ｼｴ�ｼ疏;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｲ','�ｽｲ�ｽｲ') FROM `�ｼｴ�ｼ疏;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｳ','�ｽｳ�ｽｳ') FROM `�ｼｴ�ｼ疏;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｴ','�ｽｴ�ｽｴ') FROM `�ｼｴ�ｼ疏;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｵ','�ｽｵ�ｽｵ') FROM `�ｼｴ�ｼ疏;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺ゅ≠') FROM `�ｼｴ�ｼ蛋;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺�縺�') FROM `�ｼｴ�ｼ蛋;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺�縺�') FROM `�ｼｴ�ｼ蛋;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺医∴') FROM `�ｼｴ�ｼ蛋;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺翫♀') FROM `�ｼｴ�ｼ蛋;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴秘ｾ�') FROM `�ｼｴ�ｼ伝;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴夜ｾ�') FROM `�ｼｴ�ｼ伝;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴鈴ｾ�') FROM `�ｼｴ�ｼ伝;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴樣ｾ�') FROM `�ｼｴ�ｼ伝;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴｡','鮴｡鮴｡') FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｱ','�ｽｱ�ｽｱ') FROM `�ｼｴ�ｼ覗;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｲ','�ｽｲ�ｽｲ') FROM `�ｼｴ�ｼ覗;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｳ','�ｽｳ�ｽｳ') FROM `�ｼｴ�ｼ覗;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｴ','�ｽｴ�ｽｴ') FROM `�ｼｴ�ｼ覗;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｵ','�ｽｵ�ｽｵ') FROM `�ｼｴ�ｼ覗;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺ゅ≠') FROM `�ｼｴ�ｼ描;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺�縺�') FROM `�ｼｴ�ｼ描;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺�縺�') FROM `�ｼｴ�ｼ描;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺医∴') FROM `�ｼｴ�ｼ描;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺翫♀') FROM `�ｼｴ�ｼ描;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴秘ｾ�') FROM `�ｼｴ�ｼ冒;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴夜ｾ�') FROM `�ｼｴ�ｼ冒;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴鈴ｾ�') FROM `�ｼｴ�ｼ冒;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴樣ｾ�') FROM `�ｼｴ�ｼ冒;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴｡','鮴｡鮴｡') FROM `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｱ','�ｽｱ�ｽｱ') FROM `�ｼｴ�ｼ輿;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｲ','�ｽｲ�ｽｲ') FROM `�ｼｴ�ｼ輿;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｳ','�ｽｳ�ｽｳ') FROM `�ｼｴ�ｼ輿;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｴ','�ｽｴ�ｽｴ') FROM `�ｼｴ�ｼ輿;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｵ','�ｽｵ�ｽｵ') FROM `�ｼｴ�ｼ輿;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺ゅ≠') FROM `�ｼｴ�ｼ倭;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺�縺�') FROM `�ｼｴ�ｼ倭;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺�縺�') FROM `�ｼｴ�ｼ倭;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺医∴') FROM `�ｼｴ�ｼ倭;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺翫♀') FROM `�ｼｴ�ｼ倭;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴秘ｾ�') FROM `�ｼｴ�ｼ兪;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴夜ｾ�') FROM `�ｼｴ�ｼ兪;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴鈴ｾ�') FROM `�ｼｴ�ｼ兪;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴樣ｾ�') FROM `�ｼｴ�ｼ兪;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴｡','鮴｡鮴｡') FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｱ','�ｽｱ�ｽｱ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｲ','�ｽｲ�ｽｲ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｳ','�ｽｳ�ｽｳ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｴ','�ｽｴ�ｽｴ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'�ｽｵ','�ｽｵ�ｽｵ') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺ゅ≠') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺�縺�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺�縺�') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺医∴') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'縺�','縺翫♀') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴秘ｾ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴夜ｾ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴鈴ｾ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴�','鮴樣ｾ�') FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT REPLACE(`�ｼ｣�ｼ疏,'鮴｡','鮴｡鮴｡') FROM `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_reverse_sjis.test b/mysql-test/suite/jp/t/jp_reverse_sjis.test
new file mode 100755
index 00000000000..c1e2b2a17ca
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_reverse_sjis.test
@@ -0,0 +1,81 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test REVERSE() function with Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ２` VALUES ('あいうえお');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ５` VALUES ('あいうえお');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ８` VALUES ('あいうえお');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構');
+
+#InnoDB
+SELECT REVERSE(`Ｃ１`) FROM `Ｔ１`;
+SELECT REVERSE(`Ｃ１`) FROM `Ｔ２`;
+SELECT REVERSE(`Ｃ１`) FROM `Ｔ３`;
+
+#MyISAM
+SELECT REVERSE(`Ｃ１`) FROM `Ｔ４`;
+SELECT REVERSE(`Ｃ１`) FROM `Ｔ５`;
+SELECT REVERSE(`Ｃ１`) FROM `Ｔ６`;
+
+#HEAP
+SELECT REVERSE(`Ｃ１`) FROM `Ｔ７`;
+SELECT REVERSE(`Ｃ１`) FROM `Ｔ８`;
+SELECT REVERSE(`Ｃ１`) FROM `Ｔ９`;
+
+#BDB
+SELECT REVERSE(`Ｃ１`) FROM `Ｔ１０`;
+SELECT REVERSE(`Ｃ１`) FROM `Ｔ１１`;
+SELECT REVERSE(`Ｃ１`) FROM `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_reverse_ucs2.test b/mysql-test/suite/jp/t/jp_reverse_ucs2.test
new file mode 100755
index 00000000000..d91ec7f70e8
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_reverse_ucs2.test
@@ -0,0 +1,83 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test REVERSE() function with Japanese characters in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+#InnoDB
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_reverse_ujis.test b/mysql-test/suite/jp/t/jp_reverse_ujis.test
new file mode 100755
index 00000000000..d37d363f59a
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_reverse_ujis.test
@@ -0,0 +1,82 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test REVERSE() function with Japanese characters in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+#InnoDB
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT REVERSE(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_reverse_utf8.test b/mysql-test/suite/jp/t/jp_reverse_utf8.test
new file mode 100755
index 00000000000..4e53d4be049
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_reverse_utf8.test
@@ -0,0 +1,80 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test REVERSE() function with Japanese characters in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+
+#InnoDB
+SELECT REVERSE(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ疏;
+SELECT REVERSE(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ蛋;
+SELECT REVERSE(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT REVERSE(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ覗;
+SELECT REVERSE(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ描;
+SELECT REVERSE(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT REVERSE(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ輿;
+SELECT REVERSE(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ倭;
+SELECT REVERSE(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT REVERSE(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT REVERSE(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT REVERSE(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_right_sjis.test b/mysql-test/suite/jp/t/jp_right_sjis.test
new file mode 100755
index 00000000000..f481ec532ec
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_right_sjis.test
@@ -0,0 +1,141 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test RIGHT() function with Japanese character in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ５` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+
+#InnoDB
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ２`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ２`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ２`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ２`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ２`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ２`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ３`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ３`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ３`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ３`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ３`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ３`;
+
+#MyISAM
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ４`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ４`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ４`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ４`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ４`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ４`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ５`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ５`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ５`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ５`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ５`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ５`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ６`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ６`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ６`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ６`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ６`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ６`;
+
+#HEAP
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ７`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ７`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ７`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ７`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ７`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ７`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ８`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ８`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ８`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ８`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ８`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ８`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ９`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ９`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ９`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ９`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ９`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ９`;
+
+#BDB
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１０`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１０`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１０`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１０`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１０`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１０`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１１`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１１`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１１`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１１`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１１`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１１`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１２`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１２`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１２`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１２`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１２`;
+SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_right_ucs2.test b/mysql-test/suite/jp/t/jp_right_ucs2.test
new file mode 100755
index 00000000000..23ca2fa4fae
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_right_ucs2.test
@@ -0,0 +1,143 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test RIGHT() function with Japanese character in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_right_ujis.test b/mysql-test/suite/jp/t/jp_right_ujis.test
new file mode 100755
index 00000000000..b5284489c7e
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_right_ujis.test
@@ -0,0 +1,142 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test RIGHT() function with Japanese character in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RIGHT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_right_utf8.test b/mysql-test/suite/jp/t/jp_right_utf8.test
new file mode 100755
index 00000000000..863755c1dcf
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_right_utf8.test
@@ -0,0 +1,140 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test RIGHT() function with Japanese character in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+
+#InnoDB
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, RIGHT(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_rpad_sjis.test b/mysql-test/suite/jp/t/jp_rpad_sjis.test
new file mode 100755
index 00000000000..cc008631548
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_rpad_sjis.test
@@ -0,0 +1,81 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test RPAD() function with Japanese character in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ５` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+
+#InnoDB
+SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`;
+SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ２`;
+SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'暴') FROM `Ｔ３`;
+
+#MyISAM
+SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ４`;
+SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ５`;
+SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'暴' ) FROM `Ｔ６`;
+
+#HEAP
+SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ７`;
+SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ８`;
+SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'暴' ) FROM `Ｔ９`;
+
+#BDB
+SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`;
+SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`;
+SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'暴' ) FROM `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_rpad_ucs2.test b/mysql-test/suite/jp/t/jp_rpad_ucs2.test
new file mode 100755
index 00000000000..ca5059497d3
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_rpad_ucs2.test
@@ -0,0 +1,83 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test RPAD() function with Japanese character in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'床｢') FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'床｢' ) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'床｢' ) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'床｢' ) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_rpad_ujis.test b/mysql-test/suite/jp/t/jp_rpad_ujis.test
new file mode 100755
index 00000000000..d7725b80af7
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_rpad_ujis.test
@@ -0,0 +1,82 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test RPAD() function with Japanese character in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'床｢') FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'床｢' ) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'床｢' ) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'治') FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'｣ﾘ') FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, RPAD(`｣ﾃ｣ｱ`,5,'床｢' ) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_rpad_utf8.test b/mysql-test/suite/jp/t/jp_rpad_utf8.test
new file mode 100755
index 00000000000..b5a335bc6ce
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_rpad_utf8.test
@@ -0,0 +1,80 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test RPAD() function with Japanese character in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+
+#InnoDB
+SELECT `�ｼ｣�ｼ疏, RPAD(`�ｼ｣�ｼ疏,5,'�ｽ｡') FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RPAD(`�ｼ｣�ｼ疏,5,'�ｼｸ') FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, RPAD(`�ｼ｣�ｼ疏,5,'荳�') FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT `�ｼ｣�ｼ疏, RPAD(`�ｼ｣�ｼ疏,5,'�ｽ｡') FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, RPAD(`�ｼ｣�ｼ疏,5,'�ｼｸ') FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, RPAD(`�ｼ｣�ｼ疏,5,'荳�' ) FROM `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT `�ｼ｣�ｼ疏, RPAD(`�ｼ｣�ｼ疏,5,'�ｽ｡') FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, RPAD(`�ｼ｣�ｼ疏,5,'�ｼｸ') FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, RPAD(`�ｼ｣�ｼ疏,5,'荳�' ) FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT `�ｼ｣�ｼ疏, RPAD(`�ｼ｣�ｼ疏,5,'�ｽ｡') FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, RPAD(`�ｼ｣�ｼ疏,5,'�ｼｸ') FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, RPAD(`�ｼ｣�ｼ疏,5,'荳�' ) FROM `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_rtrim_sjis.test b/mysql-test/suite/jp/t/jp_rtrim_sjis.test
new file mode 100755
index 00000000000..c80cf9410f9
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_rtrim_sjis.test
@@ -0,0 +1,163 @@
+--character_set sjis
+--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 `Ｔ１０`;
+--enable_warnings
+
+#
+# Test RTRIM() function with Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ ');
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ  ');
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ　');
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ　　');
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ　　　');
+INSERT INTO `Ｔ２` VALUES ('あいうえお');
+INSERT INTO `Ｔ２` VALUES ('あいうえお ');
+INSERT INTO `Ｔ２` VALUES ('あいうえお  ');
+INSERT INTO `Ｔ２` VALUES ('あいうえお   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ２` VALUES ('あいうえお　');
+INSERT INTO `Ｔ２` VALUES ('あいうえお　　');
+INSERT INTO `Ｔ２` VALUES ('あいうえお　　　');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構 ');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構  ');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構　');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構　　');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構　　　');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ ');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ  ');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ　');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ　　');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ　　　');
+INSERT INTO `Ｔ５` VALUES ('あいうえお');
+INSERT INTO `Ｔ５` VALUES ('あいうえお ');
+INSERT INTO `Ｔ５` VALUES ('あいうえお  ');
+INSERT INTO `Ｔ５` VALUES ('あいうえお   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ５` VALUES ('あいうえお　');
+INSERT INTO `Ｔ５` VALUES ('あいうえお　　');
+INSERT INTO `Ｔ５` VALUES ('あいうえお　　　');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構 ');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構  ');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構　');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構　　');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構　　　');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ ');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ  ');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ　');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ　　');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ　　　');
+INSERT INTO `Ｔ８` VALUES ('あいうえお');
+INSERT INTO `Ｔ８` VALUES ('あいうえお ');
+INSERT INTO `Ｔ８` VALUES ('あいうえお  ');
+INSERT INTO `Ｔ８` VALUES ('あいうえお   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ８` VALUES ('あいうえお　');
+INSERT INTO `Ｔ８` VALUES ('あいうえお　　');
+INSERT INTO `Ｔ８` VALUES ('あいうえお　　　');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構 ');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構  ');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構　');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構　　');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構　　　');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ ');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ  ');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　　');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお ');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお  ');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ１１` VALUES ('あいうえお　');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお　　');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお　　　');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構 ');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構  ');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構　');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構　　');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構　　　');
+
+#InnoDB
+SELECT RTRIM(`Ｃ１`) from `Ｔ１`;
+SELECT RTRIM(`Ｃ１`) from `Ｔ２`;
+SELECT RTRIM(`Ｃ１`) from `Ｔ３`;
+
+#MyISAM
+SELECT RTRIM(`Ｃ１`) from `Ｔ４`;
+SELECT RTRIM(`Ｃ１`) from `Ｔ５`;
+SELECT RTRIM(`Ｃ１`) from `Ｔ６`;
+
+#HEAP
+SELECT RTRIM(`Ｃ１`) from `Ｔ７`;
+SELECT RTRIM(`Ｃ１`) from `Ｔ８`;
+SELECT RTRIM(`Ｃ１`) from `Ｔ９`;
+
+#BDB
+SELECT RTRIM(`Ｃ１`) from `Ｔ１０`;
+SELECT RTRIM(`Ｃ１`) from `Ｔ１１`;
+SELECT RTRIM(`Ｃ１`) from `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_rtrim_ucs2.test b/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
new file mode 100755
index 00000000000..0fac38d12d1
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
@@ -0,0 +1,165 @@
+--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 `｣ﾔ｣ｱ｣ｰ`;
+--enable_warnings
+
+#
+# Test RTRIM() function with Japanese characters in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七 ');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七  ');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七｡｡');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ  ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常� ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�  ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七 ');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七  ');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七｡｡');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ  ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常� ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�  ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七 ');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七  ');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七｡｡');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ  ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常� ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�  ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七 ');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七  ');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ  ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常� ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�  ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡｡｡');
+
+#InnoDB
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_rtrim_ujis.test b/mysql-test/suite/jp/t/jp_rtrim_ujis.test
new file mode 100755
index 00000000000..46cda84dd55
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_rtrim_ujis.test
@@ -0,0 +1,164 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｰ`;
+--enable_warnings
+
+#
+# Test RTRIM() function with Japanese characters in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(8), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七 ');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七  ');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七｡｡');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ  ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常� ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�  ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七 ');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七  ');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七｡｡');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ  ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常� ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�  ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七 ');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七  ');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七｡｡');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ  ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常� ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�  ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七 ');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七  ');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ  ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ｡｡｡｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常� ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�  ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常爍｡｡｡｡｡');
+
+#InnoDB
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｲ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｴ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｵ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｷ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｸ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｰ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｱ`;
+SELECT RTRIM(`｣ﾃ｣ｱ`) from `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_rtrim_utf8.test b/mysql-test/suite/jp/t/jp_rtrim_utf8.test
new file mode 100755
index 00000000000..4880a42db3e
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_rtrim_utf8.test
@@ -0,0 +1,162 @@
+--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 `�ｼｴ�ｼ托ｼ秦;
+--enable_warnings
+
+#
+# Test RTRIM() function with Japanese characters in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(8), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ ');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ  ');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ縲�');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ縲�縲�');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ縲�縲�縲�');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀ ');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀  ');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀縲�');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀縲�縲�');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀縲�縲�縲�');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡ ');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡  ');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡縲�');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡縲�縲�');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡縲�縲�縲�');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ  ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ縲�');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ縲�縲�');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ縲�縲�縲�');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀ ');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀  ');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀縲�');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀縲�縲�');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀縲�縲�縲�');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡ ');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡  ');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡縲�');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡縲�縲�');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡縲�縲�縲�');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ  ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ縲�');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ縲�縲�');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ縲�縲�縲�');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀ ');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀  ');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀縲�');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀縲�縲�');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀縲�縲�縲�');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡ ');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡  ');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡縲�');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡縲�縲�');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡縲�縲�縲�');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ  ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ縲�');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ縲�縲�');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ縲�縲�縲�');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀ ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀  ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀縲�');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀縲�縲�');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀縲�縲�縲�');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡ ');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡  ');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡   ');
+# Double byte spaces are not supposed to be trimed
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡縲�');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡縲�縲�');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡縲�縲�縲�');
+
+#InnoDB
+SELECT RTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ疏;
+SELECT RTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ蛋;
+SELECT RTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT RTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ覗;
+SELECT RTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ描;
+SELECT RTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT RTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ輿;
+SELECT RTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ倭;
+SELECT RTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT RTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ秦;
+SELECT RTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ疏;
+SELECT RTRIM(`�ｼ｣�ｼ疏) from `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_select_sjis.test b/mysql-test/suite/jp/t/jp_select_sjis.test
new file mode 100755
index 00000000000..d84ed7a4b2c
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_select_sjis.test
@@ -0,0 +1,83 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test Displaying Japanese charact in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ２`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ３`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ４`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ５`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ６`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ７`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ８`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ９`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１０`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ１１`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ１２`;
+
+#InnoDB
+SELECT * FROM `Ｔ１`;
+SELECT * FROM `Ｔ２`;
+SELECT * FROM `Ｔ３`;
+#MyISAM
+SELECT * FROM `Ｔ４`;
+SELECT * FROM `Ｔ５`;
+SELECT * FROM `Ｔ６`;
+#Heap
+SELECT * FROM `Ｔ７`;
+SELECT * FROM `Ｔ８`;
+SELECT * FROM `Ｔ９`;
+#BDB
+SELECT * FROM `Ｔ１０`;
+SELECT * FROM `Ｔ１１`;
+SELECT * FROM `Ｔ１２`;
+
+drop table `Ｔ１`;
+drop table `Ｔ２`;
+drop table `Ｔ３`;
+drop table `Ｔ４`;
+drop table `Ｔ５`;
+drop table `Ｔ６`;
+drop table `Ｔ７`;
+drop table `Ｔ８`;
+drop table `Ｔ９`;
+drop table `Ｔ１０`;
+drop table `Ｔ１１`;
+drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_select_ucs2.test b/mysql-test/suite/jp/t/jp_select_ucs2.test
new file mode 100755
index 00000000000..2e4602e7ea4
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_select_ucs2.test
@@ -0,0 +1,172 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test Displaying Japanese charact in ucs2 encoding 
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+#INSERT the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｲ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｳ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｴ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｵ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｶ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｷ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｸ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｹ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+#InnoDB
+SELECT * FROM `｣ﾔ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｲ`;
+SELECT * FROM `｣ﾔ｣ｳ`;
+#MyISAM
+SELECT * FROM `｣ﾔ｣ｴ`;
+SELECT * FROM `｣ﾔ｣ｵ`;
+SELECT * FROM `｣ﾔ｣ｶ`;
+#Heap
+SELECT * FROM `｣ﾔ｣ｷ`;
+SELECT * FROM `｣ﾔ｣ｸ`;
+SELECT * FROM `｣ﾔ｣ｹ`;
+#BDB
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ`;
+
+drop table `｣ﾔ｣ｱ`;
+drop table `｣ﾔ｣ｲ`;
+drop table `｣ﾔ｣ｳ`;
+drop table `｣ﾔ｣ｴ`;
+drop table `｣ﾔ｣ｵ`;
+drop table `｣ﾔ｣ｶ`;
+drop table `｣ﾔ｣ｷ`;
+drop table `｣ﾔ｣ｸ`;
+drop table `｣ﾔ｣ｹ`;
+drop table `｣ﾔ｣ｱ｣ｰ`;
+drop table `｣ﾔ｣ｱ｣ｱ`;
+drop table `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_select_ujis.test b/mysql-test/suite/jp/t/jp_select_ujis.test
new file mode 100755
index 00000000000..4ad9e581a92
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_select_ujis.test
@@ -0,0 +1,84 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test Displaying Japanese charact in ujis encoding 
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｱ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｲ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｳ`; 
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｴ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｵ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｶ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｷ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｸ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｹ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｰ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｱ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｲ`;
+
+#InnoDB
+SELECT * FROM `｣ﾔ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｲ`;
+SELECT * FROM `｣ﾔ｣ｳ`;
+#MyISAM
+SELECT * FROM `｣ﾔ｣ｴ`;
+SELECT * FROM `｣ﾔ｣ｵ`;
+SELECT * FROM `｣ﾔ｣ｶ`;
+#Heap
+SELECT * FROM `｣ﾔ｣ｷ`;
+SELECT * FROM `｣ﾔ｣ｸ`;
+SELECT * FROM `｣ﾔ｣ｹ`;
+#BDB
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ`;
+
+drop table `｣ﾔ｣ｱ`;
+drop table `｣ﾔ｣ｲ`;
+drop table `｣ﾔ｣ｳ`;
+drop table `｣ﾔ｣ｴ`;
+drop table `｣ﾔ｣ｵ`;
+drop table `｣ﾔ｣ｶ`;
+drop table `｣ﾔ｣ｷ`;
+drop table `｣ﾔ｣ｸ`;
+drop table `｣ﾔ｣ｹ`;
+drop table `｣ﾔ｣ｱ｣ｰ`;
+drop table `｣ﾔ｣ｱ｣ｱ`;
+drop table `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_select_utf8.test b/mysql-test/suite/jp/t/jp_select_utf8.test
new file mode 100755
index 00000000000..e614b9ccfb0
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_select_utf8.test
@@ -0,0 +1,82 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test Displaying Japanese charact in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ疏;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ蛋;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ伝;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ覗;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ描;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ冒;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ輿;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ倭;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ兪;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ秦;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ疏;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ蛋;
+
+#InnoDB
+SELECT * FROM `�ｼｴ�ｼ疏;
+SELECT * FROM `�ｼｴ�ｼ蛋;
+SELECT * FROM `�ｼｴ�ｼ伝;
+#MyISAM
+SELECT * FROM `�ｼｴ�ｼ覗;
+SELECT * FROM `�ｼｴ�ｼ描;
+SELECT * FROM `�ｼｴ�ｼ冒;
+#Heap
+SELECT * FROM `�ｼｴ�ｼ輿;
+SELECT * FROM `�ｼｴ�ｼ倭;
+SELECT * FROM `�ｼｴ�ｼ兪;
+#BDB
+SELECT * FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT * FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT * FROM `�ｼｴ�ｼ托ｼ蛋;
+
+drop table `�ｼｴ�ｼ疏;
+drop table `�ｼｴ�ｼ蛋;
+drop table `�ｼｴ�ｼ伝;
+drop table `�ｼｴ�ｼ覗;
+drop table `�ｼｴ�ｼ描;
+drop table `�ｼｴ�ｼ冒;
+drop table `�ｼｴ�ｼ輿;
+drop table `�ｼｴ�ｼ倭;
+drop table `�ｼｴ�ｼ兪;
+drop table `�ｼｴ�ｼ托ｼ秦;
+drop table `�ｼｴ�ｼ托ｼ疏;
+drop table `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_subquery_sjis.test b/mysql-test/suite/jp/t/jp_subquery_sjis.test
new file mode 100755
index 00000000000..5292c7a2519
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_subquery_sjis.test
@@ -0,0 +1,140 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test subquery using Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+
+#insert the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+INSERT INTO `Ｔ１a` VALUES ('ｱ'),('ｶ'),('ｻ');
+INSERT INTO `Ｔ１b` VALUES ('ｱ');
+INSERT INTO `Ｔ２a` VALUES ('あ'),('か'),('さ');
+INSERT INTO `Ｔ２b` VALUES ('あ');
+INSERT INTO `Ｔ３a` VALUES ('ソ'),('十'),('表');
+INSERT INTO `Ｔ３b` VALUES ('ソ');
+INSERT INTO `Ｔ４a` VALUES ('ｱ'),('ｶ'),('ｻ');
+INSERT INTO `Ｔ４b` VALUES ('ｱ');
+INSERT INTO `Ｔ５a` VALUES ('あ'),('か'),('さ');
+INSERT INTO `Ｔ５b` VALUES ('あ');
+INSERT INTO `Ｔ６a` VALUES ('ソ'),('十'),('表');
+INSERT INTO `Ｔ６b` VALUES ('ソ');
+INSERT INTO `Ｔ７a` VALUES ('ｱ'),('ｶ'),('ｻ');
+INSERT INTO `Ｔ７b` VALUES ('ｱ');
+INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ');
+INSERT INTO `Ｔ８b` VALUES ('あ');
+INSERT INTO `Ｔ９a` VALUES ('ソ'),('十'),('表');
+INSERT INTO `Ｔ９b` VALUES ('ソ');
+INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ');
+INSERT INTO `Ｔ１０b` VALUES ('ｱ');
+INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ');
+INSERT INTO `Ｔ１１b` VALUES ('あ');
+INSERT INTO `Ｔ１２a` VALUES ('ソ'),('十'),('表');
+INSERT INTO `Ｔ１２b` VALUES ('ソ');
+
+#Test for innodb
+SELECT `Ｃ１` FROM `Ｔ１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１b`);
+SELECT `Ｃ１` FROM `Ｔ１a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１b` WHERE `Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ１a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１b` WHERE `Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ２a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ２b`);
+SELECT `Ｃ１` FROM `Ｔ２a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ２b` WHERE `Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ２a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ２b` WHERE `Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ３a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ３b`);
+SELECT `Ｃ１` FROM `Ｔ３a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ３b` WHERE `Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ３a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ３b` WHERE `Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ４a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ４b`);
+SELECT `Ｃ１` FROM `Ｔ４a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ４b` WHERE `Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ４a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ４b` WHERE `Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ５a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ５b`);
+SELECT `Ｃ１` FROM `Ｔ５a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ５b` WHERE `Ｔ５a`.`Ｃ１` = `Ｔ５b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ５a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ５b` WHERE `Ｔ５a`.`Ｃ１` = `Ｔ５b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ６a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ６b`);
+SELECT `Ｃ１` FROM `Ｔ６a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ６b` WHERE `Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ６a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ６b` WHERE `Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ７a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ７b`);
+SELECT `Ｃ１` FROM `Ｔ７a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ７b` WHERE `Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ７a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ７b` WHERE `Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ８a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ８b`);
+SELECT `Ｃ１` FROM `Ｔ８a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ８b` WHERE `Ｔ８a`.`Ｃ１` = `Ｔ８b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ８a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ８b` WHERE `Ｔ８a`.`Ｃ１` = `Ｔ８b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ９a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ９b`);
+SELECT `Ｃ１` FROM `Ｔ９a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ９b` WHERE `Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ９a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ９b` WHERE `Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ１０a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１０b`);
+SELECT `Ｃ１` FROM `Ｔ１０a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ１０a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ１１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１１b`);
+SELECT `Ｃ１` FROM `Ｔ１１a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ１１a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ１２a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１２b`);
+SELECT `Ｃ１` FROM `Ｔ１２a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
+SELECT `Ｃ１` FROM `Ｔ１２a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
+
+DROP TABLE `Ｔ１a`;
+DROP TABLE `Ｔ１b`;
+DROP TABLE `Ｔ２a`;
+DROP TABLE `Ｔ２b`;
+DROP TABLE `Ｔ３a`;
+DROP TABLE `Ｔ３b`;
+DROP TABLE `Ｔ４a`;
+DROP TABLE `Ｔ４b`;
+DROP TABLE `Ｔ５a`;
+DROP TABLE `Ｔ５b`;
+DROP TABLE `Ｔ６a`;
+DROP TABLE `Ｔ６b`;
+DROP TABLE `Ｔ７a`;
+DROP TABLE `Ｔ７b`;
+DROP TABLE `Ｔ８a`;
+DROP TABLE `Ｔ８b`;
+DROP TABLE `Ｔ９a`;
+DROP TABLE `Ｔ９b`;
+DROP TABLE `Ｔ１０a`;
+DROP TABLE `Ｔ１０b`;
+DROP TABLE `Ｔ１１a`;
+DROP TABLE `Ｔ１１b`;
+DROP TABLE `Ｔ１２a`;
+DROP TABLE `Ｔ１２b`;
diff --git a/mysql-test/suite/jp/t/jp_subquery_utf8.test b/mysql-test/suite/jp/t/jp_subquery_utf8.test
new file mode 100755
index 00000000000..97c2df8ce30
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_subquery_utf8.test
@@ -0,0 +1,139 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test subquery using Japanese characters in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疎` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ礎` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ誕` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ鍛` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ殿` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ澱` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蚤` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ巴` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ病` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ秒` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ紡` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ肪` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ預` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ傭` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ和` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ話` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兮` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ冀` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ紳` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ臣` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疎` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ礎` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ誕` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ鍛` (`�ｼ｣�ｼ疏 char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+
+#insert the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+INSERT INTO `�ｼｴ�ｼ疎` VALUES ('�ｽｱ'),('�ｽｶ'),('�ｽｻ');
+INSERT INTO `�ｼｴ�ｼ礎` VALUES ('�ｽｱ');
+INSERT INTO `�ｼｴ�ｼ誕` VALUES ('縺�'),('縺�'),('縺�');
+INSERT INTO `�ｼｴ�ｼ鍛` VALUES ('縺�');
+INSERT INTO `�ｼｴ�ｼ殿` VALUES ('鮴�'),('鮴�'),('鮴�');
+INSERT INTO `�ｼｴ�ｼ澱` VALUES ('鮴�');
+INSERT INTO `�ｼｴ�ｼ蚤` VALUES ('�ｽｱ'),('�ｽｶ'),('�ｽｻ');
+INSERT INTO `�ｼｴ�ｼ巴` VALUES ('�ｽｱ');
+INSERT INTO `�ｼｴ�ｼ病` VALUES ('縺�'),('縺�'),('縺�');
+INSERT INTO `�ｼｴ�ｼ秒` VALUES ('縺�');
+INSERT INTO `�ｼｴ�ｼ紡` VALUES ('鮴�'),('鮴�'),('鮴�');
+INSERT INTO `�ｼｴ�ｼ肪` VALUES ('鮴�');
+INSERT INTO `�ｼｴ�ｼ預` VALUES ('�ｽｱ'),('�ｽｶ'),('�ｽｻ');
+INSERT INTO `�ｼｴ�ｼ傭` VALUES ('�ｽｱ');
+INSERT INTO `�ｼｴ�ｼ和` VALUES ('縺�'),('縺�'),('縺�');
+INSERT INTO `�ｼｴ�ｼ話` VALUES ('縺�');
+INSERT INTO `�ｼｴ�ｼ兮` VALUES ('鮴�'),('鮴�'),('鮴�');
+INSERT INTO `�ｼｴ�ｼ冀` VALUES ('鮴�');
+INSERT INTO `�ｼｴ�ｼ托ｼ紳` VALUES ('�ｽｱ'),('�ｽｶ'),('�ｽｻ');
+INSERT INTO `�ｼｴ�ｼ托ｼ臣` VALUES ('�ｽｱ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疎` VALUES ('縺�'),('縺�'),('縺�');
+INSERT INTO `�ｼｴ�ｼ托ｼ礎` VALUES ('縺�');
+INSERT INTO `�ｼｴ�ｼ托ｼ誕` VALUES ('鮴�'),('鮴�'),('鮴�');
+INSERT INTO `�ｼｴ�ｼ托ｼ鍛` VALUES ('鮴�');
+
+#Test for innodb
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ疎` WHERE `�ｼ｣�ｼ疏 IN (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ礎`);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ疎` WHERE EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ礎` WHERE `�ｼｴ�ｼ疎`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ礎`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ疎` WHERE NOT EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ礎` WHERE `�ｼｴ�ｼ疎`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ礎`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ誕` WHERE `�ｼ｣�ｼ疏 IN (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ鍛`);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ誕` WHERE EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ鍛` WHERE `�ｼｴ�ｼ誕`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ鍛`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ誕` WHERE NOT EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ鍛` WHERE `�ｼｴ�ｼ誕`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ鍛`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ殿` WHERE `�ｼ｣�ｼ疏 IN (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ澱`);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ殿` WHERE EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ澱` WHERE `�ｼｴ�ｼ殿`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ澱`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ殿` WHERE NOT EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ澱` WHERE `�ｼｴ�ｼ殿`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ澱`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ蚤` WHERE `�ｼ｣�ｼ疏 IN (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ巴`);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ蚤` WHERE EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ巴` WHERE `�ｼｴ�ｼ蚤`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ巴`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ蚤` WHERE NOT EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ巴` WHERE `�ｼｴ�ｼ蚤`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ巴`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ病` WHERE `�ｼ｣�ｼ疏 IN (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ秒`);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ病` WHERE EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ秒` WHERE `�ｼｴ�ｼ病`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ秒`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ病` WHERE NOT EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ秒` WHERE `�ｼｴ�ｼ病`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ秒`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ紡` WHERE `�ｼ｣�ｼ疏 IN (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ肪`);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ紡` WHERE EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ肪` WHERE `�ｼｴ�ｼ紡`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ肪`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ紡` WHERE NOT EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ肪` WHERE `�ｼｴ�ｼ紡`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ肪`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ預` WHERE `�ｼ｣�ｼ疏 IN (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ傭`);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ預` WHERE EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ傭` WHERE `�ｼｴ�ｼ預`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ傭`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ預` WHERE NOT EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ傭` WHERE `�ｼｴ�ｼ預`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ傭`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ和` WHERE `�ｼ｣�ｼ疏 IN (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ話`);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ和` WHERE EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ話` WHERE `�ｼｴ�ｼ和`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ話`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ和` WHERE NOT EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ話` WHERE `�ｼｴ�ｼ和`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ話`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ兮` WHERE `�ｼ｣�ｼ疏 IN (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ冀`);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ兮` WHERE EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ冀` WHERE `�ｼｴ�ｼ兮`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ冀`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ兮` WHERE NOT EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ冀` WHERE `�ｼｴ�ｼ兮`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ冀`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ紳` WHERE `�ｼ｣�ｼ疏 IN (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ臣`);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ紳` WHERE EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ臣` WHERE `�ｼｴ�ｼ托ｼ紳`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ托ｼ臣`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ紳` WHERE NOT EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ臣` WHERE `�ｼｴ�ｼ托ｼ紳`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ托ｼ臣`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ疎` WHERE `�ｼ｣�ｼ疏 IN (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ礎`);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ疎` WHERE EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ礎` WHERE `�ｼｴ�ｼ托ｼ疎`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ托ｼ礎`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ疎` WHERE NOT EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ礎` WHERE `�ｼｴ�ｼ托ｼ疎`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ托ｼ礎`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ誕` WHERE `�ｼ｣�ｼ疏 IN (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ鍛`);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ誕` WHERE EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ鍛` WHERE `�ｼｴ�ｼ托ｼ誕`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ托ｼ鍛`.`�ｼ｣�ｼ疏);
+SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ誕` WHERE NOT EXISTS (SELECT `�ｼ｣�ｼ疏 FROM `�ｼｴ�ｼ托ｼ鍛` WHERE `�ｼｴ�ｼ托ｼ誕`.`�ｼ｣�ｼ疏 = `�ｼｴ�ｼ托ｼ鍛`.`�ｼ｣�ｼ疏);
+
+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 `�ｼｴ�ｼ和`;
+DROP TABLE `�ｼｴ�ｼ話`;
+DROP TABLE `�ｼｴ�ｼ兮`;
+DROP TABLE `�ｼｴ�ｼ冀`;
+DROP TABLE `�ｼｴ�ｼ托ｼ紳`;
+DROP TABLE `�ｼｴ�ｼ托ｼ臣`;
+DROP TABLE `�ｼｴ�ｼ托ｼ疎`;
+DROP TABLE `�ｼｴ�ｼ托ｼ礎`;
+DROP TABLE `�ｼｴ�ｼ托ｼ誕`;
+DROP TABLE `�ｼｴ�ｼ托ｼ鍛`;
diff --git a/mysql-test/suite/jp/t/jp_substring_sjis.test b/mysql-test/suite/jp/t/jp_substring_sjis.test
new file mode 100755
index 00000000000..ac929114880
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_substring_sjis.test
@@ -0,0 +1,413 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test SUBSTRING() function with Japanese character in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ５` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+
+#InnoDB
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１`;
+
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ２`;
+
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ３`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ３`;
+
+#MyISAM
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ４`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ４`;
+
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ５`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ５`;
+
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ６`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ６`;
+
+#HEAP
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ７`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ７`;
+
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ８`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ８`;
+
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ９`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ９`;
+
+#BDB
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１０`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１０`;
+
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１１`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１１`;
+
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１２`;
+SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_substring_ucs2.test b/mysql-test/suite/jp/t/jp_substring_ucs2.test
new file mode 100755
index 00000000000..f3cd5550072
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_substring_ucs2.test
@@ -0,0 +1,418 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test SUBSTRING() function with Japanese character in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+# Test of SUBSTRING(str,pos) and SUBSTRING(str FROM pos)
+# is not available until the bug #5364 is fixed
+
+#InnoDB
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｱ`;
+
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｲ`;
+
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｳ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｴ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｴ`;
+
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｵ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｵ`;
+
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｶ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｷ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｷ`;
+
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｸ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｸ`;
+
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｹ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｱ｣ｰ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｱ｣ｰ`;
+
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｱ｣ｱ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｱ｣ｱ`;
+
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｱ｣ｲ`;
+#SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_substring_ujis.test b/mysql-test/suite/jp/t/jp_substring_ujis.test
new file mode 100755
index 00000000000..c201c7148da
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_substring_ujis.test
@@ -0,0 +1,414 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test SUBSTRING() function with Japanese character in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七'),('竺軸宍雫'),('竺軸宍'),('竺軸'),('竺'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ'),('､｢､､､ｦ､ｨ'),('､｢､､､ｦ'),('､｢､､'),('､｢'),('');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�'),('常ﾜ常ﾝ常ﾞ常ﾟ'),('常ﾜ常ﾝ常ﾞ'),('常ﾜ常ﾝ'),('常ﾜ'),('');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｱ`;
+
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｲ`;
+
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｴ`;
+
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｵ`;
+
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｷ`;
+
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｸ`;
+
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｱ｣ｰ`;
+
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｱ｣ｱ`;
+
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,0) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,2) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,3) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,4) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,6) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 0) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 2) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 3) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 4) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 5) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 6) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,0) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,1) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,2) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,3) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,4) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,5) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ`,1,6) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 0) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 1) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 2) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 3) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 4) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 5) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`, SUBSTRING(`｣ﾃ｣ｱ` FROM 1 FOR 6) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_substring_utf8.test b/mysql-test/suite/jp/t/jp_substring_utf8.test
new file mode 100755
index 00000000000..9f88115c899
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_substring_utf8.test
@@ -0,0 +1,412 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test SUBSTRING() function with Japanese character in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ'),('�ｽｱ�ｽｲ�ｽｳ�ｽｴ'),('�ｽｱ�ｽｲ�ｽｳ'),('�ｽｱ�ｽｲ'),('�ｽｱ'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀'),('縺ゅ＞縺�縺�'),('縺ゅ＞縺�'),('縺ゅ＞'),('縺�'),('');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡'),('鮴秘ｾ夜ｾ鈴ｾ�'),('鮴秘ｾ夜ｾ�'),('鮴秘ｾ�'),('鮴�'),('');
+
+#InnoDB
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,6) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 0) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 2) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 3) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 4) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 5) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 6) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,0) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,1) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,2) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,3) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,4) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,5) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,6) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 0) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 1) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 2) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 3) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 4) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 5) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 6) FROM `�ｼｴ�ｼ疏;
+
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,6) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 0) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 2) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 3) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 4) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 5) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 6) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,0) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,1) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,2) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,3) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,4) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,5) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,6) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 0) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 1) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 2) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 3) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 4) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 5) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 6) FROM `�ｼｴ�ｼ蛋;
+
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,6) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 0) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 2) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 3) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 4) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 5) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 6) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,0) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,1) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,2) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,3) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,4) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,5) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,6) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 0) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 1) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 2) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 3) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 4) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 5) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 6) FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,6) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 0) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 2) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 3) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 4) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 5) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 6) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,0) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,1) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,2) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,3) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,4) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,5) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,6) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 0) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 1) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 2) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 3) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 4) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 5) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 6) FROM `�ｼｴ�ｼ覗;
+
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,6) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 0) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 2) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 3) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 4) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 5) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 6) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,0) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,1) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,2) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,3) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,4) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,5) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,6) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 0) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 1) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 2) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 3) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 4) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 5) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 6) FROM `�ｼｴ�ｼ描;
+
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,6) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 0) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 2) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 3) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 4) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 5) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 6) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,0) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,1) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,2) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,3) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,4) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,5) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,6) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 0) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 1) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 2) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 3) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 4) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 5) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 6) FROM `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,6) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 0) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 2) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 3) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 4) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 5) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 6) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,0) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,1) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,2) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,3) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,4) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,5) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,6) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 0) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 1) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 2) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 3) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 4) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 5) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 6) FROM `�ｼｴ�ｼ輿;
+
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,6) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 0) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 2) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 3) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 4) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 5) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 6) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,0) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,1) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,2) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,3) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,4) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,5) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,6) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 0) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 1) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 2) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 3) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 4) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 5) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 6) FROM `�ｼｴ�ｼ倭;
+
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,6) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 0) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 2) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 3) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 4) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 5) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 6) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,0) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,1) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,2) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,3) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,4) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,5) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,6) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 0) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 1) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 2) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 3) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 4) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 5) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 6) FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,6) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 0) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 2) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 3) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 4) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 5) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 6) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,0) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,1) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,2) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,3) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,4) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,5) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,6) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 0) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 1) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 2) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 3) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 4) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 5) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 6) FROM `�ｼｴ�ｼ托ｼ秦;
+
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,6) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 0) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 2) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 3) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 4) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 5) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 6) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,0) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,1) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,2) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,3) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,4) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,5) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,6) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 0) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 1) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 2) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 3) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 4) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 5) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 6) FROM `�ｼｴ�ｼ托ｼ疏;
+
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,0) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,2) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,3) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,4) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,5) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,6) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 0) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 2) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 3) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 4) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 5) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 6) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,0) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,1) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,2) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,3) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,4) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,5) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏,1,6) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 0) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 1) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 2) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 3) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 4) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 5) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏, SUBSTRING(`�ｼ｣�ｼ疏 FROM 1 FOR 6) FROM `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_trim_sjis.test b/mysql-test/suite/jp/t/jp_trim_sjis.test
new file mode 100755
index 00000000000..0f6821605ed
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_trim_sjis.test
@@ -0,0 +1,219 @@
+--character_set sjis
+--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 `Ｔ１０`;
+--enable_warnings
+
+#
+# Test TRIM() function with Japanese characters sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+# Nothing to trim
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
+# Test data for TRIM(TRAILING [remstr] FROM str)
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶ');
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶｶ');
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶｶｶ');
+# Test data for TRIM(LEADING [remstr] FROM str)
+INSERT INTO `Ｔ１` VALUES ('ｶｱｲｳｴｵ');
+INSERT INTO `Ｔ１` VALUES ('ｶｶｱｲｳｴｵ');
+INSERT INTO `Ｔ１` VALUES ('ｶｶｶｱｲｳｴｵ');
+# Test data for TRIM(BOTH [remstr] FROM str)
+INSERT INTO `Ｔ１` VALUES ('ｶｶｶｱｲｳｴｵｶｶｶ');
+# Test data for TRIM without [remstr] (remove spaces) 
+INSERT INTO `Ｔ１` VALUES ('   ｱｲｳｴｵ   ');
+INSERT INTO `Ｔ２` VALUES ('あいうえお');
+INSERT INTO `Ｔ２` VALUES ('あいうえおか');
+INSERT INTO `Ｔ２` VALUES ('あいうえおかか');
+INSERT INTO `Ｔ２` VALUES ('あいうえおかかか');
+INSERT INTO `Ｔ２` VALUES ('かあいうえお');
+INSERT INTO `Ｔ２` VALUES ('かかあいうえお');
+INSERT INTO `Ｔ２` VALUES ('かかかあいうえお');
+INSERT INTO `Ｔ２` VALUES ('かかかあいうえおかかか');
+INSERT INTO `Ｔ２` VALUES ('   あいうえお   ');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構暴');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構暴暴');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構暴暴暴');
+INSERT INTO `Ｔ３` VALUES ('暴ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('暴暴ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('暴暴暴ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('暴暴暴ソ十表予構暴暴暴');
+INSERT INTO `Ｔ３` VALUES ('   ソ十表予構   ');
+
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵｶ');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵｶｶ');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵｶｶｶ');
+INSERT INTO `Ｔ４` VALUES ('ｶｱｲｳｴｵ');
+INSERT INTO `Ｔ４` VALUES ('ｶｶｱｲｳｴｵ');
+INSERT INTO `Ｔ４` VALUES ('ｶｶｶｱｲｳｴｵ');
+INSERT INTO `Ｔ４` VALUES ('ｶｶｶｱｲｳｴｵｶｶｶ');
+INSERT INTO `Ｔ４` VALUES ('   ｱｲｳｴｵ   ');
+INSERT INTO `Ｔ５` VALUES ('あいうえお');
+INSERT INTO `Ｔ５` VALUES ('あいうえおか');
+INSERT INTO `Ｔ５` VALUES ('あいうえおかか');
+INSERT INTO `Ｔ５` VALUES ('あいうえおかかか');
+INSERT INTO `Ｔ５` VALUES ('かあいうえお');
+INSERT INTO `Ｔ５` VALUES ('かかあいうえお');
+INSERT INTO `Ｔ５` VALUES ('かかかあいうえお');
+INSERT INTO `Ｔ５` VALUES ('かかかあいうえおかかか');
+INSERT INTO `Ｔ５` VALUES ('   あいうえお   ');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構暴');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構暴暴');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構暴暴暴');
+INSERT INTO `Ｔ６` VALUES ('暴ソ十表予構');
+INSERT INTO `Ｔ６` VALUES ('暴暴ソ十表予構');
+INSERT INTO `Ｔ６` VALUES ('暴暴暴ソ十表予構');
+INSERT INTO `Ｔ６` VALUES ('暴暴暴ソ十表予構暴暴暴');
+INSERT INTO `Ｔ６` VALUES ('   ソ十表予構   ');
+
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵｶ');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵｶｶ');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵｶｶｶ');
+INSERT INTO `Ｔ７` VALUES ('ｶｱｲｳｴｵ');
+INSERT INTO `Ｔ７` VALUES ('ｶｶｱｲｳｴｵ');
+INSERT INTO `Ｔ７` VALUES ('ｶｶｶｱｲｳｴｵ');
+INSERT INTO `Ｔ７` VALUES ('ｶｶｶｱｲｳｴｵｶｶｶ');
+INSERT INTO `Ｔ７` VALUES ('   ｱｲｳｴｵ   ');
+INSERT INTO `Ｔ８` VALUES ('あいうえお');
+INSERT INTO `Ｔ８` VALUES ('あいうえおか');
+INSERT INTO `Ｔ８` VALUES ('あいうえおかか');
+INSERT INTO `Ｔ８` VALUES ('あいうえおかかか');
+INSERT INTO `Ｔ８` VALUES ('かあいうえお');
+INSERT INTO `Ｔ８` VALUES ('かかあいうえお');
+INSERT INTO `Ｔ８` VALUES ('かかかあいうえお');
+INSERT INTO `Ｔ８` VALUES ('かかかあいうえおかかか');
+INSERT INTO `Ｔ８` VALUES ('   あいうえお   ');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構暴');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構暴暴');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構暴暴暴');
+INSERT INTO `Ｔ９` VALUES ('暴ソ十表予構');
+INSERT INTO `Ｔ９` VALUES ('暴暴ソ十表予構');
+INSERT INTO `Ｔ９` VALUES ('暴暴暴ソ十表予構');
+INSERT INTO `Ｔ９` VALUES ('暴暴暴ソ十表予構暴暴暴');
+INSERT INTO `Ｔ９` VALUES ('   ソ十表予構   ');
+
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶ');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶｶ');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶｶｶ');
+INSERT INTO `Ｔ１０` VALUES ('ｶｱｲｳｴｵ');
+INSERT INTO `Ｔ１０` VALUES ('ｶｶｱｲｳｴｵ');
+INSERT INTO `Ｔ１０` VALUES ('ｶｶｶｱｲｳｴｵ');
+INSERT INTO `Ｔ１０` VALUES ('ｶｶｶｱｲｳｴｵｶｶｶ');
+INSERT INTO `Ｔ１０` VALUES ('   ｱｲｳｴｵ   ');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお');
+INSERT INTO `Ｔ１１` VALUES ('あいうえおか');
+INSERT INTO `Ｔ１１` VALUES ('あいうえおかか');
+INSERT INTO `Ｔ１１` VALUES ('あいうえおかかか');
+INSERT INTO `Ｔ１１` VALUES ('かあいうえお');
+INSERT INTO `Ｔ１１` VALUES ('かかあいうえお');
+INSERT INTO `Ｔ１１` VALUES ('かかかあいうえお');
+INSERT INTO `Ｔ１１` VALUES ('かかかあいうえおかかか');
+INSERT INTO `Ｔ１１` VALUES ('   あいうえお   ');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構暴');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構暴暴');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構暴暴暴');
+INSERT INTO `Ｔ１２` VALUES ('暴ソ十表予構');
+INSERT INTO `Ｔ１２` VALUES ('暴暴ソ十表予構');
+INSERT INTO `Ｔ１２` VALUES ('暴暴暴ソ十表予構');
+INSERT INTO `Ｔ１２` VALUES ('暴暴暴ソ十表予構暴暴暴');
+INSERT INTO `Ｔ１２` VALUES ('   ソ十表予構   ');
+
+#InnoDB
+SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;
+SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;
+SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１`;
+SELECT `Ｃ１`,TRIM(TRAILING 'か' FROM `Ｃ１`) FROM `Ｔ２`;
+SELECT `Ｃ１`,TRIM(LEADING 'か' FROM `Ｃ１`) FROM `Ｔ２`;
+SELECT `Ｃ１`,TRIM(BOTH 'か' FROM `Ｃ１`) FROM `Ｔ２`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ２`;
+SELECT `Ｃ１`,TRIM(TRAILING '暴'FROM `Ｃ１`) FROM `Ｔ３`;
+SELECT `Ｃ１`,TRIM(LEADING '暴' FROM `Ｃ１`) FROM `Ｔ３`;
+SELECT `Ｃ１`,TRIM(BOTH '暴' FROM `Ｃ１`) FROM `Ｔ３`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ３`;
+
+#MyISAM
+SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ４`;
+SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ４`;
+SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ４`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ４`;
+SELECT `Ｃ１`,TRIM(TRAILING 'か' FROM `Ｃ１`) FROM `Ｔ５`;
+SELECT `Ｃ１`,TRIM(LEADING 'か' FROM `Ｃ１`) FROM `Ｔ５`;
+SELECT `Ｃ１`,TRIM(BOTH 'か' FROM `Ｃ１`) FROM `Ｔ５`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ５`;
+SELECT `Ｃ１`,TRIM(TRAILING '暴' FROM `Ｃ１`) FROM `Ｔ６`;
+SELECT `Ｃ１`,TRIM(LEADING '暴' FROM `Ｃ１`) FROM `Ｔ６`;
+SELECT `Ｃ１`,TRIM(BOTH '暴' FROM `Ｃ１`) FROM `Ｔ６`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ６`;
+
+#HEAP
+SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ７`;
+SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ７`;
+SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ７`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ７`;
+SELECT `Ｃ１`,TRIM(TRAILING 'か' FROM `Ｃ１`) FROM `Ｔ８`;
+SELECT `Ｃ１`,TRIM(LEADING 'か' FROM `Ｃ１`) FROM `Ｔ８`;
+SELECT `Ｃ１`,TRIM(BOTH 'か' FROM `Ｃ１`) FROM `Ｔ８`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ８`;
+SELECT `Ｃ１`,TRIM(TRAILING '暴' FROM `Ｃ１`) FROM `Ｔ９`;
+SELECT `Ｃ１`,TRIM(LEADING '暴' FROM `Ｃ１`) FROM `Ｔ９`;
+SELECT `Ｃ１`,TRIM(BOTH '暴' FROM `Ｃ１`) FROM `Ｔ９`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ９`;
+
+#BDB
+SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
+SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
+SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１０`;
+SELECT `Ｃ１`,TRIM(TRAILING 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
+SELECT `Ｃ１`,TRIM(LEADING 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
+SELECT `Ｃ１`,TRIM(BOTH 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１１`;
+SELECT `Ｃ１`,TRIM(TRAILING '暴' FROM `Ｃ１`) FROM `Ｔ１２`;
+SELECT `Ｃ１`,TRIM(LEADING '暴' FROM `Ｃ１`) FROM `Ｔ１２`;
+SELECT `Ｃ１`,TRIM(BOTH '暴' FROM `Ｃ１`) FROM `Ｔ１２`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_trim_ucs2.test b/mysql-test/suite/jp/t/jp_trim_ucs2.test
new file mode 100755
index 00000000000..1d8a12650e0
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_trim_ucs2.test
@@ -0,0 +1,221 @@
+--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 `｣ﾔ｣ｱ｣ｰ`;
+--enable_warnings
+
+#
+# Test TRIM() function with Japanese characters ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+# Nothing to trim
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+# Test data for TRIM(TRAILING [remstr] FROM str)
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七叱');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七叱叱');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七叱叱叱');
+# Test data for TRIM(LEADING [remstr] FROM str)
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('叱叱叱竺軸宍雫七');
+# Test data for TRIM(BOTH [remstr] FROM str)
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('叱叱叱竺軸宍雫七叱叱叱');
+# Test data for TRIM without [remstr] (remove spaces) 
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('   竺軸宍雫七   ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ   ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七叱');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七叱叱');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七叱叱叱');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('叱叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('叱叱叱竺軸宍雫七叱叱叱');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('   竺軸宍雫七   ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ   ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七叱');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七叱叱');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七叱叱叱');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('叱叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('叱叱叱竺軸宍雫七叱叱叱');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('   竺軸宍雫七   ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ   ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七叱');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七叱叱');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七叱叱叱');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('叱叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('叱叱叱竺軸宍雫七叱叱叱');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('   竺軸宍雫七   ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ   ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '床｡'FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_trim_ujis.test b/mysql-test/suite/jp/t/jp_trim_ujis.test
new file mode 100755
index 00000000000..de401217fcf
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_trim_ujis.test
@@ -0,0 +1,220 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｰ`;
+--enable_warnings
+
+#
+# Test TRIM() function with Japanese characters ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(12), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+# Nothing to trim
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+# Test data for TRIM(TRAILING [remstr] FROM str)
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七叱');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七叱叱');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七叱叱叱');
+# Test data for TRIM(LEADING [remstr] FROM str)
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('叱叱叱竺軸宍雫七');
+# Test data for TRIM(BOTH [remstr] FROM str)
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('叱叱叱竺軸宍雫七叱叱叱');
+# Test data for TRIM without [remstr] (remove spaces) 
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('   竺軸宍雫七   ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ   ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七叱');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七叱叱');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七叱叱叱');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('叱叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('叱叱叱竺軸宍雫七叱叱叱');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('   竺軸宍雫七   ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ   ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七叱');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七叱叱');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七叱叱叱');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('叱叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('叱叱叱竺軸宍雫七叱叱叱');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('   竺軸宍雫七   ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ   ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七叱');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七叱叱');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七叱叱叱');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('叱叱叱竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('叱叱叱竺軸宍雫七叱叱叱');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('   竺軸宍雫七   ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､ｫ､ｫ､ｫ､｢､､､ｦ､ｨ､ｪ､ｫ､ｫ､ｫ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('   ､｢､､､ｦ､ｨ､ｪ   ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('床｡床｡床｡常ﾜ常ﾝ常ﾞ常ﾟ常熄ｰ｡床｡床｡');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('   常ﾜ常ﾝ常ﾞ常ﾟ常�   ');
+
+#InnoDB
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '床｡'FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｴ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｵ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｷ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｸ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '叱' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '､ｫ' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(TRAILING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(LEADING '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(BOTH '床｡' FROM `｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+SELECT `｣ﾃ｣ｱ`,TRIM(`｣ﾃ｣ｱ`) FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_trim_utf8.test b/mysql-test/suite/jp/t/jp_trim_utf8.test
new file mode 100755
index 00000000000..0777de15c36
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_trim_utf8.test
@@ -0,0 +1,218 @@
+--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 `�ｼｴ�ｼ托ｼ秦;
+--enable_warnings
+
+#
+# Test TRIM() function with Japanese characters utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(12), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(12), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(12), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(12), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(12), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(12), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(12), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(12), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(12), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(12), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(12), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(12), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+# Nothing to trim
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+# Test data for TRIM(TRAILING [remstr] FROM str)
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｶ�ｽｶ');
+# Test data for TRIM(LEADING [remstr] FROM str)
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｶ�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｶ�ｽｶ�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+# Test data for TRIM(BOTH [remstr] FROM str)
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｶ�ｽｶ�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｶ�ｽｶ');
+# Test data for TRIM without [remstr] (remove spaces) 
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('   �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ   ');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀縺�');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀縺九°');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀縺九°縺�');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺九≠縺�縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺九°縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺九°縺九≠縺�縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺九°縺九≠縺�縺�縺医♀縺九°縺�');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('   縺ゅ＞縺�縺医♀   ');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡荳�');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡荳ゆｸ�');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡荳ゆｸゆｸ�');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('荳るｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('荳ゆｸるｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('荳ゆｸゆｸるｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('荳ゆｸゆｸるｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡荳ゆｸゆｸ�');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('   鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡   ');
+
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｶ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｶ�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｶ�ｽｶ�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｶ�ｽｶ�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｶ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('   �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ   ');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀縺�');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀縺九°');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀縺九°縺�');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺九≠縺�縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺九°縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺九°縺九≠縺�縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺九°縺九≠縺�縺�縺医♀縺九°縺�');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('   縺ゅ＞縺�縺医♀   ');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡荳�');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡荳ゆｸ�');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡荳ゆｸゆｸ�');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('荳るｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('荳ゆｸるｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('荳ゆｸゆｸるｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('荳ゆｸゆｸるｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡荳ゆｸゆｸ�');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('   鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡   ');
+
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｶ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｶ�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｶ�ｽｶ�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｶ�ｽｶ�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｶ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('   �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ   ');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀縺�');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀縺九°');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀縺九°縺�');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺九≠縺�縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺九°縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺九°縺九≠縺�縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺九°縺九≠縺�縺�縺医♀縺九°縺�');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('   縺ゅ＞縺�縺医♀   ');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡荳�');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡荳ゆｸ�');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡荳ゆｸゆｸ�');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('荳るｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('荳ゆｸるｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('荳ゆｸゆｸるｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('荳ゆｸゆｸるｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡荳ゆｸゆｸ�');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('   鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡   ');
+
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｶ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｶ�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｶ�ｽｶ�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｶ�ｽｶ�ｽｶ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｶ�ｽｶ');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('   �ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ   ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀縺�');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀縺九°');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀縺九°縺�');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺九≠縺�縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺九°縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺九°縺九≠縺�縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺九°縺九≠縺�縺�縺医♀縺九°縺�');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('   縺ゅ＞縺�縺医♀   ');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡荳�');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡荳ゆｸ�');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡荳ゆｸゆｸ�');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('荳るｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('荳ゆｸるｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('荳ゆｸゆｸるｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('荳ゆｸゆｸるｾ秘ｾ夜ｾ鈴ｾ樣ｾ｡荳ゆｸゆｸ�');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('   鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡   ');
+
+#InnoDB
+SELECT `�ｼ｣�ｼ疏,TRIM(TRAILING '�ｽｶ' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏,TRIM(LEADING '�ｽｶ' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏,TRIM(BOTH '�ｽｶ' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏,TRIM(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ疏;
+SELECT `�ｼ｣�ｼ疏,TRIM(TRAILING '縺�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏,TRIM(LEADING '縺�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏,TRIM(BOTH '縺�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏,TRIM(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ蛋;
+SELECT `�ｼ｣�ｼ疏,TRIM(TRAILING '荳�'FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏,TRIM(LEADING '荳�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏,TRIM(BOTH '荳�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ伝;
+SELECT `�ｼ｣�ｼ疏,TRIM(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT `�ｼ｣�ｼ疏,TRIM(TRAILING '�ｽｶ' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏,TRIM(LEADING '�ｽｶ' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏,TRIM(BOTH '�ｽｶ' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏,TRIM(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ覗;
+SELECT `�ｼ｣�ｼ疏,TRIM(TRAILING '縺�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏,TRIM(LEADING '縺�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏,TRIM(BOTH '縺�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏,TRIM(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ描;
+SELECT `�ｼ｣�ｼ疏,TRIM(TRAILING '荳�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏,TRIM(LEADING '荳�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏,TRIM(BOTH '荳�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ冒;
+SELECT `�ｼ｣�ｼ疏,TRIM(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT `�ｼ｣�ｼ疏,TRIM(TRAILING '�ｽｶ' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏,TRIM(LEADING '�ｽｶ' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏,TRIM(BOTH '�ｽｶ' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏,TRIM(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ輿;
+SELECT `�ｼ｣�ｼ疏,TRIM(TRAILING '縺�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏,TRIM(LEADING '縺�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏,TRIM(BOTH '縺�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏,TRIM(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ倭;
+SELECT `�ｼ｣�ｼ疏,TRIM(TRAILING '荳�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏,TRIM(LEADING '荳�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏,TRIM(BOTH '荳�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ兪;
+SELECT `�ｼ｣�ｼ疏,TRIM(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT `�ｼ｣�ｼ疏,TRIM(TRAILING '�ｽｶ' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏,TRIM(LEADING '�ｽｶ' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏,TRIM(BOTH '�ｽｶ' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏,TRIM(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT `�ｼ｣�ｼ疏,TRIM(TRAILING '縺�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏,TRIM(LEADING '縺�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏,TRIM(BOTH '縺�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏,TRIM(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT `�ｼ｣�ｼ疏,TRIM(TRAILING '荳�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏,TRIM(LEADING '荳�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏,TRIM(BOTH '荳�' FROM `�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ蛋;
+SELECT `�ｼ｣�ｼ疏,TRIM(`�ｼ｣�ｼ疏) FROM `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_union_ujis.test b/mysql-test/suite/jp/t/jp_union_ujis.test
new file mode 100755
index 00000000000..e36d18c85c0
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_union_ujis.test
@@ -0,0 +1,129 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test UNION with Japanese characters in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+#InnoDB
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+INSERT INTO `｣ﾔ｣ｱ` VALUES('竺'),('竺'),('､｢'),('､｢'),('常ﾜ'),('常ﾜ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES('軸'),('軸'),('､､'),('､､'),('常ﾝ'),('常ﾝ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES('宍'),('宍'),('､ｦ'),('､ｦ'),('常ﾞ'),('常ﾞ');
+SELECT * FROM `｣ﾔ｣ｱ` UNION DISTINCT SELECT * FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION ALL SELECT * FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+(SELECT * FROM `｣ﾔ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｲ`) UNION (SELECT '､ｦ') ORDER BY `｣ﾃ｣ｱ`;
+(SELECT '､ｦ' AS `｣ﾃ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｲ`) ORDER BY `｣ﾃ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, COUNT(*) FROM `｣ﾔ｣ｱ` GROUP BY `｣ﾃ｣ｱ` UNION
+SELECT `｣ﾃ｣ｱ`, COUNT(*) FROM `｣ﾔ｣ｲ` GROUP BY `｣ﾃ｣ｱ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION DISTINCT
+SELECT * FROM `｣ﾔ｣ｲ` UNION ALL
+SELECT * FROM `｣ﾔ｣ｳ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION ALL
+SELECT * FROM `｣ﾔ｣ｲ` UNION DISTINCT
+SELECT * FROM `｣ﾔ｣ｳ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION SELECT REPEAT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ` ;
+DROP TABLE `｣ﾔ｣ｲ` ;
+DROP TABLE `｣ﾔ｣ｳ` ;
+
+#MyISAM
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = MYISAM;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = MYISAM;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = MYISAM;
+INSERT INTO `｣ﾔ｣ｱ` VALUES('竺'),('竺'),('､｢'),('､｢'),('常ﾜ'),('常ﾜ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES('軸'),('軸'),('､､'),('､､'),('常ﾝ'),('常ﾝ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES('宍'),('宍'),('､ｦ'),('､ｦ'),('常ﾞ'),('常ﾞ');
+SELECT * FROM `｣ﾔ｣ｱ` UNION DISTINCT SELECT * FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION ALL SELECT * FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+(SELECT * FROM `｣ﾔ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｲ`) UNION (SELECT '､ｦ') ORDER BY `｣ﾃ｣ｱ`;
+(SELECT '､ｦ' AS `｣ﾃ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｲ`) ORDER BY `｣ﾃ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, COUNT(*) FROM `｣ﾔ｣ｱ` GROUP BY `｣ﾃ｣ｱ` UNION
+SELECT `｣ﾃ｣ｱ`, COUNT(*) FROM `｣ﾔ｣ｲ` GROUP BY `｣ﾃ｣ｱ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION DISTINCT
+SELECT * FROM `｣ﾔ｣ｲ` UNION ALL
+SELECT * FROM `｣ﾔ｣ｳ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION ALL
+SELECT * FROM `｣ﾔ｣ｲ` UNION DISTINCT
+SELECT * FROM `｣ﾔ｣ｳ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION SELECT REPEAT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ` ;
+DROP TABLE `｣ﾔ｣ｲ` ;
+DROP TABLE `｣ﾔ｣ｳ` ;
+
+#HEAP
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = HEAP;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = HEAP;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = HEAP;
+INSERT INTO `｣ﾔ｣ｱ` VALUES('竺'),('竺'),('､｢'),('､｢'),('常ﾜ'),('常ﾜ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES('軸'),('軸'),('､､'),('､､'),('常ﾝ'),('常ﾝ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES('宍'),('宍'),('､ｦ'),('､ｦ'),('常ﾞ'),('常ﾞ');
+SELECT * FROM `｣ﾔ｣ｱ` UNION DISTINCT SELECT * FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION ALL SELECT * FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+(SELECT * FROM `｣ﾔ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｲ`) UNION (SELECT '､ｦ') ORDER BY `｣ﾃ｣ｱ`;
+(SELECT '､ｦ' AS `｣ﾃ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｲ`) ORDER BY `｣ﾃ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, COUNT(*) FROM `｣ﾔ｣ｱ` GROUP BY `｣ﾃ｣ｱ` UNION
+SELECT `｣ﾃ｣ｱ`, COUNT(*) FROM `｣ﾔ｣ｲ` GROUP BY `｣ﾃ｣ｱ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION DISTINCT
+SELECT * FROM `｣ﾔ｣ｲ` UNION ALL
+SELECT * FROM `｣ﾔ｣ｳ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION ALL
+SELECT * FROM `｣ﾔ｣ｲ` UNION DISTINCT
+SELECT * FROM `｣ﾔ｣ｳ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION SELECT REPEAT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ` ;
+DROP TABLE `｣ﾔ｣ｲ` ;
+DROP TABLE `｣ﾔ｣ｳ` ;
+
+#BDB
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = BDB; 
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = BDB;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = BDB;
+INSERT INTO `｣ﾔ｣ｱ` VALUES('竺'),('竺'),('､｢'),('､｢'),('常ﾜ'),('常ﾜ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES('軸'),('軸'),('､､'),('､､'),('常ﾝ'),('常ﾝ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES('宍'),('宍'),('､ｦ'),('､ｦ'),('常ﾞ'),('常ﾞ');
+SELECT * FROM `｣ﾔ｣ｱ` UNION DISTINCT SELECT * FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION ALL SELECT * FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+(SELECT * FROM `｣ﾔ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｲ`) UNION (SELECT '､ｦ') ORDER BY `｣ﾃ｣ｱ`;
+(SELECT '､ｦ' AS `｣ﾃ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｲ`) ORDER BY `｣ﾃ｣ｱ`;
+SELECT `｣ﾃ｣ｱ`, COUNT(*) FROM `｣ﾔ｣ｱ` GROUP BY `｣ﾃ｣ｱ` UNION
+SELECT `｣ﾃ｣ｱ`, COUNT(*) FROM `｣ﾔ｣ｲ` GROUP BY `｣ﾃ｣ｱ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION DISTINCT
+SELECT * FROM `｣ﾔ｣ｲ` UNION ALL
+SELECT * FROM `｣ﾔ｣ｳ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION ALL
+SELECT * FROM `｣ﾔ｣ｲ` UNION DISTINCT
+SELECT * FROM `｣ﾔ｣ｳ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION SELECT REPEAT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ` ;
+DROP TABLE `｣ﾔ｣ｲ` ;
+DROP TABLE `｣ﾔ｣ｳ` ;
+
+# Test mixed strage engine
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = InnoDB;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = MyISAM;
+INSERT INTO `｣ﾔ｣ｱ` VALUES('竺'),('竺'),('､｢'),('､｢'),('常ﾜ'),('常ﾜ');
+INSERT INTO `｣ﾔ｣ｲ` VALUES('軸'),('軸'),('､､'),('､､'),('常ﾝ'),('常ﾝ');
+SELECT * FROM `｣ﾔ｣ｱ` UNION DISTINCT SELECT * FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ` UNION ALL SELECT * FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_update_sjis.test b/mysql-test/suite/jp/t/jp_update_sjis.test
new file mode 100755
index 00000000000..0dc7372ae92
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_update_sjis.test
@@ -0,0 +1,94 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test Updating with Japanese characters in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ２` VALUES ('あいうえお');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ５` VALUES ('あいうえお');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ８` VALUES ('あいうえお');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構');
+
+UPDATE `Ｔ１` SET `Ｃ１` = ('ｶｷｸｹｺ');
+UPDATE `Ｔ２` SET `Ｃ１` = ('かきくけこ');
+UPDATE `Ｔ３` SET `Ｃ１` = ('噂蚕申貼能');
+UPDATE `Ｔ４` SET `Ｃ１` = ('ｶｷｸｹｺ');
+UPDATE `Ｔ５` SET `Ｃ１` = ('かきくけこ');
+UPDATE `Ｔ６` SET `Ｃ１` = ('噂蚕申貼能');
+UPDATE `Ｔ７` SET `Ｃ１` = ('ｶｷｸｹｺ');
+UPDATE `Ｔ８` SET `Ｃ１` = ('かきくけこ');
+UPDATE `Ｔ９` SET `Ｃ１` = ('噂蚕申貼能');
+UPDATE `Ｔ１０` SET `Ｃ１` = ('ｶｷｸｹｺ');
+UPDATE `Ｔ１１` SET `Ｃ１` = ('かきくけこ');
+UPDATE `Ｔ１２` SET `Ｃ１` = ('噂蚕申貼能');
+
+#InnoDB
+SELECT * FROM `Ｔ１`;
+SELECT * FROM `Ｔ２`;
+SELECT * FROM `Ｔ３`;
+
+#MyISAM
+SELECT * FROM `Ｔ４`;
+SELECT * FROM `Ｔ５`;
+SELECT * FROM `Ｔ６`;
+
+#HEAP
+SELECT * FROM `Ｔ７`;
+SELECT * FROM `Ｔ８`;
+SELECT * FROM `Ｔ９`;
+
+#BDB
+SELECT * FROM `Ｔ１０`;
+SELECT * FROM `Ｔ１１`;
+SELECT * FROM `Ｔ１２`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_update_ucs2.test b/mysql-test/suite/jp/t/jp_update_ucs2.test
new file mode 100755
index 00000000000..7a3c1233210
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_update_ucs2.test
@@ -0,0 +1,96 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test Updating with Japanese characters in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+UPDATE `｣ﾔ｣ｱ` SET `｣ﾃ｣ｱ` = ('叱執失嫉室');
+UPDATE `｣ﾔ｣ｲ` SET `｣ﾃ｣ｱ` = ('､ｫ､ｭ､ｯ､ｱ､ｳ');
+UPDATE `｣ﾔ｣ｳ` SET `｣ﾃ｣ｱ` = ('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ');
+UPDATE `｣ﾔ｣ｴ` SET `｣ﾃ｣ｱ` = ('叱執失嫉室');
+UPDATE `｣ﾔ｣ｵ` SET `｣ﾃ｣ｱ` = ('､ｫ､ｭ､ｯ､ｱ､ｳ');
+UPDATE `｣ﾔ｣ｶ` SET `｣ﾃ｣ｱ` = ('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ');
+UPDATE `｣ﾔ｣ｷ` SET `｣ﾃ｣ｱ` = ('叱執失嫉室');
+UPDATE `｣ﾔ｣ｸ` SET `｣ﾃ｣ｱ` = ('､ｫ､ｭ､ｯ､ｱ､ｳ');
+UPDATE `｣ﾔ｣ｹ` SET `｣ﾃ｣ｱ` = ('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ');
+UPDATE `｣ﾔ｣ｱ｣ｰ` SET `｣ﾃ｣ｱ` = ('叱執失嫉室');
+UPDATE `｣ﾔ｣ｱ｣ｱ` SET `｣ﾃ｣ｱ` = ('､ｫ､ｭ､ｯ､ｱ､ｳ');
+UPDATE `｣ﾔ｣ｱ｣ｲ` SET `｣ﾃ｣ｱ` = ('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ');
+
+#InnoDB
+SELECT * FROM `｣ﾔ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｲ`;
+SELECT * FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT * FROM `｣ﾔ｣ｴ`;
+SELECT * FROM `｣ﾔ｣ｵ`;
+SELECT * FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT * FROM `｣ﾔ｣ｷ`;
+SELECT * FROM `｣ﾔ｣ｸ`;
+SELECT * FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_update_ujis.test b/mysql-test/suite/jp/t/jp_update_ujis.test
new file mode 100755
index 00000000000..852e45b9eeb
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_update_ujis.test
@@ -0,0 +1,95 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test Updating with Japanese characters in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(5), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺軸宍雫七');
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢､､､ｦ､ｨ､ｪ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ常ﾝ常ﾞ常ﾟ常�');
+
+UPDATE `｣ﾔ｣ｱ` SET `｣ﾃ｣ｱ` = ('叱執失嫉室');
+UPDATE `｣ﾔ｣ｲ` SET `｣ﾃ｣ｱ` = ('､ｫ､ｭ､ｯ､ｱ､ｳ');
+UPDATE `｣ﾔ｣ｳ` SET `｣ﾃ｣ｱ` = ('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ');
+UPDATE `｣ﾔ｣ｴ` SET `｣ﾃ｣ｱ` = ('叱執失嫉室');
+UPDATE `｣ﾔ｣ｵ` SET `｣ﾃ｣ｱ` = ('､ｫ､ｭ､ｯ､ｱ､ｳ');
+UPDATE `｣ﾔ｣ｶ` SET `｣ﾃ｣ｱ` = ('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ');
+UPDATE `｣ﾔ｣ｷ` SET `｣ﾃ｣ｱ` = ('叱執失嫉室');
+UPDATE `｣ﾔ｣ｸ` SET `｣ﾃ｣ｱ` = ('､ｫ､ｭ､ｯ､ｱ､ｳ');
+UPDATE `｣ﾔ｣ｹ` SET `｣ﾃ｣ｱ` = ('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ');
+UPDATE `｣ﾔ｣ｱ｣ｰ` SET `｣ﾃ｣ｱ` = ('叱執失嫉室');
+UPDATE `｣ﾔ｣ｱ｣ｱ` SET `｣ﾃ｣ｱ` = ('､ｫ､ｭ､ｯ､ｱ､ｳ');
+UPDATE `｣ﾔ｣ｱ｣ｲ` SET `｣ﾃ｣ｱ` = ('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ');
+
+#InnoDB
+SELECT * FROM `｣ﾔ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｲ`;
+SELECT * FROM `｣ﾔ｣ｳ`;
+
+#MyISAM
+SELECT * FROM `｣ﾔ｣ｴ`;
+SELECT * FROM `｣ﾔ｣ｵ`;
+SELECT * FROM `｣ﾔ｣ｶ`;
+
+#HEAP
+SELECT * FROM `｣ﾔ｣ｷ`;
+SELECT * FROM `｣ﾔ｣ｸ`;
+SELECT * FROM `｣ﾔ｣ｹ`;
+
+#BDB
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ`;
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ`;
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_update_utf8.test b/mysql-test/suite/jp/t/jp_update_utf8.test
new file mode 100755
index 00000000000..b4b3d18ecab
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_update_utf8.test
@@ -0,0 +1,93 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test Updating with Japanese characters in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(5), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+INSERT INTO `�ｼｴ�ｼ疏 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ蛋 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ伝 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ覗 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ描 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ冒 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ輿 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ倭 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ兪 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+INSERT INTO `�ｼｴ�ｼ托ｼ秦 VALUES ('�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ');
+INSERT INTO `�ｼｴ�ｼ托ｼ疏 VALUES ('縺ゅ＞縺�縺医♀');
+INSERT INTO `�ｼｴ�ｼ托ｼ蛋 VALUES ('鮴秘ｾ夜ｾ鈴ｾ樣ｾ｡');
+
+UPDATE `�ｼｴ�ｼ疏 SET `�ｼ｣�ｼ疏 = ('�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ');
+UPDATE `�ｼｴ�ｼ蛋 SET `�ｼ｣�ｼ疏 = ('縺九″縺上¢縺�');
+UPDATE `�ｼｴ�ｼ伝 SET `�ｼ｣�ｼ疏 = ('鮨鈴ｽ倬ｽ夐ｽ晞ｽ�');
+UPDATE `�ｼｴ�ｼ覗 SET `�ｼ｣�ｼ疏 = ('�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ');
+UPDATE `�ｼｴ�ｼ描 SET `�ｼ｣�ｼ疏 = ('縺九″縺上¢縺�');
+UPDATE `�ｼｴ�ｼ冒 SET `�ｼ｣�ｼ疏 = ('鮨鈴ｽ倬ｽ夐ｽ晞ｽ�');
+UPDATE `�ｼｴ�ｼ輿 SET `�ｼ｣�ｼ疏 = ('�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ');
+UPDATE `�ｼｴ�ｼ倭 SET `�ｼ｣�ｼ疏 = ('縺九″縺上¢縺�');
+UPDATE `�ｼｴ�ｼ兪 SET `�ｼ｣�ｼ疏 = ('鮨鈴ｽ倬ｽ夐ｽ晞ｽ�');
+UPDATE `�ｼｴ�ｼ托ｼ秦 SET `�ｼ｣�ｼ疏 = ('�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ');
+UPDATE `�ｼｴ�ｼ托ｼ疏 SET `�ｼ｣�ｼ疏 = ('縺九″縺上¢縺�');
+UPDATE `�ｼｴ�ｼ托ｼ蛋 SET `�ｼ｣�ｼ疏 = ('鮨鈴ｽ倬ｽ夐ｽ晞ｽ�');
+
+#InnoDB
+SELECT * FROM `�ｼｴ�ｼ疏;
+SELECT * FROM `�ｼｴ�ｼ蛋;
+SELECT * FROM `�ｼｴ�ｼ伝;
+
+#MyISAM
+SELECT * FROM `�ｼｴ�ｼ覗;
+SELECT * FROM `�ｼｴ�ｼ描;
+SELECT * FROM `�ｼｴ�ｼ冒;
+
+#HEAP
+SELECT * FROM `�ｼｴ�ｼ輿;
+SELECT * FROM `�ｼｴ�ｼ倭;
+SELECT * FROM `�ｼｴ�ｼ兪;
+
+#BDB
+SELECT * FROM `�ｼｴ�ｼ托ｼ秦;
+SELECT * FROM `�ｼｴ�ｼ托ｼ疏;
+SELECT * FROM `�ｼｴ�ｼ托ｼ蛋;
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;
diff --git a/mysql-test/suite/jp/t/jp_where_sjis.test b/mysql-test/suite/jp/t/jp_where_sjis.test
new file mode 100755
index 00000000000..452d137f643
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_where_sjis.test
@@ -0,0 +1,104 @@
+--character_set sjis
+--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 `Ｔ１２`;
+--enable_warnings
+
+#
+# Test Displaying Japanese charact using WHERE condtion in sjis encoding
+#
+
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+CREATE TABLE `Ｔ１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ２`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ３`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ４`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ５`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ６`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ７`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ８`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ９`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１０`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ１１`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ１２`;
+
+#InnoDB
+SELECT * FROM `Ｔ１` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
+SELECT * FROM `Ｔ２` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
+SELECT * FROM `Ｔ３` WHERE `Ｃ１` = 'ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤';
+
+#MyISAM
+SELECT * FROM `Ｔ４` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
+SELECT * FROM `Ｔ５` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
+SELECT * FROM `Ｔ６` WHERE `Ｃ１` = 'ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤';
+
+#Heap
+SELECT * FROM `Ｔ７` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
+SELECT * FROM `Ｔ８` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
+SELECT * FROM `Ｔ９` WHERE `Ｃ１` = 'ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤';
+
+#BDB
+SELECT * FROM `Ｔ１０` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
+SELECT * FROM `Ｔ１１` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
+SELECT * FROM `Ｔ１２` WHERE `Ｃ１` = 'ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤';
+
+#Test to distinguish 0x9353 and 0x9373
+CREATE TABLE t1(c1 char(1)) default charset = sjis engine=innodb;
+CREATE TABLE t2(c1 char(1)) default charset = sjis engine=myisam;
+CREATE TABLE t3(c1 char(1)) default charset = sjis engine=heap;
+CREATE TABLE t4(c1 char(1)) default charset = sjis engine=bdb;
+INSERT INTO t1 VALUES('鉄'),('都');
+INSERT INTO t2 VALUES('鉄'),('都');
+INSERT INTO t3 VALUES('鉄'),('都');
+INSERT INTO t4 VALUES('鉄'),('都');
+SELECT * FROM t1 WHERE c1 = '鉄';
+SELECT * FROM t2 WHERE c1 = '鉄';
+SELECT * FROM t3 WHERE c1 = '鉄';
+SELECT * FROM t4 WHERE c1 = '鉄';
+SELECT * FROM t1 WHERE c1 = '都';
+SELECT * FROM t2 WHERE c1 = '都';
+SELECT * FROM t3 WHERE c1 = '都';
+SELECT * FROM t4 WHERE c1 = '都';
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_where_ucs2.test b/mysql-test/suite/jp/t/jp_where_ucs2.test
new file mode 100755
index 00000000000..3b82eacd615
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_where_ucs2.test
@@ -0,0 +1,175 @@
+--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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test Displaying Japanese charact using WHERE condtion in ucs2 encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+
+#Insert the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+INSERT INTO `｣ﾔ｣ｱ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｲ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｳ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｴ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｵ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｶ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｷ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｸ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｹ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES
+ ('PQRSTUVWXYZ[\\]^_')
+,(' 治爾璽痔磁示而耳自蒔辞汐鹿式識')
+,('鴫竺軸宍雫七叱執失嫉室悉湿漆疾質')
+,('実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮')
+,('社紗者謝車遮蛇邪借勺尺杓灼爵酌釈');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES
+ ('｡ｴ｡ｵ｡ｶ｡ｷ｡ｸ｡ｹ｡ｺ｡ｻ｡ｼ｡ｽ｡ｾ｡ｿ｡ﾀ｡ﾁ｡ﾂ｡ﾃ｡ﾄ｡ﾅ｡ﾆ｡ﾇ')
+,('｡ﾈ｡ﾉ｡ﾊ｡ﾋ｡ﾌ｡ﾍ｡ﾎ｡ﾏ｡ﾐ｡ﾑ｡ﾒ｡ﾓ｡ﾔ｡ﾕ｡ﾖ｡ﾗ｡ﾘ｡ﾙ｡ﾚ｡ﾛ')
+,('｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ')
+,('｡ｦ･｡･｢･｣･､･･･ｦ･ｧ･ｨ･ｩ･ｪ･ｫ･ｬ･ｭ･ｮ･ｯ･ｰ･ｱ･ｲ･ｳ')
+,('｡ｦｰ｡ｰ｢ｰ｣ｰ､ｰ･ｰｦｰｧｰｨｰｩｰｪｰｫｰｬｰｭｰｮｰｯｰｰｰｱｰｲｰｳ')
+,('｡ｦﾐ｡ﾐ｢ﾐ｣ﾐ､ﾐ･ﾐｦﾐｧﾐｨﾐｩﾐｪﾐｫﾐｬﾐｭﾐｮﾐｯﾐｰﾐｱﾐｲﾐｳ')
+,('｡ｦ�｡�｢�｣�､�･�ｦ�ｧ�ｨ�ｩ�ｪ�ｫ�ｬ�ｭ�ｮ�ｯ�ｰ�ｱ�ｲ�ｳ');
+
+INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES
+ ('｡ｦ召ｵ召ｶ召ｷ召ｸ召ｹ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ｡ｦ召ﾂ召ﾃ召ﾄ｡ｦ｡ｦ｡ｦ')
+,('床ｴ床ｵ床ｶ床ｷ床ｸ床ｹ床ｺ床ｻ床ｼ床ｽ床ｾ床ｿ床ﾀ床ﾁ床ﾂ床ﾃ床ﾄ床ﾅ床ﾆ床ﾇ')
+,('床ﾈ床ﾉ床ﾊ床ﾋ床ﾌ床ﾍ床ﾎ床ﾏ床ﾐ床ﾑ床ﾒ床ﾓ床ﾔ床ﾕ床ﾖ床ﾗ床ﾘ床ﾙ床ﾚ床ﾛ')
+,('床ﾜ床ﾝ床ﾞ床ﾟ床熄ｰ瘴ｰ竢ｰ繽ｰ苡ｰ蜿ｰ謠ｰ迴ｰ闖ｰ髀ｰ齒ｰ�床�床�床�床�')
+,('｡ｦ常｡常｢常｣常､常･常ｦ常ｧ常ｨ常ｩ常ｪ常ｫ常ｬ常ｭ常ｮ常ｯ常ｰ常ｱ常ｲ常ｳ')
+,('常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ')
+,('常ﾈ常ﾉ常ﾊ常ﾋ常ﾌ常ﾍ常ﾎ常ﾏ常ﾐ常ﾑ常ﾒ常ﾓ常ﾔ常ﾕ常ﾖ常ﾗ常ﾘ常ﾙ常ﾚ常ﾛ');
+
+#InnoDB
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` = '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` = '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` = '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+#MyISAM
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` = '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` = '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` = '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+#Heap
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` = '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` = '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` = '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+#BDB
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` = '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` = '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` = '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_where_ujis.test b/mysql-test/suite/jp/t/jp_where_ujis.test
new file mode 100755
index 00000000000..e96404fbb17
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_where_ujis.test
@@ -0,0 +1,87 @@
+--source include/have_ujis.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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test Displaying Japanese charact using WHERE condtion in ujis encoding
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` char(20), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｱ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｲ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｳ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｴ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｵ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｶ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｷ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｸ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｹ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｰ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｱ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `｣ﾔ｣ｱ｣ｲ`;
+
+#InnoDB
+SELECT * FROM `｣ﾔ｣ｱ` WHERE `｣ﾃ｣ｱ` = '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｲ` WHERE `｣ﾃ｣ｱ` = '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｳ` WHERE `｣ﾃ｣ｱ` = '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+#MyISAM
+SELECT * FROM `｣ﾔ｣ｴ` WHERE `｣ﾃ｣ｱ` = '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｵ` WHERE `｣ﾃ｣ｱ` = '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｶ` WHERE `｣ﾃ｣ｱ` = '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+#Heap
+SELECT * FROM `｣ﾔ｣ｷ` WHERE `｣ﾃ｣ｱ` = '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｸ` WHERE `｣ﾃ｣ｱ` = '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｹ` WHERE `｣ﾃ｣ｱ` = '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+#BDB
+SELECT * FROM `｣ﾔ｣ｱ｣ｰ` WHERE `｣ﾃ｣ｱ` = '鴫竺軸宍雫七叱執失嫉室悉湿漆疾質';
+SELECT * FROM `｣ﾔ｣ｱ｣ｱ` WHERE `｣ﾃ｣ｱ` = '｡ｦ､｡､｢､｣､､､･､ｦ､ｧ､ｨ､ｩ､ｪ､ｫ､ｬ､ｭ､ｮ､ｯ､ｰ､ｱ､ｲ､ｳ';
+SELECT * FROM `｣ﾔ｣ｱ｣ｲ` WHERE `｣ﾃ｣ｱ` = '常ｴ常ｵ常ｶ常ｷ常ｸ常ｹ常ｺ常ｻ常ｼ常ｽ常ｾ常ｿ常ﾀ常ﾁ常ﾂ常ﾃ常ﾄ常ﾅ常ﾆ常ﾇ';
+
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲ`;
diff --git a/mysql-test/suite/jp/t/jp_where_utf8.test b/mysql-test/suite/jp/t/jp_where_utf8.test
new file mode 100755
index 00000000000..7280bc33f21
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_where_utf8.test
@@ -0,0 +1,85 @@
+--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 `�ｼｴ�ｼ托ｼ蛋;
+--enable_warnings
+
+#
+# Test Displaying Japanese charact using WHERE condtion in utf8 encoding
+#
+
+SET NAMES utf8;
+SET character_set_database = utf8;
+
+CREATE TABLE `�ｼｴ�ｼ疏 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ蛋 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ伝 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `�ｼｴ�ｼ覗 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ描 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ冒 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `�ｼｴ�ｼ輿 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ倭 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ兪 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `�ｼｴ�ｼ托ｼ秦 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ疏 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `�ｼｴ�ｼ托ｼ蛋 (`�ｼ｣�ｼ疏 char(20), INDEX(`�ｼ｣�ｼ疏)) DEFAULT CHARSET = utf8 engine = bdb;
+
+#Load the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ疏;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ蛋;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ伝;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ覗;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ描;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ冒;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ輿;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ倭;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ兪;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ秦;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ疏;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `�ｼｴ�ｼ托ｼ蛋;
+
+#InnoDB
+SELECT * FROM `�ｼｴ�ｼ疏 WHERE `�ｼ｣�ｼ疏 = '�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ';
+SELECT * FROM `�ｼｴ�ｼ蛋 WHERE `�ｼ｣�ｼ疏 = '繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％';
+SELECT * FROM `�ｼｴ�ｼ伝 WHERE `�ｼ｣�ｼ疏 = '鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�';
+
+#MyISAM
+SELECT * FROM `�ｼｴ�ｼ覗 WHERE `�ｼ｣�ｼ疏 = '�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ';
+SELECT * FROM `�ｼｴ�ｼ描 WHERE `�ｼ｣�ｼ疏 = '繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％';
+SELECT * FROM `�ｼｴ�ｼ冒 WHERE `�ｼ｣�ｼ疏 = '鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�';
+
+#Heap
+SELECT * FROM `�ｼｴ�ｼ輿 WHERE `�ｼ｣�ｼ疏 = '�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ';
+SELECT * FROM `�ｼｴ�ｼ倭 WHERE `�ｼ｣�ｼ疏 = '繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％';
+SELECT * FROM `�ｼｴ�ｼ兪 WHERE `�ｼ｣�ｼ疏 = '鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�';
+
+#BDB
+SELECT * FROM `�ｼｴ�ｼ托ｼ秦 WHERE `�ｼ｣�ｼ疏 = '�ｽｰ�ｽｱ�ｽｲ�ｽｳ�ｽｴ�ｽｵ�ｽｶ�ｽｷ�ｽｸ�ｽｹ�ｽｺ�ｽｻ�ｽｼ�ｽｽ�ｽｾ�ｽｿ';
+SELECT * FROM `�ｼｴ�ｼ托ｼ疏 WHERE `�ｼ｣�ｼ疏 = '繝ｻ縺√≠縺�縺�縺�縺�縺�縺医♂縺翫°縺後″縺弱￥縺舌¢縺偵％';
+SELECT * FROM `�ｼｴ�ｼ托ｼ蛋 WHERE `�ｼ｣�ｼ疏 = '鮠ｫ鮠ｯ鮠ｱ鮠ｲ鮠ｴ鮠ｷ鮠ｹ鮠ｺ鮠ｼ鮠ｽ鮠ｿ鮨�鮨�鮨�鮨�鮨�鮨�鮨馴ｽ暮ｽ�';
+
+DROP TABLE `�ｼｴ�ｼ疏;
+DROP TABLE `�ｼｴ�ｼ蛋;
+DROP TABLE `�ｼｴ�ｼ伝;
+DROP TABLE `�ｼｴ�ｼ覗;
+DROP TABLE `�ｼｴ�ｼ描;
+DROP TABLE `�ｼｴ�ｼ冒;
+DROP TABLE `�ｼｴ�ｼ輿;
+DROP TABLE `�ｼｴ�ｼ倭;
+DROP TABLE `�ｼｴ�ｼ兪;
+DROP TABLE `�ｼｴ�ｼ托ｼ秦;
+DROP TABLE `�ｼｴ�ｼ托ｼ疏;
+DROP TABLE `�ｼｴ�ｼ托ｼ蛋;