1 files changed, 4 insertions, 231 deletions

diff --git a/mysql-test/suite/jp/r/jp_ps_ujis.result b/mysql-test/suite/jp/r/jp_ps_ujis.result
index 9afef7f76d1..d226b0ef03b 100644
--- a/mysql-test/suite/jp/r/jp_ps_ujis.result
+++ b/mysql-test/suite/jp/r/jp_ps_ujis.result
@@ -446,14 +446,14 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
-CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = HEAP;
-CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = HEAP;
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = MEMORY;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = MEMORY;
 CREATE TABLE t3(
 `ｱ` char(1),
 `あ` char(1),
 `龔` char(1)
-)DEFAULT CHARSET = ujis ENGINE = HEAP;
-CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE =HEAP;
+)DEFAULT CHARSET = ujis ENGINE = MEMORY;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE =MEMORY;
 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');
@@ -667,230 +667,3 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
-CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = BDB;
-CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = BDB;
-CREATE TABLE t3(
-`ｱ` char(1),
-`あ` char(1),
-`龔` char(1)
-)DEFAULT CHARSET = ujis ENGINE = BDB;
-CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis 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 ('ｱ'),('あ'),('龔' );
-PREPARE stmt1 FROM 'SELECT ? FROM t3';
-PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
-PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
-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,9,?) 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,9,?) FROM t1';
-PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
-PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
-SET @arg = 'ｱ';
-EXECUTE stmt1 USING @arg;
-?
-ｱ
-ｱ
-ｱ
-ｱ
-ｱ
-ｱ
-EXECUTE stmt2 USING @arg;
-ｱ	あ	龔
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-EXECUTE stmt3 USING @arg;
-COUNT(*)
-6
-EXECUTE stmt4 USING @arg;
-CHAR_LENGTH(?)
-1
-EXECUTE stmt5 USING @arg;
-CHARSET(?)
-ujis
-EXECUTE stmt6 USING @arg;
-INSERT(c1,1,1,?)
-ｱxx
-EXECUTE stmt7 USING @arg;
-INSTR(c1,?)
-1
-EXECUTE stmt8 USING @arg;
-LOCATE(?,c1)
-1
-EXECUTE stmt9 USING @arg;
-LPAD(c1,9,?)
-ｱｱｱｱｱｱxxx
-EXECUTE stmt10 USING @arg;
-REPLACE(c1,?,'x')
-xあ龔
-EXECUTE stmt11 USING @arg;
-REPLACE(c1,'x',?)
-ｱｱｱ
-EXECUTE stmt12 USING @arg;
-RPAD(c1,9,?)
-xxxｱｱｱｱｱｱ
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t3;
-ｱ	あ	龔
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t3;
-ｱ	あ	龔
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-SET @arg = 'あ';
-EXECUTE stmt1 USING @arg;
-?
-あ
-あ
-あ
-あ
-あ
-あ
-EXECUTE stmt2 USING @arg;
-ｱ	あ	龔
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-EXECUTE stmt3 USING @arg;
-COUNT(*)
-6
-EXECUTE stmt4 USING @arg;
-CHAR_LENGTH(?)
-1
-EXECUTE stmt5 USING @arg;
-CHARSET(?)
-ujis
-EXECUTE stmt6 USING @arg;
-INSERT(c1,1,1,?)
-あxx
-EXECUTE stmt7 USING @arg;
-INSTR(c1,?)
-2
-EXECUTE stmt8 USING @arg;
-LOCATE(?,c1)
-2
-EXECUTE stmt9 USING @arg;
-LPAD(c1,9,?)
-ああああああxxx
-EXECUTE stmt10 USING @arg;
-REPLACE(c1,?,'x')
-ｱx龔
-EXECUTE stmt11 USING @arg;
-REPLACE(c1,'x',?)
-あああ
-EXECUTE stmt12 USING @arg;
-RPAD(c1,9,?)
-xxxああああああ
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t4;
-c1
-ｱ
-x
-龔
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t4;
-c1
-ｱ
-あ
-龔
-SET @arg = '龔';
-EXECUTE stmt1 USING @arg;
-?
-龔
-龔
-龔
-龔
-龔
-龔
-EXECUTE stmt2 USING @arg;
-ｱ	あ	龔
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-EXECUTE stmt3 USING @arg;
-COUNT(*)
-6
-EXECUTE stmt4 USING @arg;
-CHAR_LENGTH(?)
-1
-EXECUTE stmt5 USING @arg;
-CHARSET(?)
-ujis
-EXECUTE stmt6 USING @arg;
-INSERT(c1,1,1,?)
-龔xx
-EXECUTE stmt7 USING @arg;
-INSTR(c1,?)
-3
-EXECUTE stmt8 USING @arg;
-LOCATE(?,c1)
-3
-EXECUTE stmt9 USING @arg;
-LPAD(c1,9,?)
-龔龔龔龔龔龔xxx
-EXECUTE stmt10 USING @arg;
-REPLACE(c1,?,'x')
-ｱあx
-EXECUTE stmt11 USING @arg;
-REPLACE(c1,'x',?)
-龔龔龔
-EXECUTE stmt12 USING @arg;
-RPAD(c1,9,?)
-xxx龔龔龔龔龔龔
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t4;
-c1
-ｱ
-あ
-x
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t4;
-c1
-ｱ
-あ
-龔
-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;