List:Commits« Previous MessageNext Message »
From:Mats Kindahl Date:January 19 2009 9:28pm
Subject:bzr commit into mysql-6.0-bugteam branch (mats:2969) Bug#40116
View as plain text  
#At file:///home/bzr/bugs/b40116-6.0-bugteam/ based on revid:joro@stripped

 2969 Mats Kindahl	2009-01-19
      BUG#40116: Uncommited changes are replicated and stay on
      slave after rollback on master
      
      Post-merge fixes to disable part of a test that is not
      relevant any more.
      
      When replicating from MyISAM to any transactional table
      with AUTOCOMMIT=0 and not using a COMMIT to terminate
      the transaction, the changes will not be applied to the
      slave since they are not committed to the transactional
      engine.
modified:
  mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result
  mysql-test/suite/rpl_ndb/t/disabled.def
  mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test

per-file messages:
  mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test
    Removing tests that replicate from MyISAM to transactional
    engines in such a way that they will lead to mismatching
    tables on master and slave.
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result	2009-01-13 21:09:58 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result	2009-01-19 21:28:28 +0000
@@ -115,12 +115,6 @@ INSERT INTO innodb_myisam VALUES (15);
 INSERT INTO innodb_myisam VALUES (16);
 ROLLBACK;
 BEGIN;
-INSERT INTO myisam_ndb VALUES (17);
-INSERT INTO myisam_ndb VALUES (18);
-ROLLBACK;
-Warnings:
-Warning	1196	Some non-transactional changed tables couldn't be rolled back
-BEGIN;
 INSERT INTO ndb_myisam VALUES (19);
 INSERT INTO ndb_myisam VALUES (20);
 ROLLBACK;
@@ -165,12 +159,6 @@ INSERT INTO innodb_myisam VALUES (39);
 INSERT INTO innodb_myisam VALUES (40);
 ROLLBACK;
 BEGIN;
-INSERT INTO myisam_ndb VALUES (41);
-INSERT INTO myisam_ndb VALUES (42);
-ROLLBACK;
-Warnings:
-Warning	1196	Some non-transactional changed tables couldn't be rolled back
-BEGIN;
 INSERT INTO ndb_myisam VALUES (43);
 INSERT INTO ndb_myisam VALUES (44);
 ROLLBACK;
@@ -195,12 +183,6 @@ INSERT INTO ndb_innodb VALUES (57);
 INSERT INTO ndb_innodb VALUES (58);
 INSERT INTO innodb_ndb VALUES (59);
 INSERT INTO innodb_ndb VALUES (60);
-==== AUTOCOMMIT=0, single statements, myisam on master ====
-SET AUTOCOMMIT = 0;
-INSERT INTO myisam_innodb VALUES (61);
-INSERT INTO myisam_innodb VALUES (62);
-INSERT INTO myisam_ndb VALUES (63);
-INSERT INTO myisam_ndb VALUES (64);
 ==== Show results ====
 SELECT * FROM myisam_innodb ORDER BY a;
 a
@@ -210,8 +192,6 @@ a
 26
 49
 50
-61
-62
 SELECT * FROM innodb_myisam ORDER BY a;
 a
 3
@@ -224,16 +204,10 @@ SELECT * FROM myisam_ndb    ORDER BY a;
 a
 5
 6
-17
-18
 29
 30
-41
-42
 53
 54
-63
-64
 SELECT * FROM ndb_myisam    ORDER BY a;
 a
 7

=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2009-01-19 13:16:25 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2009-01-19 21:28:28 +0000
@@ -13,4 +13,3 @@
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 
 rpl_ndb_extraCol	: Bug#41369 2008-12-10 alik
-rpl_ndb_mixed_tables    : Bug #42199 2009-01-19 joro

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test	2009-01-13 21:09:58 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test	2009-01-19 21:28:28 +0000
@@ -135,8 +135,8 @@ connection master;
 --echo ---- ROLLBACK ----
 
 # Rollback of MyISAM tables not possible, so testing with a MyISAM on
-# master and InnoDB on slave will lead to mismatching tables, so we
-# don't test that.  For more information, see BUG#40116.
+# master and InnoDB or NDB on slave will lead to mismatching tables,
+# so we don't test that.  For more information, see BUG#40116.
 
 BEGIN;
 INSERT INTO innodb_myisam VALUES (15);
@@ -146,12 +146,6 @@ sync_slave_with_master;
 connection master;
 
 BEGIN;
-INSERT INTO myisam_ndb VALUES (17);
-INSERT INTO myisam_ndb VALUES (18);
-ROLLBACK;
-sync_slave_with_master;
-connection master;
-BEGIN;
 INSERT INTO ndb_myisam VALUES (19);
 INSERT INTO ndb_myisam VALUES (20);
 ROLLBACK;
@@ -231,12 +225,6 @@ sync_slave_with_master;
 connection master;
 
 BEGIN;
-INSERT INTO myisam_ndb VALUES (41);
-INSERT INTO myisam_ndb VALUES (42);
-ROLLBACK;
-sync_slave_with_master;
-connection master;
-BEGIN;
 INSERT INTO ndb_myisam VALUES (43);
 INSERT INTO ndb_myisam VALUES (44);
 ROLLBACK;
@@ -287,21 +275,9 @@ sync_slave_with_master;
 connection master;
 
 
---echo ==== AUTOCOMMIT=0, single statements, myisam on master ====
-
-SET AUTOCOMMIT = 0;
-
-# This tests BUG#29288.
-INSERT INTO myisam_innodb VALUES (61);
-INSERT INTO myisam_innodb VALUES (62);
-sync_slave_with_master;
-connection master;
-
-INSERT INTO myisam_ndb VALUES (63);
-INSERT INTO myisam_ndb VALUES (64);
-sync_slave_with_master;
-connection master;
-
+# As of the fix for BUG#40116, AUTOCOMMIT=0 on for MyISAM tables
+# master will not work without a COMMIT last, so we do not have any
+# tests that try that combination. For details, see the bug report.
 
 --echo ==== Show results ====
 

Thread
bzr commit into mysql-6.0-bugteam branch (mats:2969) Bug#40116Mats Kindahl19 Jan