Commit 17c96759 authored by unknown's avatar unknown
Browse files

Merge poseidon.mysql.com:/home/tomas/mysql-5.0

into  poseidon.mysql.com:/home/tomas/mysql-5.1


mysql-test/t/disabled.def:
  manual merge
parents e310db00 ff94fdda
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -38,3 +38,4 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb
plugin                   : Bug#25659 memory leak via "plugins" test
rpl_ndb_dd_advance	 : Bug#25913 rpl_ndb_dd_advance fails randomly
ndb_alter_table		 : Bug##25774 ndb_alter_table.test fails in DBUG_ASSERT() on Linux x64
ndb_single_user          : Bug#27021 Error codes in mysqld in single user mode varies