summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2008-03-05 10:28:41 +0100
committerunknown <joerg@trift2.>2008-03-05 10:28:41 +0100
commit00ee3b459460186286e200a4177ac6e120c4dba4 (patch)
tree2b1c53250b039eff70af7a506554cc9f9a48d958 /mysql-test/suite
parent6c2420ed3c0e074fc3b7f47ce00e7ce220906e2c (diff)
parent40eef79f9d7a2cafec02de055d4580b945e25a4b (diff)
downloadmariadb-git-00ee3b459460186286e200a4177ac6e120c4dba4.tar.gz
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1 configure.in: Auto merged
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/funcs_2/t/disabled.def6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/funcs_2/t/disabled.def b/mysql-test/suite/funcs_2/t/disabled.def
new file mode 100644
index 00000000000..c903662e052
--- /dev/null
+++ b/mysql-test/suite/funcs_2/t/disabled.def
@@ -0,0 +1,6 @@
+# Disabled by hhunger (2008-03-03) due to WL4204
+innodb_charset : Due to bug#20447
+myisam_charset : Due to bug#20477
+memory_charset : Due to bug#20447
+ndb_charset : Due to bug#20447
+