Merge trift2.:/MySQL/M50/push-5.0

into trift2.:/MySQL/M50/clone-5.0

Merge trift2.:/MySQL/M50/push-5.0
into trift2.:/MySQL/M50/clone-5.0
d9ff6ef3 · joerg@trift2 · c9572a10 · 90fc044f · d9ff6ef3
Commit d9ff6ef3 authored Dec 20, 2006 by joerg@trift2
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/t/disabled.def mysql-test/t/disabled.def +1 -1

No files found.
--- 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