Merge lp:~sergei.glushchenko/percona-server/5.6-ps-bug1242748 into lp:percona-server/5.6

Proposed by Sergei Glushchenko
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 485
Proposed branch: lp:~sergei.glushchenko/percona-server/5.6-ps-bug1242748
Merge into: lp:percona-server/5.6
Diff against target: 13 lines (+1/-1)
1 file modified
Percona-Server/sql/mysqld.cc (+1/-1)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/5.6-ps-bug1242748
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+192147@code.launchpad.net

Description of the change

invoke post kill notification with thd data mutex held
http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/390/

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/sql/mysqld.cc'
2--- Percona-Server/sql/mysqld.cc 2013-10-17 06:52:00 +0000
3+++ Percona-Server/sql/mysqld.cc 2013-10-22 13:44:50 +0000
4@@ -1495,8 +1495,8 @@
5 tmp->get_command() == COM_BINLOG_DUMP_GTID)
6 {
7 tmp->killed= THD::KILL_CONNECTION;
8+ mysql_mutex_lock(&tmp->LOCK_thd_data);
9 MYSQL_CALLBACK(thread_scheduler, post_kill_notification, (tmp));
10- mysql_mutex_lock(&tmp->LOCK_thd_data);
11 if (tmp->mysys_var)
12 {
13 tmp->mysys_var->abort= 1;

Subscribers

People subscribed via source and target branches