1 files changed, 6 insertions, 35 deletions

diff --git a/mysql-test/suite/jp/t/jp_locate_utf8.test b/mysql-test/suite/jp/t/jp_locate_utf8.test
index cbf6714e322..6e965eaffa9 100644
--- a/mysql-test/suite/jp/t/jp_locate_utf8.test
+++ b/mysql-test/suite/jp/t/jp_locate_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;
@@ -8,7 +10,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -24,12 +25,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -40,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 #InnoDB
 SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１`;
@@ -85,7 +80,7 @@ SELECT LOCATE('龡',`Ｃ１`) from `Ｔ６`;
 SELECT LOCATE('丂',`Ｃ１`) from `Ｔ６`;
 
 
-#HEAP
+#MEMORY
 SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ７`;
 SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ７`;
 SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ７`;
@@ -106,27 +101,6 @@ SELECT LOCATE('龡',`Ｃ１`) from `Ｔ９`;
 SELECT LOCATE('丂',`Ｃ１`) from `Ｔ９`;
 
 
-#BDB
-SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('あ',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('い',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('う',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('え',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('お',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('ん',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('龔',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('龖',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('龗',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('龞',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('龡',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('丂',`Ｃ１`) from `Ｔ１２`;
-
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -136,6 +110,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;