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

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

1 files changed, 200 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/r/jp_locate_ujis.result b/mysql-test/suite/jp/r/jp_locate_ujis.result
new file mode 100644
index 00000000..45560d2f
--- /dev/null
+++ b/mysql-test/suite/jp/r/jp_locate_ujis.result
@@ -0,0 +1,200 @@
+drop table if exists `Ｔ１`;
+drop table if exists `Ｔ２`;
+drop table if exists `Ｔ３`;
+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(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 = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
+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 LOCATE('ｱ',`Ｃ１`) from `Ｔ１`;
+LOCATE('ｱ',`Ｃ１`)
+1
+SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ１`;
+LOCATE('ｲ',`Ｃ１`)
+2
+SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ１`;
+LOCATE('ｳ',`Ｃ１`)
+3
+SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ１`;
+LOCATE('ｴ',`Ｃ１`)
+4
+SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ１`;
+LOCATE('ｵ',`Ｃ１`)
+5
+SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ１`;
+LOCATE('ﾝ',`Ｃ１`)
+0
+SELECT LOCATE('あ',`Ｃ１`) from `Ｔ２`;
+LOCATE('あ',`Ｃ１`)
+1
+SELECT LOCATE('い',`Ｃ１`) from `Ｔ２`;
+LOCATE('い',`Ｃ１`)
+2
+SELECT LOCATE('う',`Ｃ１`) from `Ｔ２`;
+LOCATE('う',`Ｃ１`)
+3
+SELECT LOCATE('え',`Ｃ１`) from `Ｔ２`;
+LOCATE('え',`Ｃ１`)
+4
+SELECT LOCATE('お',`Ｃ１`) from `Ｔ２`;
+LOCATE('お',`Ｃ１`)
+5
+SELECT LOCATE('ん',`Ｃ１`) from `Ｔ２`;
+LOCATE('ん',`Ｃ１`)
+0
+SELECT LOCATE('龔',`Ｃ１`) from `Ｔ３`;
+LOCATE('龔',`Ｃ１`)
+1
+SELECT LOCATE('龖',`Ｃ１`) from `Ｔ３`;
+LOCATE('龖',`Ｃ１`)
+2
+SELECT LOCATE('龗',`Ｃ１`) from `Ｔ３`;
+LOCATE('龗',`Ｃ１`)
+3
+SELECT LOCATE('龞',`Ｃ１`) from `Ｔ３`;
+LOCATE('龞',`Ｃ１`)
+4
+SELECT LOCATE('龡',`Ｃ１`) from `Ｔ３`;
+LOCATE('龡',`Ｃ１`)
+5
+SELECT LOCATE('丂',`Ｃ１`) from `Ｔ３`;
+LOCATE('丂',`Ｃ１`)
+0
+SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ４`;
+LOCATE('ｱ',`Ｃ１`)
+1
+SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ４`;
+LOCATE('ｲ',`Ｃ１`)
+2
+SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ４`;
+LOCATE('ｳ',`Ｃ１`)
+3
+SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ４`;
+LOCATE('ｴ',`Ｃ１`)
+4
+SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ４`;
+LOCATE('ｵ',`Ｃ１`)
+5
+SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ４`;
+LOCATE('ﾝ',`Ｃ１`)
+0
+SELECT LOCATE('あ',`Ｃ１`) from `Ｔ５`;
+LOCATE('あ',`Ｃ１`)
+1
+SELECT LOCATE('い',`Ｃ１`) from `Ｔ５`;
+LOCATE('い',`Ｃ１`)
+2
+SELECT LOCATE('う',`Ｃ１`) from `Ｔ５`;
+LOCATE('う',`Ｃ１`)
+3
+SELECT LOCATE('え',`Ｃ１`) from `Ｔ５`;
+LOCATE('え',`Ｃ１`)
+4
+SELECT LOCATE('お',`Ｃ１`) from `Ｔ５`;
+LOCATE('お',`Ｃ１`)
+5
+SELECT LOCATE('ん',`Ｃ１`) from `Ｔ５`;
+LOCATE('ん',`Ｃ１`)
+0
+SELECT LOCATE('龔',`Ｃ１`) from `Ｔ６`;
+LOCATE('龔',`Ｃ１`)
+1
+SELECT LOCATE('龖',`Ｃ１`) from `Ｔ６`;
+LOCATE('龖',`Ｃ１`)
+2
+SELECT LOCATE('龗',`Ｃ１`) from `Ｔ６`;
+LOCATE('龗',`Ｃ１`)
+3
+SELECT LOCATE('龞',`Ｃ１`) from `Ｔ６`;
+LOCATE('龞',`Ｃ１`)
+4
+SELECT LOCATE('龡',`Ｃ１`) from `Ｔ６`;
+LOCATE('龡',`Ｃ１`)
+5
+SELECT LOCATE('丂',`Ｃ１`) from `Ｔ６`;
+LOCATE('丂',`Ｃ１`)
+0
+SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ７`;
+LOCATE('ｱ',`Ｃ１`)
+1
+SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ７`;
+LOCATE('ｲ',`Ｃ１`)
+2
+SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ７`;
+LOCATE('ｳ',`Ｃ１`)
+3
+SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ７`;
+LOCATE('ｴ',`Ｃ１`)
+4
+SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ７`;
+LOCATE('ｵ',`Ｃ１`)
+5
+SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ７`;
+LOCATE('ﾝ',`Ｃ１`)
+0
+SELECT LOCATE('あ',`Ｃ１`) from `Ｔ８`;
+LOCATE('あ',`Ｃ１`)
+1
+SELECT LOCATE('い',`Ｃ１`) from `Ｔ８`;
+LOCATE('い',`Ｃ１`)
+2
+SELECT LOCATE('う',`Ｃ１`) from `Ｔ８`;
+LOCATE('う',`Ｃ１`)
+3
+SELECT LOCATE('え',`Ｃ１`) from `Ｔ８`;
+LOCATE('え',`Ｃ１`)
+4
+SELECT LOCATE('お',`Ｃ１`) from `Ｔ８`;
+LOCATE('お',`Ｃ１`)
+5
+SELECT LOCATE('ん',`Ｃ１`) from `Ｔ８`;
+LOCATE('ん',`Ｃ１`)
+0
+SELECT LOCATE('龔',`Ｃ１`) from `Ｔ９`;
+LOCATE('龔',`Ｃ１`)
+1
+SELECT LOCATE('龖',`Ｃ１`) from `Ｔ９`;
+LOCATE('龖',`Ｃ１`)
+2
+SELECT LOCATE('龗',`Ｃ１`) from `Ｔ９`;
+LOCATE('龗',`Ｃ１`)
+3
+SELECT LOCATE('龞',`Ｃ１`) from `Ｔ９`;
+LOCATE('龞',`Ｃ１`)
+4
+SELECT LOCATE('龡',`Ｃ１`) from `Ｔ９`;
+LOCATE('龡',`Ｃ１`)
+5
+SELECT LOCATE('丂',`Ｃ１`) from `Ｔ９`;
+LOCATE('丂',`Ｃ１`)
+0
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;