Fix for

  Bug#28563 Test suite "jp" fails completely
- The main goal of this fix is to make the "jp" suite runnable in general
  and to make it more robust for use in pushbuild under build team conditions.
- It was decided to fix the remaining heavy issues within the
  architecture of this test later
  (-> WL 4327 Redesign the 'jp' testsuite for build team testing conditions)
  Only the test jp_trim_sjis got some significant improvements of its
  architecture (Just as proof of concept for the other tests).
- Tests suffering from
     Bug 36597 Testsuite "jp": Suspicious results for some tests
               (unexpected result sets)
  were disabled
- *.opt files were used to avoid differences on OS (Windows) because of
  case sensitive tablenames within the tests  

1 files changed, 8 insertions, 114 deletions

diff --git a/mysql-test/suite/jp/t/jp_ps_sjis.test b/mysql-test/suite/jp/t/jp_ps_sjis.test
index cc93dca2a79..123ac904e50 100644
--- a/mysql-test/suite/jp/t/jp_ps_sjis.test
+++ b/mysql-test/suite/jp/t/jp_ps_sjis.test
@@ -1,3 +1,6 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
+
 --character_set sjis
 --disable_warnings
 DROP TABLE IF EXISTS t1;
@@ -234,15 +237,15 @@ DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
 
-### Test HEAP ###
-CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = HEAP;
-CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = HEAP;
+### Test MEMORY ###
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = MEMORY;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = MEMORY;
 CREATE TABLE t3(
  `ｱ` char(1),
  `あ` char(1),
  `表` char(1)
-)DEFAULT CHARSET = sjis ENGINE = HEAP;
-CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE =HEAP;
+)DEFAULT CHARSET = sjis ENGINE = MEMORY;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE =MEMORY;
 
 INSERT INTO t1 VALUES ('xxx');
 INSERT INTO t2 VALUES ('ｱあ表');
@@ -343,112 +346,3 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
-
-### Test BDB ###
-CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = BDB;
-CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = BDB;
-CREATE TABLE t3(
- `ｱ` char(1),
- `あ` char(1),
- `表` char(1)
-)DEFAULT CHARSET = sjis ENGINE = BDB;
-CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE = BDB;
-INSERT INTO t1 VALUES ('xxx');
-INSERT INTO t2 VALUES ('ｱあ表');
-INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
-INSERT INTO t4 VALUES ('ｱ'),('あ'),('表' );
-
-# Japanese parameter for column name
-PREPARE stmt1 FROM 'SELECT ? FROM t3';
-PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
-PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
-# Japanese parameter for function argument
-PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
-PREPARE stmt5 FROM 'SELECT CHARSET(?)';
-PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
-PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
-PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
-PREPARE stmt9 FROM 'SELECT LPAD(c1,10,?) FROM t1';
-PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
-PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
-PREPARE stmt12 FROM 'SELECT RPAD(c1,10,?) FROM t1';
-# Japanese parameter for UPDATE
-PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
-PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
-
-## Test jisx0201 ##
-SET @arg = 'ｱ';
-EXECUTE stmt1 USING @arg;
-EXECUTE stmt2 USING @arg;
-EXECUTE stmt3 USING @arg;
-EXECUTE stmt4 USING @arg;
-EXECUTE stmt5 USING @arg;
-EXECUTE stmt6 USING @arg;
-EXECUTE stmt7 USING @arg;
-EXECUTE stmt8 USING @arg;
-EXECUTE stmt9 USING @arg;
-EXECUTE stmt10 USING @arg;
-EXECUTE stmt11 USING @arg;
-EXECUTE stmt12 USING @arg;
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t3;
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t3;
-
-## Test jisx0208 ##
-SET @arg = 'あ';
-EXECUTE stmt1 USING @arg;
-EXECUTE stmt2 USING @arg;
-EXECUTE stmt3 USING @arg;
-EXECUTE stmt4 USING @arg;
-EXECUTE stmt5 USING @arg;
-EXECUTE stmt6 USING @arg;
-EXECUTE stmt7 USING @arg;
-EXECUTE stmt8 USING @arg;
-EXECUTE stmt9 USING @arg;
-EXECUTE stmt10 USING @arg;
-EXECUTE stmt11 USING @arg;
-EXECUTE stmt12 USING @arg;
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t4;
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t4;
-
-##Test jisx0212 ##
-SET @arg = '表';
-EXECUTE stmt1 USING @arg;
-EXECUTE stmt2 USING @arg;
-EXECUTE stmt3 USING @arg;
-EXECUTE stmt4 USING @arg;
-EXECUTE stmt5 USING @arg;
-EXECUTE stmt6 USING @arg;
-EXECUTE stmt7 USING @arg;
-EXECUTE stmt8 USING @arg;
-EXECUTE stmt9 USING @arg;
-EXECUTE stmt10 USING @arg;
-EXECUTE stmt11 USING @arg;
-EXECUTE stmt12 USING @arg;
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t4;
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t4;
-
-DEALLOCATE PREPARE stmt1;
-DEALLOCATE PREPARE stmt2;
-DEALLOCATE PREPARE stmt3;
-DEALLOCATE PREPARE stmt4;
-DEALLOCATE PREPARE stmt5;
-DEALLOCATE PREPARE stmt6;
-DEALLOCATE PREPARE stmt7;
-DEALLOCATE PREPARE stmt8;
-DEALLOCATE PREPARE stmt9;
-DEALLOCATE PREPARE stmt10;
-DEALLOCATE PREPARE stmt11;
-DEALLOCATE PREPARE stmt12;
-DEALLOCATE PREPARE stmt13;
-DEALLOCATE PREPARE stmt14;
-
-DROP TABLE t1;
-DROP TABLE t2;
-DROP TABLE t3;
-DROP TABLE t4;