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_instr_sjis.result b/mysql-test/suite/jp/r/jp_instr_sjis.result
new file mode 100644
index 00000000..b102b1a1
--- /dev/null
+++ b/mysql-test/suite/jp/r/jp_instr_sjis.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 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 = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis 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 INSTR(`Ｃ１`,'ｱ') from `Ｔ１`;
+INSTR(`Ｃ１`,'ｱ')
+1
+SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ１`;
+INSTR(`Ｃ１`,'ｲ')
+2
+SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ１`;
+INSTR(`Ｃ１`,'ｳ')
+3
+SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ１`;
+INSTR(`Ｃ１`,'ｴ')
+4
+SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ１`;
+INSTR(`Ｃ１`,'ｵ')
+5
+SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ１`;
+INSTR(`Ｃ１`,'ﾝ')
+0
+SELECT INSTR(`Ｃ１`,'あ') from `Ｔ２`;
+INSTR(`Ｃ１`,'あ')
+1
+SELECT INSTR(`Ｃ１`,'い') from `Ｔ２`;
+INSTR(`Ｃ１`,'い')
+2
+SELECT INSTR(`Ｃ１`,'う') from `Ｔ２`;
+INSTR(`Ｃ１`,'う')
+3
+SELECT INSTR(`Ｃ１`,'え') from `Ｔ２`;
+INSTR(`Ｃ１`,'え')
+4
+SELECT INSTR(`Ｃ１`,'お') from `Ｔ２`;
+INSTR(`Ｃ１`,'お')
+5
+SELECT INSTR(`Ｃ１`,'ん') from `Ｔ２`;
+INSTR(`Ｃ１`,'ん')
+0
+SELECT INSTR(`Ｃ１`,'ソ') from `Ｔ３`;
+INSTR(`Ｃ１`,'ソ')
+1
+SELECT INSTR(`Ｃ１`,'十') from `Ｔ３`;
+INSTR(`Ｃ１`,'十')
+2
+SELECT INSTR(`Ｃ１`,'表') from `Ｔ３`;
+INSTR(`Ｃ１`,'表')
+3
+SELECT INSTR(`Ｃ１`,'予') from `Ｔ３`;
+INSTR(`Ｃ１`,'予')
+4
+SELECT INSTR(`Ｃ１`,'構') from `Ｔ３`;
+INSTR(`Ｃ１`,'構')
+5
+SELECT INSTR(`Ｃ１`,'噂') from `Ｔ３`;
+INSTR(`Ｃ１`,'噂')
+0
+SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ４`;
+INSTR(`Ｃ１`,'ｱ')
+1
+SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ４`;
+INSTR(`Ｃ１`,'ｲ')
+2
+SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ４`;
+INSTR(`Ｃ１`,'ｳ')
+3
+SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ４`;
+INSTR(`Ｃ１`,'ｴ')
+4
+SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ４`;
+INSTR(`Ｃ１`,'ｵ')
+5
+SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ４`;
+INSTR(`Ｃ１`,'ﾝ')
+0
+SELECT INSTR(`Ｃ１`,'あ') from `Ｔ５`;
+INSTR(`Ｃ１`,'あ')
+1
+SELECT INSTR(`Ｃ１`,'い') from `Ｔ５`;
+INSTR(`Ｃ１`,'い')
+2
+SELECT INSTR(`Ｃ１`,'う') from `Ｔ５`;
+INSTR(`Ｃ１`,'う')
+3
+SELECT INSTR(`Ｃ１`,'え') from `Ｔ５`;
+INSTR(`Ｃ１`,'え')
+4
+SELECT INSTR(`Ｃ１`,'お') from `Ｔ５`;
+INSTR(`Ｃ１`,'お')
+5
+SELECT INSTR(`Ｃ１`,'ん') from `Ｔ５`;
+INSTR(`Ｃ１`,'ん')
+0
+SELECT INSTR(`Ｃ１`,'ソ') from `Ｔ６`;
+INSTR(`Ｃ１`,'ソ')
+1
+SELECT INSTR(`Ｃ１`,'十') from `Ｔ６`;
+INSTR(`Ｃ１`,'十')
+2
+SELECT INSTR(`Ｃ１`,'表') from `Ｔ６`;
+INSTR(`Ｃ１`,'表')
+3
+SELECT INSTR(`Ｃ１`,'予') from `Ｔ６`;
+INSTR(`Ｃ１`,'予')
+4
+SELECT INSTR(`Ｃ１`,'構') from `Ｔ６`;
+INSTR(`Ｃ１`,'構')
+5
+SELECT INSTR(`Ｃ１`,'噂') from `Ｔ６`;
+INSTR(`Ｃ１`,'噂')
+0
+SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ７`;
+INSTR(`Ｃ１`,'ｱ')
+1
+SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ７`;
+INSTR(`Ｃ１`,'ｲ')
+2
+SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ７`;
+INSTR(`Ｃ１`,'ｳ')
+3
+SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ７`;
+INSTR(`Ｃ１`,'ｴ')
+4
+SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ７`;
+INSTR(`Ｃ１`,'ｵ')
+5
+SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ７`;
+INSTR(`Ｃ１`,'ﾝ')
+0
+SELECT INSTR(`Ｃ１`,'あ') from `Ｔ８`;
+INSTR(`Ｃ１`,'あ')
+1
+SELECT INSTR(`Ｃ１`,'い') from `Ｔ８`;
+INSTR(`Ｃ１`,'い')
+2
+SELECT INSTR(`Ｃ１`,'う') from `Ｔ８`;
+INSTR(`Ｃ１`,'う')
+3
+SELECT INSTR(`Ｃ１`,'え') from `Ｔ８`;
+INSTR(`Ｃ１`,'え')
+4
+SELECT INSTR(`Ｃ１`,'お') from `Ｔ８`;
+INSTR(`Ｃ１`,'お')
+5
+SELECT INSTR(`Ｃ１`,'ん') from `Ｔ８`;
+INSTR(`Ｃ１`,'ん')
+0
+SELECT INSTR(`Ｃ１`,'ソ') from `Ｔ９`;
+INSTR(`Ｃ１`,'ソ')
+1
+SELECT INSTR(`Ｃ１`,'十') from `Ｔ９`;
+INSTR(`Ｃ１`,'十')
+2
+SELECT INSTR(`Ｃ１`,'表') from `Ｔ９`;
+INSTR(`Ｃ１`,'表')
+3
+SELECT INSTR(`Ｃ１`,'予') from `Ｔ９`;
+INSTR(`Ｃ１`,'予')
+4
+SELECT INSTR(`Ｃ１`,'構') from `Ｔ９`;
+INSTR(`Ｃ１`,'構')
+5
+SELECT INSTR(`Ｃ１`,'噂') from `Ｔ９`;
+INSTR(`Ｃ１`,'噂')
+0
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;