Commit eff34099 authored by unknown's avatar unknown
Browse files

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

into  trift2.:/MySQL/M50/clone-5.0
parents c6e1e91b b8550ca1

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -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