diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-01-24 12:47:09 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-01-24 12:47:09 -0700 |
| commit | b302ee39bc8e5f26f3fe95b47a3f42ad11cc5f40 (patch) | |
| tree | 54c202a8cc62eff35c59e9d92f78316d8240b6da /client | |
| parent | 0ee9e34a72c3206b0c57c7d555a54c8b4396f8fc (diff) | |
| download | mariadb-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 'client')
| -rw-r--r-- | client/mysqltest.c | 9 |
1 files changed, 7 insertions, 2 deletions
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)); |