summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2006-12-20 11:17:31 +0100
committerunknown <joerg@trift2.>2006-12-20 11:17:31 +0100
commiteff3409964d234af862ecce1ad38fe7eba8bd66c (patch)
tree2894deec22a8b8605defb85fc7d1b4a4ccb08377 /mysql-test
parentc6e1e91b662258a21e08e9360d7e1265cd897363 (diff)
parentb8550ca15a961b522c3197afb465b8998a966722 (diff)
downloadmariadb-git-eff3409964d234af862ecce1ad38fe7eba8bd66c.tar.gz
Merge trift2.:/MySQL/M50/push-5.0
into trift2.:/MySQL/M50/clone-5.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/disabled.def2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 3ee1130760e..3213bd4eb5b 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -10,7 +10,7 @@
#
##############################################################################
-im_deamon_life_cycle : Bug#24425 see note: [19 Dec 23:17] Trudy Pelzer
+im_daemon_life_cycle : Bug#24415 see note: [19 Dec 23:17] Trudy Pelzer
ndb_load : Bug#17233
user_limits : Bug#23921 random failure of user_limits.test
flush2 : Bug#24805 Pushbuild can't handle test with --disable-log-bin