summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 7ca3896a69d..0fb563572e0 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -3025,7 +3025,6 @@ public:
void close_active_vio();
#endif
void awake(killed_state state_to_set);
-
/** Disconnect the associated communication endpoint. */
void disconnect();
@@ -3539,6 +3538,14 @@ public:
killed_err= 0;
mysql_mutex_unlock(&LOCK_thd_kill);
}
+
+#ifdef WITH_WSREP
+ mysql_mutex_assert_not_owner(&LOCK_thd_data);
+ mysql_mutex_lock(&LOCK_thd_data);
+ wsrep_killed= false;
+ mysql_mutex_unlock(&LOCK_thd_data);
+#endif /* WITH_WSREP */
+
}
inline void reset_kill_query()
{
@@ -4152,6 +4159,7 @@ public:
*/
bool wsrep_ignore_table;
wsrep_gtid_t wsrep_sync_wait_gtid;
+ bool wsrep_killed; // protected by LOCK_thd_data
ulong wsrep_affected_rows;
bool wsrep_replicate_GTID;
bool wsrep_skip_wsrep_GTID;