From 7ef2d5aa5b5d0179d40bd42afea874235b8b60f8 Mon Sep 17 00:00:00 2001 From: sjaakola Date: Thu, 16 Feb 2017 23:19:10 +0200 Subject: Refs: MW-360 * splitting DROP TABLE query in separate DROP commands for temporary and real tables * not replicating temporary table DROP command * using wsrep_sidno GTID group only for innodb table drop command part all this follows more or less the logic of how mysql wants to split drop table list --- sql/sql_class.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sql/sql_class.h') diff --git a/sql/sql_class.h b/sql/sql_class.h index beef22a8140..8c9b8f92040 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3867,6 +3867,8 @@ public: bool wsrep_skip_append_keys; wsrep_gtid_t wsrep_sync_wait_gtid; ulong wsrep_affected_rows; + bool wsrep_replicate_GTID; + bool wsrep_skip_wsrep_GTID; #endif /* WITH_WSREP */ }; -- cgit v1.2.1 From 91826970c5e5335b9446c4aec8c1369ab97e45a9 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 30 Aug 2017 14:37:16 +0000 Subject: Fix threadpool to report connections aborted due to wait timeout. Update wait_timeout.test to add test case for this. --- sql/sql_class.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sql/sql_class.h') diff --git a/sql/sql_class.h b/sql/sql_class.h index b46467af62e..ba72c46556d 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -492,6 +492,11 @@ enum killed_state KILL_SYSTEM_THREAD_HARD= 15, KILL_SERVER= 16, KILL_SERVER_HARD= 17, + /* + Used in threadpool to signal wait timeout. + */ + KILL_WAIT_TIMEOUT= 18, + KILL_WAIT_TIMEOUT_HARD= 19 }; -- cgit v1.2.1