Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
32250dfc
Commit
32250dfc
authored
Jan 23, 2001
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents
7a839cac
0d6cc628
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
4 deletions
+26
-4
client/mysqltest.c
client/mysqltest.c
+1
-1
mysql-test/r/backup.result
mysql-test/r/backup.result
+4
-0
mysql-test/t/backup.test
mysql-test/t/backup.test
+16
-3
mysql-test/t/rpl000016.test
mysql-test/t/rpl000016.test
+5
-0
No files found.
client/mysqltest.c
View file @
32250dfc
...
...
@@ -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
:
...
...
mysql-test/r/backup.result
View file @
32250dfc
...
...
@@ -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
mysql-test/t/backup.test
View file @
32250dfc
...
...
@@ -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
;
mysql-test/t/rpl000016.test
View file @
32250dfc
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment