1 files changed, 9 insertions, 33 deletions
diff --git a/mysql-test/suite/jp/t/jp_charset_sjis.test b/mysql-test/suite/jp/t/jp_charset_sjis.test
index 3a9f264bdfe..4cde0848a95 100644
--- a/mysql-test/suite/jp/t/jp_charset_sjis.test
+++ b/mysql-test/suite/jp/t/jp_charset_sjis.test
@@ -1,3 +1,8 @@
+--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
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +14,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 +29,9 @@ CREATE TABLE `�s�R` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = innodb;
 CREATE TABLE `�s�S` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -47,9 +46,6 @@ CREATE TABLE `�s�P�Q` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = bdb;
  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 DISTINCT CHARSET(`�b�P`) FROM `�s�P`;
@@ -85,7 +81,7 @@ SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�U`;
 SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�U`;
 SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�U`;
 
-#Heap
+#MEMORY
 SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�V`;
 SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�W`;
 SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�X`;
@@ -102,23 +98,6 @@ SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�X`;
 SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�X`;
 SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�X`;
 
-#BDB
-SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�P�O`;
-SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�P�P`;
-SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�P�Q`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING utf8)) FROM `�s�P�O`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�P�O`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�P�O`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�P�O`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING utf8)) FROM `�s�P�P`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�P�P`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�P�P`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�P�P`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING utf8)) FROM `�s�P�Q`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�P�Q`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�P�Q`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�P�Q`;
-
 drop table `�s�P`;
 drop table `�s�Q`;
 drop table `�s�R`;
@@ -128,6 +107,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`;