1 files changed, 3 insertions, 27 deletions

diff --git a/mysql-test/suite/jp/r/jp_update_ucs2.result b/mysql-test/suite/jp/r/jp_update_ucs2.result
index 2796958ac3e..998126a4e4c 100644
--- a/mysql-test/suite/jp/r/jp_update_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_update_ucs2.result
@@ -7,9 +7,6 @@ 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;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 UPDATE `Ｔ１` SET `Ｃ１` = ('ｶｷｸｹｺ');
 UPDATE `Ｔ２` SET `Ｃ１` = ('かきくけこ');
 UPDATE `Ｔ３` SET `Ｃ１` = ('齗齘齚齝齞');
@@ -46,9 +37,6 @@ UPDATE `Ｔ６` SET `Ｃ１` = ('齗齘齚齝齞');
 UPDATE `Ｔ７` SET `Ｃ１` = ('ｶｷｸｹｺ');
 UPDATE `Ｔ８` SET `Ｃ１` = ('かきくけこ');
 UPDATE `Ｔ９` SET `Ｃ１` = ('齗齘齚齝齞');
-UPDATE `Ｔ１０` SET `Ｃ１` = ('ｶｷｸｹｺ');
-UPDATE `Ｔ１１` SET `Ｃ１` = ('かきくけこ');
-UPDATE `Ｔ１２` SET `Ｃ１` = ('齗齘齚齝齞');
 SELECT * FROM `Ｔ１`;
 Ｃ１
 ｶｷｸｹｺ
@@ -76,15 +64,6 @@ SELECT * FROM `Ｔ８`;
 SELECT * FROM `Ｔ９`;
 Ｃ１
 齗齘齚齝齞
-SELECT * FROM `Ｔ１０`;
-Ｃ１
-ｶｷｸｹｺ
-SELECT * FROM `Ｔ１１`;
-Ｃ１
-かきくけこ
-SELECT * FROM `Ｔ１２`;
-Ｃ１
-齗齘齚齝齞
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -94,6 +73,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;