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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
3474bb04
Commit
3474bb04
authored
Feb 11, 2014
by
Michael Widenius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed that --apply-slave-statements also uses multi-source
mysql-test/r/rpl_mysqldump_slave.result: Updated test result
parent
3f433710
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
9 deletions
+12
-9
client/mysqldump.c
client/mysqldump.c
+8
-5
mysql-test/r/rpl_mysqldump_slave.result
mysql-test/r/rpl_mysqldump_slave.result
+4
-4
No files found.
client/mysqldump.c
View file @
3474bb04
...
@@ -4826,10 +4826,10 @@ static int add_stop_slave(void)
...
@@ -4826,10 +4826,10 @@ static int add_stop_slave(void)
if
(
opt_comments
)
if
(
opt_comments
)
fprintf
(
md_result_file
,
fprintf
(
md_result_file
,
"
\n
--
\n
-- stop slave statement to make a recovery dump)
\n
--
\n\n
"
);
"
\n
--
\n
-- stop slave statement to make a recovery dump)
\n
--
\n\n
"
);
fprintf
(
md_result_file
,
"STOP SLAVE;
\n
"
);
if
(
multi_source
)
#ifdef WHEN_55_CAN_HANDLE_LONG_VERSION_STRINGS
fprintf
(
md_result_file
,
"STOP ALL SLAVES;
\n
"
);
fprintf
(
md_result_file
,
"/*M!100000 STOP ALL SLAVES */;
\n
"
);
else
#endif
fprintf
(
md_result_file
,
"STOP SLAVE;
\n
"
);
return
(
0
);
return
(
0
);
}
}
...
@@ -4838,7 +4838,10 @@ static int add_slave_statements(void)
...
@@ -4838,7 +4838,10 @@ static int add_slave_statements(void)
if
(
opt_comments
)
if
(
opt_comments
)
fprintf
(
md_result_file
,
fprintf
(
md_result_file
,
"
\n
--
\n
-- start slave statement to make a recovery dump)
\n
--
\n\n
"
);
"
\n
--
\n
-- start slave statement to make a recovery dump)
\n
--
\n\n
"
);
fprintf
(
md_result_file
,
"START SLAVE;
\n
"
);
if
(
multi_source
)
fprintf
(
md_result_file
,
"START ALL SLAVES;
\n
"
);
else
fprintf
(
md_result_file
,
"START SLAVE;
\n
"
);
return
(
0
);
return
(
0
);
}
}
...
...
mysql-test/r/rpl_mysqldump_slave.result
View file @
3474bb04
...
@@ -5,10 +5,10 @@ include/master-slave.inc
...
@@ -5,10 +5,10 @@ include/master-slave.inc
#
#
use test;
use test;
CHANGE MASTER "" TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
CHANGE MASTER "" TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
STOP
SLAVE
;
STOP
ALL SLAVES
;
CHANGE MASTER "" TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
CHANGE MASTER "" TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
START
SLAVE
;
START
ALL SLAVES
;
STOP
SLAVE
;
STOP
ALL SLAVES
;
CHANGE MASTER "" TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT, MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
CHANGE MASTER "" TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT, MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
START
SLAVE
;
START
ALL SLAVES
;
include/rpl_end.inc
include/rpl_end.inc
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