summaryrefslogtreecommitdiff
path: root/mysql-test/suite/jp/t/jp_join_sjis.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/jp/t/jp_join_sjis.test')
-rw-r--r--mysql-test/suite/jp/t/jp_join_sjis.test93
1 files changed, 27 insertions, 66 deletions
diff --git a/mysql-test/suite/jp/t/jp_join_sjis.test b/mysql-test/suite/jp/t/jp_join_sjis.test
index 30b23913929..031b6bc8c89 100644
--- a/mysql-test/suite/jp/t/jp_join_sjis.test
+++ b/mysql-test/suite/jp/t/jp_join_sjis.test
@@ -1,17 +1,25 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
--character_set sjis
--disable_warnings
-drop table if exists `sP`;
-drop table if exists `sQ`;
-drop table if exists `sR`;
-drop table if exists `sS`;
-drop table if exists `sT`;
-drop table if exists `sU`;
-drop table if exists `sV`;
-drop table if exists `sW`;
-drop table if exists `sX`;
-drop table if exists `sPO`;
-drop table if exists `sPP`;
-drop table if exists `sPQ`;
+DROP TABLE IF EXISTS `sPa`;
+DROP TABLE IF EXISTS `sPb`;
+DROP TABLE IF EXISTS `sQa`;
+DROP TABLE IF EXISTS `sQb`;
+DROP TABLE IF EXISTS `sRa`;
+DROP TABLE IF EXISTS `sRb`;
+DROP TABLE IF EXISTS `sSa`;
+DROP TABLE IF EXISTS `sSb`;
+DROP TABLE IF EXISTS `sTa`;
+DROP TABLE IF EXISTS `sTb`;
+DROP TABLE IF EXISTS `sUa`;
+DROP TABLE IF EXISTS `sUb`;
+DROP TABLE IF EXISTS `sVa`;
+DROP TABLE IF EXISTS `sVb`;
+DROP TABLE IF EXISTS `sWa`;
+DROP TABLE IF EXISTS `sWb`;
+DROP TABLE IF EXISTS `sXa`;
+DROP TABLE IF EXISTS `sXb`;
--enable_warnings
#
@@ -33,18 +41,12 @@ CREATE TABLE `sTa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine
CREATE TABLE `sTb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
CREATE TABLE `sUa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
CREATE TABLE `sUb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `sVa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sVb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sWa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sWb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sXa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sXb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sPOa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sPOb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sPPa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sPPb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sPQa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sPQb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `sVa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `sVb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `sWa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `sWb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `sXa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `sXb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
#insert the following data in each table
# jisx0201 hankaku-katakana data
@@ -69,12 +71,6 @@ INSERT INTO `sWa` VALUES (''),(''),('');
INSERT INTO `sWb` VALUES ('');
INSERT INTO `sXa` VALUES ('\'),('\'),('\');
INSERT INTO `sXb` VALUES ('\');
-INSERT INTO `sPOa` VALUES (''),(''),('');
-INSERT INTO `sPOb` VALUES ('');
-INSERT INTO `sPPa` VALUES (''),(''),('');
-INSERT INTO `sPPb` VALUES ('');
-INSERT INTO `sPQa` VALUES ('\'),('\'),('\');
-INSERT INTO `sPQb` VALUES ('\');
#Test for innodb
SELECT * FROM `sPa` JOIN `sPb`;
@@ -134,7 +130,7 @@ SELECT * FROM `sUa` LEFT JOIN `sUb` ON (`sUa`.`bP` = `sUb`.`bP`);
SELECT * FROM `sUb` RIGHT JOIN `sUa` USING (`bP`);
SELECT * FROM `sUb` RIGHT JOIN `sUa` ON (`sUa`.`bP` = `sUb`.`bP`);
-#Test for heap
+#Test for MEMORY
SELECT * FROM `sVa` JOIN `sVb`;
SELECT * FROM `sVa` INNER JOIN `sVb`;
SELECT * FROM `sVa` JOIN `sVb` USING (`bP`);
@@ -163,35 +159,6 @@ SELECT * FROM `sXa` LEFT JOIN `sXb` ON (`sXa`.`bP` = `sXb`.`bP`);
SELECT * FROM `sXb` RIGHT JOIN `sXa` USING (`bP`);
SELECT * FROM `sXb` RIGHT JOIN `sXa` ON (`sXa`.`bP` = `sXb`.`bP`);
-#Test for heap
-SELECT * FROM `sPOa` JOIN `sPOb`;
-SELECT * FROM `sPOa` INNER JOIN `sPOb`;
-SELECT * FROM `sPOa` JOIN `sPOb` USING (`bP`);
-SELECT * FROM `sPOa` INNER JOIN `sPOb` USING (`bP`);
-SELECT * FROM `sPOa` CROSS JOIN `sPOb`;
-SELECT * FROM `sPOa` LEFT JOIN `sPOb` USING (`bP`);
-SELECT * FROM `sPOa` LEFT JOIN `sPOb` ON (`sPOa`.`bP` = `sPOb`.`bP`);
-SELECT * FROM `sPOb` RIGHT JOIN `sPOa` USING (`bP`);
-SELECT * FROM `sPOb` RIGHT JOIN `sPOa` ON (`sPOa`.`bP` = `sPOb`.`bP`);
-SELECT * FROM `sPPa` JOIN `sPPb`;
-SELECT * FROM `sPPa` INNER JOIN `sPPb`;
-SELECT * FROM `sPPa` JOIN `sPPb` USING (`bP`);
-SELECT * FROM `sPPa` INNER JOIN `sPPb` USING (`bP`);
-SELECT * FROM `sPPa` CROSS JOIN `sPPb`;
-SELECT * FROM `sPPa` LEFT JOIN `sPPb` USING (`bP`);
-SELECT * FROM `sPPa` LEFT JOIN `sPPb` ON (`sPPa`.`bP` = `sPPb`.`bP`);
-SELECT * FROM `sPPb` RIGHT JOIN `sPPa` USING (`bP`);
-SELECT * FROM `sPPb` RIGHT JOIN `sPPa` ON (`sPPa`.`bP` = `sPPb`.`bP`);
-SELECT * FROM `sPQa` JOIN `sPQb`;
-SELECT * FROM `sPQa` INNER JOIN `sPQb`;
-SELECT * FROM `sPQa` JOIN `sPQb` USING (`bP`);
-SELECT * FROM `sPQa` INNER JOIN `sPQb` USING (`bP`);
-SELECT * FROM `sPQa` CROSS JOIN `sPQb`;
-SELECT * FROM `sPQa` LEFT JOIN `sPQb` USING (`bP`);
-SELECT * FROM `sPQa` LEFT JOIN `sPQb` ON (`sPQa`.`bP` = `sPQb`.`bP`);
-SELECT * FROM `sPQb` RIGHT JOIN `sPQa` USING (`bP`);
-SELECT * FROM `sPQb` RIGHT JOIN `sPQa` ON (`sPQa`.`bP` = `sPQb`.`bP`);
-
DROP TABLE `sPa`;
DROP TABLE `sPb`;
DROP TABLE `sQa`;
@@ -210,9 +177,3 @@ DROP TABLE `sWa`;
DROP TABLE `sWb`;
DROP TABLE `sXa`;
DROP TABLE `sXb`;
-DROP TABLE `sPOa`;
-DROP TABLE `sPOb`;
-DROP TABLE `sPPa`;
-DROP TABLE `sPPb`;
-DROP TABLE `sPQa`;
-DROP TABLE `sPQb`;