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
083347db
Commit
083347db
authored
Jul 07, 2006
by
mats@romeo.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into romeo.(none):/home/bkroot/mysql-5.1-new-rpl
parents
f7d0091d
723faeab
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
537 additions
and
538 deletions
+537
-538
sql/slave.cc
sql/slave.cc
+537
-538
No files found.
sql/slave.cc
View file @
083347db
...
...
@@ -3533,15 +3533,12 @@ err:
write_ignored_events_info_to_relay_log
(
thd
,
mi
);
thd
->
proc_info
=
"Waiting for slave mutex on exit"
;
pthread_mutex_lock
(
&
mi
->
run_lock
);
mi
->
slave_running
=
0
;
mi
->
io_thd
=
0
;
/* Forget the relay log's format */
delete
mi
->
rli
.
relay_log
.
description_event_for_queue
;
mi
->
rli
.
relay_log
.
description_event_for_queue
=
0
;
// TODO: make rpl_status part of MASTER_INFO
change_rpl_status
(
RPL_ACTIVE_SLAVE
,
RPL_IDLE_SLAVE
);
mi
->
abort_slave
=
0
;
// TODO: check if this is needed
DBUG_ASSERT
(
thd
->
net
.
buff
!=
0
);
net_end
(
&
thd
->
net
);
// destructor will not free it, because net.vio is 0
close_thread_tables
(
thd
,
0
);
...
...
@@ -3552,6 +3549,9 @@ err:
pthread_cond_broadcast
(
&
mi
->
stop_cond
);
// tell the world we are done
pthread_mutex_unlock
(
&
mi
->
run_lock
);
my_thread_end
();
mi
->
abort_slave
=
0
;
mi
->
slave_running
=
0
;
mi
->
io_thd
=
0
;
pthread_exit
(
0
);
DBUG_RETURN
(
0
);
// Can't return anything here
}
...
...
@@ -5106,4 +5106,3 @@ template class I_List_iterator<i_string_pair>;
#endif
#endif
/* HAVE_REPLICATION */
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