1 files changed, 10 insertions, 27 deletions
diff --git a/mysql-test/suite/jp/t/jp_convert_sjis.test b/mysql-test/suite/jp/t/jp_convert_sjis.test
index 93fa33029bf..ccbce35b1e0 100644
--- a/mysql-test/suite/jp/t/jp_convert_sjis.test
+++ b/mysql-test/suite/jp/t/jp_convert_sjis.test
@@ -1,3 +1,9 @@
+--source include/have_sjis.inc
+--source include/have_ucs2.inc
+--source include/have_ujis.inc
+--source include/have_utf8.inc
+--source include/have_innodb.inc
+
 --character_set sjis
 SET NAMES sjis;
 SET character_set_database = sjis;
@@ -12,9 +18,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +30,9 @@ CREATE TABLE `�s�R` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engi
 CREATE TABLE `�s�S` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -48,9 +48,6 @@ CREATE TABLE `�s�P�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis en
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�V`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�W`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�X`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P�O`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�P�P`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�P�Q`;
 
 #InnoDB
 SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�P`;
@@ -74,7 +71,7 @@ SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�U`;
 SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�U`;
 SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�U`;
 
-#Heap
+#MEMORY
 SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�V`;
 SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�V`;
 SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�V`;
@@ -85,17 +82,6 @@ SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�X`;
 SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�X`;
 SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�X`;
 
-#BDB
-SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�P�O`;
-SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�P�O`;
-SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�P�O`;
-SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�P�P`;
-SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�P�P`;
-SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�P�P`;
-SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�P�Q`;
-SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�P�Q`;
-SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�P�Q`;
-
 drop table `�s�P`;
 drop table `�s�Q`;
 drop table `�s�R`;
@@ -105,6 +91,3 @@ drop table `�s�U`;
 drop table `�s�V`;
 drop table `�s�W`;
 drop table `�s�X`;
-drop table `�s�P�O`;
-drop table `�s�P�P`;
-drop table `�s�P�Q`;