diff options
| author | Bernt M. Johnsen <bernt.johnsen@sun.com> | 2010-08-19 09:31:24 +0200 |
|---|---|---|
| committer | Bernt M. Johnsen <bernt.johnsen@sun.com> | 2010-08-19 09:31:24 +0200 |
| commit | 27f5c57cb0c622281b2dd4a9e9c5b327b2bcc6d7 (patch) | |
| tree | cdabd961d1166bdbc5d24577dc35707a3ed47c1f /mysql-test/suite/funcs_2 | |
| parent | f827ef9ed44f21b4d56dad2aa40d6aec60a995a7 (diff) | |
| download | mariadb-git-27f5c57cb0c622281b2dd4a9e9c5b327b2bcc6d7.tar.gz | |
Bug#53563 Fix and enable charset/collation tests in funcs_2
Diffstat (limited to 'mysql-test/suite/funcs_2')
| -rw-r--r-- | mysql-test/suite/funcs_2/charset/charset_master.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_2/r/innodb_charset.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_2/r/memory_charset.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_2/r/myisam_charset.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_2/t/disabled.def | 6 |
5 files changed, 16 insertions, 10 deletions
diff --git a/mysql-test/suite/funcs_2/charset/charset_master.test b/mysql-test/suite/funcs_2/charset/charset_master.test index 99ca4564a0b..dd02d7491cc 100644 --- a/mysql-test/suite/funcs_2/charset/charset_master.test +++ b/mysql-test/suite/funcs_2/charset/charset_master.test @@ -695,3 +695,5 @@ let $coll= utf8_unicode_ci; } +DROP database test; +CREATE database test;
\ No newline at end of file diff --git a/mysql-test/suite/funcs_2/r/innodb_charset.result b/mysql-test/suite/funcs_2/r/innodb_charset.result index 09076145c44..60785d09430 100644 --- a/mysql-test/suite/funcs_2/r/innodb_charset.result +++ b/mysql-test/suite/funcs_2/r/innodb_charset.result @@ -27980,6 +27980,7 @@ F6 1 213 1 53 1 73 1 +DF 1 15A 1 15B 1 15C 1 @@ -28150,7 +28151,6 @@ F8 1 1FF 1 DE 1 FE 1 -DF 1 F7 1 110 1 111 1 @@ -78790,6 +78790,7 @@ C892 1 C893 1 53 1 73 1 +C39F 1 C59A 1 C59B 1 C59C 1 @@ -78960,7 +78961,6 @@ C7BE 1 C7BF 1 C39E 1 C3BE 1 -C39F 1 C3B7 1 C490 1 C491 1 @@ -119154,3 +119154,5 @@ DFBD 1 DFBE 1 DFBF 1 DROP TABLE IF EXISTS test.t1; +DROP database test; +CREATE database test; diff --git a/mysql-test/suite/funcs_2/r/memory_charset.result b/mysql-test/suite/funcs_2/r/memory_charset.result index 8536ac4a9b2..55951e4443e 100644 --- a/mysql-test/suite/funcs_2/r/memory_charset.result +++ b/mysql-test/suite/funcs_2/r/memory_charset.result @@ -27980,6 +27980,7 @@ F6 1 213 1 53 1 73 1 +DF 1 15A 1 15B 1 15C 1 @@ -28150,7 +28151,6 @@ F8 1 1FF 1 DE 1 FE 1 -DF 1 F7 1 110 1 111 1 @@ -78790,6 +78790,7 @@ C892 1 C893 1 53 1 73 1 +C39F 1 C59A 1 C59B 1 C59C 1 @@ -78960,7 +78961,6 @@ C7BE 1 C7BF 1 C39E 1 C3BE 1 -C39F 1 C3B7 1 C490 1 C491 1 @@ -119154,3 +119154,5 @@ DFBD 1 DFBE 1 DFBF 1 DROP TABLE IF EXISTS test.t1; +DROP database test; +CREATE database test; diff --git a/mysql-test/suite/funcs_2/r/myisam_charset.result b/mysql-test/suite/funcs_2/r/myisam_charset.result index 698cce1be37..c4630637177 100644 --- a/mysql-test/suite/funcs_2/r/myisam_charset.result +++ b/mysql-test/suite/funcs_2/r/myisam_charset.result @@ -27980,6 +27980,7 @@ F6 1 213 1 53 1 73 1 +DF 1 15A 1 15B 1 15C 1 @@ -28150,7 +28151,6 @@ F8 1 1FF 1 DE 1 FE 1 -DF 1 F7 1 110 1 111 1 @@ -78790,6 +78790,7 @@ C892 1 C893 1 53 1 73 1 +C39F 1 C59A 1 C59B 1 C59C 1 @@ -78960,7 +78961,6 @@ C7BE 1 C7BF 1 C39E 1 C3BE 1 -C39F 1 C3B7 1 C490 1 C491 1 @@ -119154,3 +119154,5 @@ DFBD 1 DFBE 1 DFBF 1 DROP TABLE IF EXISTS test.t1; +DROP database test; +CREATE database test; diff --git a/mysql-test/suite/funcs_2/t/disabled.def b/mysql-test/suite/funcs_2/t/disabled.def index da6230bd7ed..8ca94961dd2 100644 --- a/mysql-test/suite/funcs_2/t/disabled.def +++ b/mysql-test/suite/funcs_2/t/disabled.def @@ -1,6 +1,4 @@ -# Disabled by hhunger (2008-03-03) due to WL4204 -innodb_charset : Bug#20447 Problem with prefix keys with contractions and expansions -myisam_charset : Bug#20447 Problem with prefix keys with contractions and expansions -memory_charset : Bug#20447 Problem with prefix keys with contractions and expansions +# Should maybe be enabled, but ndb is not part of the ordinary build. +# Bernt M. Johnsen 2010-05-10 ndb_charset : Bug#20447 Problem with prefix keys with contractions and expansions |