Commit 6e4fff3f authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
parents b2c88ff8 24be420c

mysql-test/lib/mtr_cases.pl

+1 −0
Original line number Diff line number Diff line
@@ -831,6 +831,7 @@ our @tags= 
 ["include/have_ndb.inc", "ndb_test", 1],

 ["include/have_multi_ndb.inc", "ndb_test", 1],

 ["include/have_ndb_extra.inc", "ndb_extra", 1],

 ["include/ndb_master-slave.inc", "ndb_test", 1],

 ["require_manager", "require_manager", 1],

);

mysql-test/suite/ndb_team/t/disabled.def

+3 −0
Original line number Diff line number Diff line
@@ -15,3 +15,6 @@ ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t 
# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open

#ndb_autodiscover3        : bug#21806

#ndb_autodiscover3         : Bug#20872 2007-07-15 ingo master*.err: miscellaneous error messages

#rpl_ndb_extraColMaster   : BUG#30854 : Tables name show as binary in slave err msg on vm-win2003-64-b and Solaris

#rpl_ndb_mix_innodb       : Bug #32720   Test rpl_ndb_mix_innodb fails on SPARC and PowerPC

#rpl_ndb_dd_advance	 : Bug #30222  	rpl_ndb_dd_advance.test fails