bk commit into 5.1 tree (skozlov:1.2597)

[Serge Kozlov]

Below is the list of changes that have just been committed into a local
5.1 repository of skozlov.  When skozlov 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-04-26 02:17:34+04:00, skozlov@stripped +3 -0
  WL#3754, rpl_ndb_circular_2ch test disabled

  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result@stripped, 2008-04-26 02:17:31+04:00,
skozlov@stripped +1 -1
    updated result

  mysql-test/suite/rpl_ndb/t/disabled.def@stripped, 2008-04-26 02:17:31+04:00,
skozlov@stripped +1 -1
    updated disabled list

  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test@stripped, 2008-04-26 02:17:31+04:00,
skozlov@stripped +3 -1
    updated test

diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result
b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result	2008-04-25 22:54:17 +04:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result	2008-04-26 02:17:31 +04:00
@@ -98,5 +98,5 @@ COUNT(*)	SUM(a)	b
 100	64000	slave
 
 DROP TABLE t1;
-DROP TABLE t1;
+DROP TABLE IF EXISTS t1;
 
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-26 19:34:01 +03:00
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2008-04-26 02:17:31 +04:00
@@ -12,5 +12,5 @@
 
 rpl_ndb_circular         : Bug#33849 COMMIT event missing in cluster circular
replication.
 rpl_ndb_circular_simplex : Bug#33849 COMMIT event missing in cluster circular
replication.
-
+rpl_ndb_circular_2ch	 : Bug#33849 COMMIT event missing in cluster circular replication.
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug
open
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test
b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test	2008-04-25 20:54:37 +04:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test	2008-04-26 02:17:31 +04:00
@@ -172,7 +172,9 @@ SELECT COUNT(*), SUM(a), b FROM t1 WHERE
 --connection master
 DROP TABLE t1;
 --connection slave
-DROP TABLE t1;
+--disable_warings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
 --echo
 
 # End of test 5.1