bzr push into mysql-6.0-bugteam branch (mats:2965 to 2966) Bug#40116

[Mats Kindahl]

 2966 Mats Kindahl	2009-01-13
      Bug #40116: Uncommited changes are replicated and stay on slave
      after rollback on master
      
      Test case fixes after merging patch to 6.0.
modified:
  mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result
  mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test

 2965 Matthias Leich	2009-01-13 [merge]
      Merge 5.1 -> 6.0, no conflicts
added:
  mysql-test/include/check_events_off.inc
  mysql-test/include/no_running_event_scheduler.inc
  mysql-test/include/no_running_events.inc
  mysql-test/include/running_event_scheduler.inc
renamed:
  mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result => mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
  mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test => mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
modified:
  mysql-test/r/events_bugs.result
  mysql-test/r/log_state.result
  mysql-test/r/type_date.result
  mysql-test/t/events_bugs.test
  mysql-test/t/log_state.test
  mysql-test/t/type_date.test
  mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test

=== 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-09 12:12:47 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result	2009-01-13 21:09:58 +0000
@@ -111,12 +111,6 @@ INSERT INTO innodb_ndb VALUES (12);
 COMMIT;
 ---- ROLLBACK ----
 BEGIN;
-INSERT INTO myisam_innodb VALUES (13);
-INSERT INTO myisam_innodb VALUES (14);
-ROLLBACK;
-Warnings:
-Warning	1196	Some non-transactional changed tables couldn't be rolled back
-BEGIN;
 INSERT INTO innodb_myisam VALUES (15);
 INSERT INTO innodb_myisam VALUES (16);
 ROLLBACK;
@@ -167,12 +161,6 @@ INSERT INTO innodb_ndb VALUES (36);
 COMMIT;
 ---- ROLLBACK ----
 BEGIN;
-INSERT INTO myisam_innodb VALUES (37);
-INSERT INTO myisam_innodb VALUES (38);
-ROLLBACK;
-Warnings:
-Warning	1196	Some non-transactional changed tables couldn't be rolled back
-BEGIN;
 INSERT INTO innodb_myisam VALUES (39);
 INSERT INTO innodb_myisam VALUES (40);
 ROLLBACK;
@@ -218,12 +206,8 @@ SELECT * FROM myisam_innodb ORDER BY a;
 a
 1
 2
-13
-14
 25
 26
-37
-38
 49
 50
 61

=== 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-09 12:12:47 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test	2009-01-13 21:09:58 +0000
@@ -134,12 +134,10 @@ connection master;
 
 --echo ---- ROLLBACK ----
 
-BEGIN;
-INSERT INTO myisam_innodb VALUES (13);
-INSERT INTO myisam_innodb VALUES (14);
-ROLLBACK;
-sync_slave_with_master;
-connection master;
+# 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.
+
 BEGIN;
 INSERT INTO innodb_myisam VALUES (15);
 INSERT INTO innodb_myisam VALUES (16);
@@ -221,12 +219,10 @@ connection master;
 
 --echo ---- ROLLBACK ----
 
-BEGIN;
-INSERT INTO myisam_innodb VALUES (37);
-INSERT INTO myisam_innodb VALUES (38);
-ROLLBACK;
-sync_slave_with_master;
-connection master;
+# 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.
+
 BEGIN;
 INSERT INTO innodb_myisam VALUES (39);
 INSERT INTO innodb_myisam VALUES (40);