merge

41a03ab9 · Georgi Kodinov · 5dc48be1 · a3028ec4 · 41a03ab9 · 41a03ab9
Commit 41a03ab9 authored Nov 19, 2010 by Georgi Kodinov
Showing with 2 additions and 0 deletions

mysql-test/extra/rpl_tests/rpl_insert_id_pk.test mysql-test/extra/rpl_tests/rpl_insert_id_pk.test +1 -0

mysql-test/suite/rpl/t/rpl_sync.test mysql-test/suite/rpl/t/rpl_sync.test +1 -0

No files found.
--- a/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
+++ b/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
@@ -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
--- a/mysql-test/suite/rpl/t/rpl_sync.test
+++ b/mysql-test/suite/rpl/t/rpl_sync.test
@@ -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