1 files changed, 5 insertions, 36 deletions

diff --git a/mysql-test/suite/jp/t/jp_right_ujis.test b/mysql-test/suite/jp/t/jp_right_ujis.test
index b5284489c7e..bb478af7b66 100644
--- a/mysql-test/suite/jp/t/jp_right_ujis.test
+++ b/mysql-test/suite/jp/t/jp_right_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,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 `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 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 = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+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 ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -44,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１`;
@@ -88,7 +80,7 @@ SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ６`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ６`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ７`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ７`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ７`;
@@ -108,26 +100,6 @@ SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ９`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ９`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -137,6 +109,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;