List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:November 19 2010 2:01pm
Subject:bzr commit into mysql-5.5-bugteam branch (Georgi.Kodinov:3133)
View as plain text  
#At file:///home/kgeorge/mysql/work/B50021-5.5-bugteam/ based on revid:georgi.kodinov@stripped

 3133 Georgi Kodinov	2010-11-19 [merge]
      merge

    modified:
      mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
      mysql-test/suite/rpl/t/rpl_sync.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_insert_id_pk.test'
--- a/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test	2007-06-06 17:57:07 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test	2010-11-19 13:54:29 +0000
@@ -85,4 +85,5 @@ INSERT INTO t1 VALUES (1),(1);
 sync_slave_with_master;
 connection master;
 drop table t1;
+sync_slave_with_master;
 # End of 4.1 tests

=== modified file 'mysql-test/suite/rpl/t/rpl_sync.test'
--- a/mysql-test/suite/rpl/t/rpl_sync.test	2010-11-06 18:21:12 +0000
+++ b/mysql-test/suite/rpl/t/rpl_sync.test	2010-11-19 13:54:29 +0000
@@ -151,3 +151,4 @@ source include/diff_tables.inc;
 connection master;
 drop table t1;
 --remove_file $MYSQLD_SLAVE_DATADIR/master.backup
+--sync_slave_with_master

No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-5.5-bugteam branch (Georgi.Kodinov:3133) Georgi Kodinov19 Nov