diff options
| author | unknown <skozlov/ksm@mysql.com/virtop.(none)> | 2008-04-26 02:17:34 +0400 |
|---|---|---|
| committer | unknown <skozlov/ksm@mysql.com/virtop.(none)> | 2008-04-26 02:17:34 +0400 |
| commit | 88888395cf92341dcd81b6a518dd5d4c97be6694 (patch) | |
| tree | 8a2c71937e5153bbdc18e1f43701db0218e44203 | |
| parent | 34854fc2a55b2b1a4bfaaeeb9fa2d826c78544b0 (diff) | |
| download | mariadb-git-88888395cf92341dcd81b6a518dd5d4c97be6694.tar.gz | |
WL#3754, rpl_ndb_circular_2ch test disabled
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result:
updated result
mysql-test/suite/rpl_ndb/t/disabled.def:
updated disabled list
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
updated test
| -rw-r--r-- | mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl_ndb/t/disabled.def | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result index 53130343aa0..bb662542a56 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result @@ -98,5 +98,5 @@ COUNT(*) SUM(a) b 100 64000 slave DROP TABLE t1; -DROP TABLE t1; +DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def index ebc99feeac6..8177095f5a8 100644 --- a/mysql-test/suite/rpl_ndb/t/disabled.def +++ b/mysql-test/suite/rpl_ndb/t/disabled.def @@ -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 --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test index fad94539b1c..abd2144b80c 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test @@ -172,7 +172,9 @@ SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 3 GROUP BY b ORDER BY b; --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 |