From 3d0775e9af2fcf3fe92b7f19e299ea23068eca1e Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Tue, 27 Mar 2012 16:16:44 +0200
Subject: mdev-201 - Assertion `!thd->spcont' failed in net_send_error on
 server shutdown

bug in semisync plugin. It didn't check thd->killed before waiting on mysys->current_cond,
and thus an attepmt to kill the thread (on shutdown) was lost

plugin/semisync/semisync_master.cc:
  mdev:201 lp:962540
---
 sql/sql_class.cc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sql/sql_class.cc')

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index d7d0c8d3f68..988c8b48c64 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -3735,6 +3735,9 @@ void THD::restore_backup_open_tables_state(Open_tables_backup *backup)
 
 extern "C" int thd_killed(const MYSQL_THD thd)
 {
+  if (!thd)
+    thd= current_thd;
+
   if (!(thd->killed & KILL_HARD_BIT))
     return 0;
   return thd->killed;
-- 
cgit v1.2.1