merging

mysql-test/r/ps.result:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

1 files changed, 227 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/r/jp_select_ucs2.result b/mysql-test/suite/jp/r/jp_select_ucs2.result
new file mode 100644
index 00000000000..39d057ed107
--- /dev/null
+++ b/mysql-test/suite/jp/r/jp_select_ucs2.result
@@ -0,0 +1,227 @@
+drop table if exists `Ｔ１`;
+drop table if exists `Ｔ２`;
+drop table if exists `Ｔ３`;
+drop table if exists `Ｔ４`;
+drop table if exists `Ｔ５`;
+drop table if exists `Ｔ６`;
+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 = 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 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
+('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
+,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
+,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
+,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
+,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
+,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
+,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
+SELECT * FROM `Ｔ１`;
+c1
+ ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
+PQRSTUVWXYZ[\]^_
+ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
+ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
+ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
+SELECT * FROM `Ｔ２`;
+c1
+“”（）〔〕［］｛｝〈〉《》「」『』【】
+・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
+・ァアィイゥウェエォオカガキギクグケゲコ
+・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
+・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
+・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
+ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’
+SELECT * FROM `Ｔ３`;
+c1
+・˛˚~΄΅・・・・・・・・¡¦¿・・・
+・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
+乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
+仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
+伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
+鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
+齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
+SELECT * FROM `Ｔ４`;
+c1
+ ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
+PQRSTUVWXYZ[\]^_
+ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
+ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
+ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
+SELECT * FROM `Ｔ５`;
+c1
+“”（）〔〕［］｛｝〈〉《》「」『』【】
+・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
+・ァアィイゥウェエォオカガキギクグケゲコ
+・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
+・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
+・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
+ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’
+SELECT * FROM `Ｔ６`;
+c1
+・˛˚~΄΅・・・・・・・・¡¦¿・・・
+・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
+乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
+仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
+伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
+鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
+齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
+SELECT * FROM `Ｔ７`;
+c1
+PQRSTUVWXYZ[\]^_
+ ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
+ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
+ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
+ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
+SELECT * FROM `Ｔ８`;
+c1
+ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’
+“”（）〔〕［］｛｝〈〉《》「」『』【】
+・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
+・ァアィイゥウェエォオカガキギクグケゲコ
+・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
+・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
+・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
+SELECT * FROM `Ｔ９`;
+c1
+・˛˚~΄΅・・・・・・・・¡¦¿・・・
+乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
+仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
+伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
+・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
+鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
+齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
+SELECT * FROM `Ｔ１０`;
+c1
+PQRSTUVWXYZ[\]^_
+ ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
+ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
+ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
+ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
+SELECT * FROM `Ｔ１１`;
+c1
+ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’
+“”（）〔〕［］｛｝〈〉《》「」『』【】
+・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
+・ァアィイゥウェエォオカガキギクグケゲコ
+・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
+・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
+・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
+SELECT * FROM `Ｔ１２`;
+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 `Ｔ１２`;