summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@macbook.gmz>2006-11-10 12:43:44 +0200
committerunknown <gkodinov/kgeorge@macbook.gmz>2006-11-10 12:43:44 +0200
commitbbc5d13891e09447d399112dfa9fa1b9da929b64 (patch)
tree75b3de0839b817531e88c33915979874e3739de6 /mysql-test
parent463e9409bb86b81963cbbc95acae1b2725237e78 (diff)
downloadmariadb-git-bbc5d13891e09447d399112dfa9fa1b9da929b64.tar.gz
fixed bad 5.0->5.1 merge
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 44eec94f2db..8c4a76c78a9 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -44,4 +44,3 @@ rpl_multi_engine : BUG#22583 2006-09-23 lars
#rpl_truncate_7ndb : BUG#21298 2006-07-27 msvensson
ndb_binlog_discover : bug#21806 2006-08-24
ndb_autodiscover3 : bug#21806
-order_by : GKodinov - please fix bug #22457 in 5.1 also