summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@macbook.gmz>2006-11-20 12:46:47 +0200
committerunknown <gkodinov/kgeorge@macbook.gmz>2006-11-20 12:46:47 +0200
commit1e3f42b246dd39f1d2e59c79a42b455106f35038 (patch)
treea58e6987254c6640aded3aa4f35b7b8149a22261 /mysql-test
parent1fbe1fc3b0ac8ff351e9d6910471c739310df86c (diff)
downloadmariadb-git-1e3f42b246dd39f1d2e59c79a42b455106f35038.tar.gz
5.0-opt -> 5.1-opt merge fixed.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/disabled.def1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 63fa8440e43..0d3b7cdfdeb 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -32,4 +32,3 @@ rpl_multi_engine : BUG#22583 2006-09-23 lars
#ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events
ndb_binlog_discover : bug#21806 2006-08-24
ndb_autodiscover3 : bug#21806
-udf : for GKodinov to fix. Your fix for #21809 stopped working in 5.1 after the merge.