bk commit into 6.0 tree (hakank:1.2577)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakank.  When hakank does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-26 14:21:31+01:00, hakank@lu0011.(none) +2 -0
  Disabled failing tests.

  mysql-test/suite/rpl_ndb/t/disabled.def@stripped, 2008-02-26 14:21:26+01:00, hakank@lu0011.(none) +2 -0
    Disabled failing test.

  mysql-test/t/disabled.def@stripped, 2008-02-26 14:21:26+01:00, hakank@lu0011.(none) +1 -1
    Fixed typo.

diff -Nrup a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2008-02-25 17:05:59 +01:00
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2008-02-26 14:21:26 +01:00
@@ -18,3 +18,5 @@
 #rpl_ndb_multi            : Bug#30751 rpl_ndb_multi missing row in output
 # rpl_ndb_multi            : Bug#34454: Some test cases from the 'rpl_ndb' suite fail
 #rpl_ndb_innodb_trans     : Bug#34454: Some test cases from the 'rpl_ndb' suite fail
+rpl_ndb_innodb2ndb       : Bug#34725 2008-02-26 hakank Currently failing.
+rpl_ndb_myisam2ndb       : Bug#34725 2008-02-26 hakank Currently failing.
diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2008-02-25 18:02:36 +01:00
+++ b/mysql-test/t/disabled.def	2008-02-26 14:21:26 +01:00
@@ -14,7 +14,7 @@ concurrent_innodb        : BUG#21579 200
 order_by             : WL#2475: spetrunia producing ordered streams is not handled correctly
 federated_transactions   : Bug#29523 Transactions do not work
 subselect2 : BUG#31464 SergeyP will fix
-log_tables : BUG#31580 1007-10-13 SergeyP log_tables.test fails on all windows platforms in pushbuild
+log_tables : BUG#31580 2007-10-13 SergeyP log_tables.test fails on all windows platforms in pushbuild
 show_check      : Bug #32682    Test show_check fails in 6.0
 lowercase_table3         : Bug#32667 lowercase_table3.test reports to error log
 innodb_mysql         : Bug#32724: innodb_mysql.test fails randomly