summaryrefslogtreecommitdiff
path: root/mysql-test/suite/funcs_2/t
diff options
context:
space:
mode:
authorBernt M. Johnsen <bernt.johnsen@sun.com>2010-08-19 09:31:24 +0200
committerBernt M. Johnsen <bernt.johnsen@sun.com>2010-08-19 09:31:24 +0200
commit27f5c57cb0c622281b2dd4a9e9c5b327b2bcc6d7 (patch)
treecdabd961d1166bdbc5d24577dc35707a3ed47c1f /mysql-test/suite/funcs_2/t
parentf827ef9ed44f21b4d56dad2aa40d6aec60a995a7 (diff)
downloadmariadb-git-27f5c57cb0c622281b2dd4a9e9c5b327b2bcc6d7.tar.gz
Bug#53563 Fix and enable charset/collation tests in funcs_2
Diffstat (limited to 'mysql-test/suite/funcs_2/t')
-rw-r--r--mysql-test/suite/funcs_2/t/disabled.def6
1 files changed, 2 insertions, 4 deletions
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