1 files changed, 5 insertions, 104 deletions

diff --git a/mysql-test/suite/jp/t/jp_substring_ucs2.test b/mysql-test/suite/jp/t/jp_substring_ucs2.test
index f3cd5550072..febad324237 100644
--- a/mysql-test/suite/jp/t/jp_substring_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_substring_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.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
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 # Test of SUBSTRING(str,pos) and SUBSTRING(str FROM pos)
 # is not available until the bug #5364 is fixed
@@ -228,7 +220,7 @@ SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ６`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ６`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 #SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ７`;
 #SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ７`;
 #SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ７`;
@@ -316,94 +308,6 @@ SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ９`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ９`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ９`;
 
-#BDB
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１０`;
-
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１１`;
-
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -413,6 +317,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;