fixes for tests

parent 8b7391c9
...@@ -1458,7 +1458,7 @@ int main(int argc, char** argv) ...@@ -1458,7 +1458,7 @@ int main(int argc, char** argv)
q->require_file=require_file; q->require_file=require_file;
save_file[0]=0; save_file[0]=0;
} }
error |= run_query(&cur_con->mysql, q, QUERY_SEND|QUERY_REAP); error |= run_query(&cur_con->mysql, q, flags);
break; break;
} }
case Q_SEND: case Q_SEND:
......
...@@ -37,3 +37,7 @@ k ...@@ -37,3 +37,7 @@ k
223 223
245 245
267 267
Table Op Msg_type Msg_text
test.t1 restore status OK
Table Op Msg_type Msg_text
test.t1 backup status OK
...@@ -26,6 +26,19 @@ select n from t1; ...@@ -26,6 +26,19 @@ select n from t1;
select m from t2; select m from t2;
select k from t3; select k from t3;
drop table t1,t2,t3; drop table t1,t2,t3;
#restore table t1 from '../tmp'; restore table t1 from '../tmp';
#connection con2; connection con2;
#lock tables t1 write; send lock tables t1 write;
connection con1;
send backup table t1 to '../tmp';
connection con2;
reap;
unlock tables;
connection con1;
reap;
...@@ -30,6 +30,11 @@ create table t2(m int); ...@@ -30,6 +30,11 @@ create table t2(m int);
insert into t2 values (34),(67),(123); insert into t2 values (34),(67),(123);
flush logs; flush logs;
show master 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'; purge master logs to 'master-bin.003';
show master logs; show master logs;
insert into t2 values (65); insert into t2 values (65);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment