From 877845dd5e3b5fd44d1aeb8b286e46892de9bb8b Mon Sep 17 00:00:00 2001
From: "sasha@mysql.sashanet.com" <>
Date: Wed, 24 Jan 2001 12:47:09 -0700
Subject: 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 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'client')

diff --git a/client/mysqltest.c b/client/mysqltest.c
index b7c0c09579c..953f770240b 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -485,14 +485,19 @@ int do_echo(struct st_query* q)
   return 0;
 }
 
-int do_sync_with_master()
+int do_sync_with_master(struct st_query* q)
 {
   MYSQL_RES* res;
   MYSQL_ROW row;
   MYSQL* mysql = &cur_con->mysql;
   char query_buf[FN_REFLEN+128];
+  int offset = 0;
+  char* p = q->first_argument;
+  if(*p)
+    offset = atoi(p);
+  
   sprintf(query_buf, "select master_pos_wait('%s', %ld)", master_pos.file,
-	  master_pos.pos);
+	  master_pos.pos + offset);
   if(mysql_query(mysql, query_buf))
     die("At line %u: failed in %s: %d: %s", start_lineno, query_buf,
 	mysql_errno(mysql), mysql_error(mysql));
-- 
cgit v1.2.1