Merge mockturtle.local:/home/dlenev/src/mysql-5.0-merge

into mockturtle.local:/home/dlenev/src/mysql-5.1-merge

Merge mockturtle.local:/home/dlenev/src/mysql-5.0-merge
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
81c908f2 · dlenev@mockturtle.local · 86f36eb0 · 37110aad · 81c908f2
Commit 81c908f2 authored Jan 24, 2007 by dlenev@mockturtle.local
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
@@ -11,7 +11,7 @@
 ##############################################################################
 user_limits     : Bug#23921 random failure of user_limits.test

-# im_daemon_life_cycle     : Bug#24415  see note: [19 Dec 23:17] Trudy Pelzer
+im_daemon_life_cycle     : Bug#24415  see note: [19 Dec 23:17] Trudy Pelzer
 im_options                : Bug#20294 2006-07-24 stewart   Instance manager test im_options fails randomly
 concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog