diff options
| author | unknown <tim@work.mysql.com> | 2001-01-29 20:14:29 +0100 |
|---|---|---|
| committer | unknown <tim@work.mysql.com> | 2001-01-29 20:14:29 +0100 |
| commit | bf1f8fd3eb4b98dadd265f8ed10d92220dabe1bb (patch) | |
| tree | c871edb91cbcc25e8dc02efd481e5c826480a715 /client | |
| parent | ef2e14428542668c46d72fe8a4795df74ec4fedf (diff) | |
| parent | 74e9d984e7404e559a0fc8c5636b113edfb3cd97 (diff) | |
| download | mariadb-git-bf1f8fd3eb4b98dadd265f8ed10d92220dabe1bb.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/d1/users/tim/my/work
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 992583bb230..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)); @@ -1458,7 +1463,7 @@ int main(int argc, char** argv) q->require_file=require_file; save_file[0]=0; } - error |= run_query(&cur_con->mysql, q, QUERY_SEND|QUERY_REAP); + error |= run_query(&cur_con->mysql, q, flags); break; } case Q_SEND: |