diff options
| -rw-r--r-- | client/mysqltest.c | 2 | ||||
| -rw-r--r-- | mysql-test/r/backup.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/backup.test | 19 | ||||
| -rw-r--r-- | mysql-test/t/rpl000016.test | 5 |
4 files changed, 26 insertions, 4 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 992583bb230..b7c0c09579c 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1458,7 +1458,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: diff --git a/mysql-test/r/backup.result b/mysql-test/r/backup.result index a801e1cd28d..4b7b62f3ee8 100644 --- a/mysql-test/r/backup.result +++ b/mysql-test/r/backup.result @@ -37,3 +37,7 @@ k 223 245 267 +Table Op Msg_type Msg_text +test.t1 restore status OK +Table Op Msg_type Msg_text +test.t1 backup status OK diff --git a/mysql-test/t/backup.test b/mysql-test/t/backup.test index 396576badb7..17b06d73814 100644 --- a/mysql-test/t/backup.test +++ b/mysql-test/t/backup.test @@ -26,6 +26,19 @@ select n from t1; select m from t2; select k from t3; drop table t1,t2,t3; -#restore table t1 from '../tmp'; -#connection con2; -#lock tables t1 write; +restore table t1 from '../tmp'; +connection con2; +send lock tables t1 write; +connection con1; +send backup table t1 to '../tmp'; +connection con2; +reap; +unlock tables; +connection con1; +reap; + + + + + + diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test index f9ef99c62b6..44a011cff27 100644 --- a/mysql-test/t/rpl000016.test +++ b/mysql-test/t/rpl000016.test @@ -30,6 +30,11 @@ create table t2(m int); insert into t2 values (34),(67),(123); flush logs; show master logs; +save_master_pos; +#let slave catch up +connection slave; +sync_with_master; +connection master; purge master logs to 'master-bin.003'; show master logs; insert into t2 values (65); |