diff options
author | mleich@five.local.lan <> | 2008-05-15 18:01:13 +0200 |
---|---|---|
committer | mleich@five.local.lan <> | 2008-05-15 18:01:13 +0200 |
commit | 464c2de70a782e2ccfea6253ffdd295b3f2b25bb (patch) | |
tree | 20dcafa228d996ca9540a3cf5055a43f9005cb20 /mysql-test/suite/jp/t/jp_right_ujis.test | |
parent | 742e84d7101a96c72ac849a2f6f93f2dff4661a6 (diff) | |
download | mariadb-git-464c2de70a782e2ccfea6253ffdd295b3f2b25bb.tar.gz |
Fix for
Bug#28563 Test suite "jp" fails completely
- The main goal of this fix is to make the "jp" suite runnable in general
and to make it more robust for use in pushbuild under build team conditions.
- It was decided to fix the remaining heavy issues within the
architecture of this test later
(-> WL 4327 Redesign the 'jp' testsuite for build team testing conditions)
Only the test jp_trim_sjis got some significant improvements of its
architecture (Just as proof of concept for the other tests).
- Tests suffering from
Bug 36597 Testsuite "jp": Suspicious results for some tests
(unexpected result sets)
were disabled
- *.opt files were used to avoid differences on OS (Windows) because of
case sensitive tablenames within the tests
Diffstat (limited to 'mysql-test/suite/jp/t/jp_right_ujis.test')
-rw-r--r-- | mysql-test/suite/jp/t/jp_right_ujis.test | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/mysql-test/suite/jp/t/jp_right_ujis.test b/mysql-test/suite/jp/t/jp_right_ujis.test index b5284489c7e..bb478af7b66 100644 --- a/mysql-test/suite/jp/t/jp_right_ujis.test +++ b/mysql-test/suite/jp/t/jp_right_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `T1`; @@ -10,9 +11,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`; -drop table if exists `T11`; -drop table if exists `T12`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `T3` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engin CREATE TABLE `T4` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `T5` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `T6` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `T7` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `T8` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `T9` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `T10` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `T11` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `T12` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `T7` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `T8` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `T9` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `T1` VALUES ('アイウエオ'),('アイウエ'),('アイウ'),('アイ'),('ア'),(''); INSERT INTO `T2` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); @@ -44,9 +39,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 `C1`, RIGHT(`C1`,0) FROM `T1`; @@ -88,7 +80,7 @@ SELECT `C1`, RIGHT(`C1`,3) FROM `T6`; SELECT `C1`, RIGHT(`C1`,4) FROM `T6`; SELECT `C1`, RIGHT(`C1`,5) FROM `T6`; -#HEAP +#MEMORY SELECT `C1`, RIGHT(`C1`,0) FROM `T7`; SELECT `C1`, RIGHT(`C1`,1) FROM `T7`; SELECT `C1`, RIGHT(`C1`,2) FROM `T7`; @@ -108,26 +100,6 @@ SELECT `C1`, RIGHT(`C1`,3) FROM `T9`; SELECT `C1`, RIGHT(`C1`,4) FROM `T9`; SELECT `C1`, RIGHT(`C1`,5) FROM `T9`; -#BDB -SELECT `C1`, RIGHT(`C1`,0) FROM `T10`; -SELECT `C1`, RIGHT(`C1`,1) FROM `T10`; -SELECT `C1`, RIGHT(`C1`,2) FROM `T10`; -SELECT `C1`, RIGHT(`C1`,3) FROM `T10`; -SELECT `C1`, RIGHT(`C1`,4) FROM `T10`; -SELECT `C1`, RIGHT(`C1`,5) FROM `T10`; -SELECT `C1`, RIGHT(`C1`,0) FROM `T11`; -SELECT `C1`, RIGHT(`C1`,1) FROM `T11`; -SELECT `C1`, RIGHT(`C1`,2) FROM `T11`; -SELECT `C1`, RIGHT(`C1`,3) FROM `T11`; -SELECT `C1`, RIGHT(`C1`,4) FROM `T11`; -SELECT `C1`, RIGHT(`C1`,5) FROM `T11`; -SELECT `C1`, RIGHT(`C1`,0) FROM `T12`; -SELECT `C1`, RIGHT(`C1`,1) FROM `T12`; -SELECT `C1`, RIGHT(`C1`,2) FROM `T12`; -SELECT `C1`, RIGHT(`C1`,3) FROM `T12`; -SELECT `C1`, RIGHT(`C1`,4) FROM `T12`; -SELECT `C1`, RIGHT(`C1`,5) FROM `T12`; - DROP TABLE `T1`; DROP TABLE `T2`; DROP TABLE `T3`; @@ -137,6 +109,3 @@ DROP TABLE `T6`; DROP TABLE `T7`; DROP TABLE `T8`; DROP TABLE `T9`; -DROP TABLE `T10`; -DROP TABLE `T11`; -DROP TABLE `T12`; |