diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 08:47:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 08:47:55 +0300 |
| commit | 6749d39a954c84bc4610acf6e5337c484afcde9a (patch) | |
| tree | 0b5dd374810ca9d9ffbd1efc3aeda19ceb02f349 /sql/sql_class.h | |
| parent | c02d61bc11ee06b6043e6db9a15d00b9f40bce1f (diff) | |
| parent | 1b41a54fc98dab0e05523c36b53bd62d7e7f28b4 (diff) | |
| download | mariadb-git-6749d39a954c84bc4610acf6e5337c484afcde9a.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 1872cd9c1a8..d3b59be2ce1 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -477,6 +477,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 }; @@ -4394,6 +4399,8 @@ public: bool wsrep_ignore_table; wsrep_gtid_t wsrep_sync_wait_gtid; ulong wsrep_affected_rows; + bool wsrep_replicate_GTID; + bool wsrep_skip_wsrep_GTID; #endif /* WITH_WSREP */ /* Handling of timeouts for commands */ |