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
24624070
Commit
24624070
authored
Apr 18, 2002
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
parents
9b59e430
ff924d23
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
sql/slave.cc
sql/slave.cc
+2
-0
No files found.
sql/slave.cc
View file @
24624070
...
@@ -1115,6 +1115,7 @@ static inline int add_relay_log(RELAY_LOG_INFO* rli,LOG_INFO* linfo)
...
@@ -1115,6 +1115,7 @@ static inline int add_relay_log(RELAY_LOG_INFO* rli,LOG_INFO* linfo)
static
bool
wait_for_relay_log_space
(
RELAY_LOG_INFO
*
rli
)
static
bool
wait_for_relay_log_space
(
RELAY_LOG_INFO
*
rli
)
{
{
bool
slave_killed
;
bool
slave_killed
;
LINT_INIT
(
slave_killed
);
MASTER_INFO
*
mi
=
rli
->
mi
;
MASTER_INFO
*
mi
=
rli
->
mi
;
const
char
*
save_proc_info
;
const
char
*
save_proc_info
;
THD
*
thd
=
mi
->
io_thd
;
THD
*
thd
=
mi
->
io_thd
;
...
@@ -2579,6 +2580,7 @@ Log_event* next_event(RELAY_LOG_INFO* rli)
...
@@ -2579,6 +2580,7 @@ Log_event* next_event(RELAY_LOG_INFO* rli)
goto
err
;
goto
err
;
}
}
rli
->
relay_log_pos
=
4
;
rli
->
relay_log_pos
=
4
;
rli
->
pending
=
0
;
strnmov
(
rli
->
relay_log_name
,
rli
->
linfo
.
log_file_name
,
strnmov
(
rli
->
relay_log_name
,
rli
->
linfo
.
log_file_name
,
sizeof
(
rli
->
relay_log_name
));
sizeof
(
rli
->
relay_log_name
));
flush_relay_log_info
(
rli
);
flush_relay_log_info
(
rli
);
...
...
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