summaryrefslogtreecommitdiff
path: root/mysql-test/suite/jp/t/jp_instr_utf8.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/jp/t/jp_instr_utf8.test')
-rw-r--r--mysql-test/suite/jp/t/jp_instr_utf8.test40
1 files changed, 6 insertions, 34 deletions
diff --git a/mysql-test/suite/jp/t/jp_instr_utf8.test b/mysql-test/suite/jp/t/jp_instr_utf8.test
index b25b72bc8d0..27c2cb24e6d 100644
--- a/mysql-test/suite/jp/t/jp_instr_utf8.test
+++ b/mysql-test/suite/jp/t/jp_instr_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
--disable_warnings
drop table if exists `T1`;
drop table if exists `T2`;
@@ -8,7 +10,6 @@ drop table if exists `T6`;
drop table if exists `T7`;
drop table if exists `T8`;
drop table if exists `T9`;
-drop table if exists `T10`;
--enable_warnings
#
@@ -24,12 +25,9 @@ CREATE TABLE `T3` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8
CREATE TABLE `T4` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `T5` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `T6` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `T7` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T8` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T9` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T10` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T11` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T12` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `T7` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T8` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T9` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
INSERT INTO `T1` VALUES ('アイウエオ');
INSERT INTO `T2` VALUES ('あいうえお');
@@ -40,9 +38,6 @@ INSERT INTO `T6` VALUES ('龔龖龗龞龡');
INSERT INTO `T7` VALUES ('アイウエオ');
INSERT INTO `T8` VALUES ('あいうえお');
INSERT INTO `T9` VALUES ('龔龖龗龞龡');
-INSERT INTO `T10` VALUES ('アイウエオ');
-INSERT INTO `T11` VALUES ('あいうえお');
-INSERT INTO `T12` VALUES ('龔龖龗龞龡');
#InnoDB
SELECT INSTR(`C1`,'ア') from `T1`;
@@ -84,7 +79,7 @@ SELECT INSTR(`C1`,'龞') from `T6`;
SELECT INSTR(`C1`,'龡') from `T6`;
SELECT INSTR(`C1`,'丂') from `T6`;
-#HEAP
+#MEMORY
SELECT INSTR(`C1`,'ア') from `T7`;
SELECT INSTR(`C1`,'イ') from `T7`;
SELECT INSTR(`C1`,'ウ') from `T7`;
@@ -104,26 +99,6 @@ SELECT INSTR(`C1`,'龞') from `T9`;
SELECT INSTR(`C1`,'龡') from `T9`;
SELECT INSTR(`C1`,'丂') from `T9`;
-#BDB
-SELECT INSTR(`C1`,'ア') from `T10`;
-SELECT INSTR(`C1`,'イ') from `T10`;
-SELECT INSTR(`C1`,'ウ') from `T10`;
-SELECT INSTR(`C1`,'エ') from `T10`;
-SELECT INSTR(`C1`,'オ') from `T10`;
-SELECT INSTR(`C1`,'ン') from `T10`;
-SELECT INSTR(`C1`,'あ') from `T11`;
-SELECT INSTR(`C1`,'い') from `T11`;
-SELECT INSTR(`C1`,'う') from `T11`;
-SELECT INSTR(`C1`,'え') from `T11`;
-SELECT INSTR(`C1`,'お') from `T11`;
-SELECT INSTR(`C1`,'ん') from `T11`;
-SELECT INSTR(`C1`,'龔') from `T12`;
-SELECT INSTR(`C1`,'龖') from `T12`;
-SELECT INSTR(`C1`,'龗') from `T12`;
-SELECT INSTR(`C1`,'龞') from `T12`;
-SELECT INSTR(`C1`,'龡') from `T12`;
-SELECT INSTR(`C1`,'丂') from `T12`;
-
DROP TABLE `T1`;
DROP TABLE `T2`;
DROP TABLE `T3`;
@@ -133,6 +108,3 @@ DROP TABLE `T6`;
DROP TABLE `T7`;
DROP TABLE `T8`;
DROP TABLE `T9`;
-DROP TABLE `T10`;
-DROP TABLE `T11`;
-DROP TABLE `T12`;