Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 174 insertions, 0 deletions

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 100644
index 00000000..8427d721
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_charset_ucs2.test
@@ -0,0 +1,174 @@
+--source include/have_sjis.inc
+--source include/have_ucs2.inc
+--source include/have_ujis.inc
+--source include/have_utf8.inc
+--source include/have_innodb.inc
+
+--disable_warnings
+drop table if exists `Ｔ１`;
+drop table if exists `Ｔ２`;
+drop table if exists `Ｔ３`;
+drop table if exists `Ｔ４`;
+drop table if exists `Ｔ５`;
+drop table if exists `Ｔ６`;
+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 = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+
+#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
+ ('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
+,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
+,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
+,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
+,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
+,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
+,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
+
+#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 `Ｔ６`;
+
+#MEMORY
+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 `Ｔ９`;