summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl000013.test
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-01-24 12:47:09 -0700
committerunknown <sasha@mysql.sashanet.com>2001-01-24 12:47:09 -0700
commitb302ee39bc8e5f26f3fe95b47a3f42ad11cc5f40 (patch)
tree54c202a8cc62eff35c59e9d92f78316d8240b6da /mysql-test/t/rpl000013.test
parent0ee9e34a72c3206b0c57c7d555a54c8b4396f8fc (diff)
downloadmariadb-git-b302ee39bc8e5f26f3fe95b47a3f42ad11cc5f40.tar.gz
fixed improper read of log name from master.info which broke slave server restart
fixed sync bugs in three test cases added offset argument to sync_with_master to mysqltest to be able to fix sync bugs added a test case for slave startup with existing master.info expanded mysql-test-run.sh to be able to run pre-start shell script initializations client/mysqltest.c: added offset argument to sync_with_master mysql-test/mysql-test-run.sh: added option to run master or slave initialization shell script mysql-test/r/rpl000016.result: fixed bug in test case mysql-test/t/rpl000012.test: fixed syncronization bug mysql-test/t/rpl000013.test: fixed sync bug mysql-test/t/rpl000016.test: fixed ambiguous show slave status. sql/slave.cc: fixed bug that broke slave server start with existing master.info, Monty's optimization was not chopping off newline from logname.
Diffstat (limited to 'mysql-test/t/rpl000013.test')
-rw-r--r--mysql-test/t/rpl000013.test12
1 files changed, 8 insertions, 4 deletions
diff --git a/mysql-test/t/rpl000013.test b/mysql-test/t/rpl000013.test
index f5056839791..f870d017fa3 100644
--- a/mysql-test/t/rpl000013.test
+++ b/mysql-test/t/rpl000013.test
@@ -13,20 +13,24 @@ connection master1;
create temporary table t1 (n int);
insert into t1 values (4),(5);
insert into t2 select * from t1;
+save_master_pos;
disconnect master;
+connection slave;
+#add 1 to catch drop table
+sync_with_master 1;
connection master1;
insert into t2 values(6);
-disconnect master1;
-connect (master2,localhost,root,,test,0,mysql-master.sock);
-connection master2;
save_master_pos;
+disconnect master1;
connection slave;
-sync_with_master;
+# same trick to go one more event
+sync_with_master 1;
@r/rpl000013.result select * from t2;
@r/rpl000013.status.result show status like 'Slave_open_temp_tables';
#
# Clean up
#
+connect (master2,localhost,root,,test,0,mysql-master.sock);
connection master2;
drop table if exists t1,t2;
save_master_pos;