diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 11:33:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 11:33:45 +0300 |
| commit | 4e1fa7f63da580c1e0e4256bc4af3c02cdc51939 (patch) | |
| tree | 6ac1589c98dbf15a465365f4f16a09da51ea8c48 /sql/wsrep_mysqld.h | |
| parent | ff81faf670e083e1da4f3e7bce33fe9104410b2c (diff) | |
| parent | 2f3968d98f8d90a9a9747e5b89c8f07efc6732e8 (diff) | |
| download | mariadb-git-4e1fa7f63da580c1e0e4256bc4af3c02cdc51939.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index fb46cda7019..e50f869a363 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -99,11 +99,12 @@ enum enum_wsrep_OSU_method { enum enum_wsrep_sync_wait { WSREP_SYNC_WAIT_NONE = 0x0, - // show, select, begin + // select, begin WSREP_SYNC_WAIT_BEFORE_READ = 0x1, WSREP_SYNC_WAIT_BEFORE_UPDATE_DELETE = 0x2, WSREP_SYNC_WAIT_BEFORE_INSERT_REPLACE = 0x4, - WSREP_SYNC_WAIT_MAX = 0x7 + WSREP_SYNC_WAIT_BEFORE_SHOW = 0x8, + WSREP_SYNC_WAIT_MAX = 0xF }; // MySQL status variables @@ -218,6 +219,8 @@ void wsrep_log(void (*fun)(const char *, ...), const char *format, ...); #define WSREP_PROVIDER_EXISTS \ (wsrep_provider && strncasecmp(wsrep_provider, WSREP_NONE, FN_REFLEN)) +#define WSREP_QUERY(thd) (thd->query()) + extern void wsrep_ready_wait(); class Ha_trx_info; |