mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge work:/home/bk/mysql

Browse source 
into mysql.sashanet.com:/home/sasha/src/bk/mysql
This commit is contained in:
unknown 2001-01-23 08:21:15 -07:00
commit 32250dfced
4 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/mysqltest.c
View file

@ -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:

4
mysql-test/r/backup.result
View file

@ -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

19
mysql-test/t/backup.test
View file

@ -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;

5
mysql-test/t/rpl000016.test
View file

@ -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);