1 files changed, 230 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/r/jp_charset_ujis.result b/mysql-test/suite/jp/r/jp_charset_ujis.result
new file mode 100755
index 00000000000..964477896bd
--- /dev/null
+++ b/mysql-test/suite/jp/r/jp_charset_ujis.result
@@ -0,0 +1,230 @@
+drop table if exists `£Ô£±`;
+drop table if exists `£Ô£²`;
+drop table if exists `£Ô£³`;
+drop table if exists `£Ô£´`;
+drop table if exists `£Ô£µ`;
+drop table if exists `£Ô£¶`;
+drop table if exists `£Ô£·`;
+drop table if exists `£Ô£¸`;
+drop table if exists `£Ô£¹`;
+drop table if exists `£Ô£±£°`;
+drop table if exists `£Ô£±£±`;
+drop table if exists `£Ô£±£²`;
+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 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 `£Ô£±£²`;
+SELECT DISTINCT CHARSET(`£Ã£±`) FROM `£Ô£±`;
+CHARSET(`£Ã£±`)
+ujis
+SELECT DISTINCT CHARSET(`£Ã£±`) FROM `£Ô£²`;
+CHARSET(`£Ã£±`)
+ujis
+SELECT DISTINCT CHARSET(`£Ã£±`) FROM `£Ô£³`;
+CHARSET(`£Ã£±`)
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING utf8)) FROM `£Ô£±`;
+CHARSET(CONVERT(`£Ã£±` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ucs2)) FROM `£Ô£±`;
+CHARSET(CONVERT(`£Ã£±` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING sjis)) FROM `£Ô£±`;
+CHARSET(CONVERT(`£Ã£±` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ujis)) FROM `£Ô£±`;
+CHARSET(CONVERT(`£Ã£±` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING utf8)) FROM `£Ô£²`;
+CHARSET(CONVERT(`£Ã£±` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ucs2)) FROM `£Ô£²`;
+CHARSET(CONVERT(`£Ã£±` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING sjis)) FROM `£Ô£²`;
+CHARSET(CONVERT(`£Ã£±` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ujis)) FROM `£Ô£²`;
+CHARSET(CONVERT(`£Ã£±` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING utf8)) FROM `£Ô£³`;
+CHARSET(CONVERT(`£Ã£±` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ucs2)) FROM `£Ô£³`;
+CHARSET(CONVERT(`£Ã£±` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING sjis)) FROM `£Ô£³`;
+CHARSET(CONVERT(`£Ã£±` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ujis)) FROM `£Ô£³`;
+CHARSET(CONVERT(`£Ã£±` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(`£Ã£±`) FROM `£Ô£´`;
+CHARSET(`£Ã£±`)
+ujis
+SELECT DISTINCT CHARSET(`£Ã£±`) FROM `£Ô£µ`;
+CHARSET(`£Ã£±`)
+ujis
+SELECT DISTINCT CHARSET(`£Ã£±`) FROM `£Ô£¶`;
+CHARSET(`£Ã£±`)
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING utf8)) FROM `£Ô£´`;
+CHARSET(CONVERT(`£Ã£±` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ucs2)) FROM `£Ô£´`;
+CHARSET(CONVERT(`£Ã£±` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING sjis)) FROM `£Ô£´`;
+CHARSET(CONVERT(`£Ã£±` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ujis)) FROM `£Ô£´`;
+CHARSET(CONVERT(`£Ã£±` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING utf8)) FROM `£Ô£µ`;
+CHARSET(CONVERT(`£Ã£±` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ucs2)) FROM `£Ô£µ`;
+CHARSET(CONVERT(`£Ã£±` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING sjis)) FROM `£Ô£µ`;
+CHARSET(CONVERT(`£Ã£±` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ujis)) FROM `£Ô£µ`;
+CHARSET(CONVERT(`£Ã£±` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING utf8)) FROM `£Ô£¶`;
+CHARSET(CONVERT(`£Ã£±` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ucs2)) FROM `£Ô£¶`;
+CHARSET(CONVERT(`£Ã£±` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING sjis)) FROM `£Ô£¶`;
+CHARSET(CONVERT(`£Ã£±` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ujis)) FROM `£Ô£¶`;
+CHARSET(CONVERT(`£Ã£±` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(`£Ã£±`) FROM `£Ô£·`;
+CHARSET(`£Ã£±`)
+ujis
+SELECT DISTINCT CHARSET(`£Ã£±`) FROM `£Ô£¸`;
+CHARSET(`£Ã£±`)
+ujis
+SELECT DISTINCT CHARSET(`£Ã£±`) FROM `£Ô£¹`;
+CHARSET(`£Ã£±`)
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING utf8)) FROM `£Ô£·`;
+CHARSET(CONVERT(`£Ã£±` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ucs2)) FROM `£Ô£·`;
+CHARSET(CONVERT(`£Ã£±` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING sjis)) FROM `£Ô£·`;
+CHARSET(CONVERT(`£Ã£±` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ujis)) FROM `£Ô£·`;
+CHARSET(CONVERT(`£Ã£±` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING utf8)) FROM `£Ô£¸`;
+CHARSET(CONVERT(`£Ã£±` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ucs2)) FROM `£Ô£¸`;
+CHARSET(CONVERT(`£Ã£±` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING sjis)) FROM `£Ô£¸`;
+CHARSET(CONVERT(`£Ã£±` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ujis)) FROM `£Ô£¸`;
+CHARSET(CONVERT(`£Ã£±` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING utf8)) FROM `£Ô£¹`;
+CHARSET(CONVERT(`£Ã£±` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ucs2)) FROM `£Ô£¹`;
+CHARSET(CONVERT(`£Ã£±` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING sjis)) FROM `£Ô£¹`;
+CHARSET(CONVERT(`£Ã£±` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ujis)) FROM `£Ô£¹`;
+CHARSET(CONVERT(`£Ã£±` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(`£Ã£±`) FROM `£Ô£±£°`;
+CHARSET(`£Ã£±`)
+ujis
+SELECT DISTINCT CHARSET(`£Ã£±`) FROM `£Ô£±£±`;
+CHARSET(`£Ã£±`)
+ujis
+SELECT DISTINCT CHARSET(`£Ã£±`) FROM `£Ô£±£²`;
+CHARSET(`£Ã£±`)
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING utf8)) FROM `£Ô£±£°`;
+CHARSET(CONVERT(`£Ã£±` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ucs2)) FROM `£Ô£±£°`;
+CHARSET(CONVERT(`£Ã£±` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING sjis)) FROM `£Ô£±£°`;
+CHARSET(CONVERT(`£Ã£±` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ujis)) FROM `£Ô£±£°`;
+CHARSET(CONVERT(`£Ã£±` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING utf8)) FROM `£Ô£±£±`;
+CHARSET(CONVERT(`£Ã£±` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ucs2)) FROM `£Ô£±£±`;
+CHARSET(CONVERT(`£Ã£±` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING sjis)) FROM `£Ô£±£±`;
+CHARSET(CONVERT(`£Ã£±` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ujis)) FROM `£Ô£±£±`;
+CHARSET(CONVERT(`£Ã£±` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING utf8)) FROM `£Ô£±£²`;
+CHARSET(CONVERT(`£Ã£±` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ucs2)) FROM `£Ô£±£²`;
+CHARSET(CONVERT(`£Ã£±` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING sjis)) FROM `£Ô£±£²`;
+CHARSET(CONVERT(`£Ã£±` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`£Ã£±` USING ujis)) FROM `£Ô£±£²`;
+CHARSET(CONVERT(`£Ã£±` USING ujis))
+ujis
+drop table `£Ô£±`;
+drop table `£Ô£²`;
+drop table `£Ô£³`;
+drop table `£Ô£´`;
+drop table `£Ô£µ`;
+drop table `£Ô£¶`;
+drop table `£Ô£·`;
+drop table `£Ô£¸`;
+drop table `£Ô£¹`;
+drop table `£Ô£±£°`;
+drop table `£Ô£±£±`;
+drop table `£Ô£±£²`;