diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 13:28:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 13:28:13 +0300 |
| commit | c06845d6f04e092b64c105eb6786056cea2ab593 (patch) | |
| tree | cfd3f3abc32ab96fb918d3c00ffc68f072ca29bc /sql/wsrep_mysqld.h | |
| parent | 2c5067b6890974d0df335a833ed7a4e4c6ced183 (diff) | |
| parent | edbdfc2f995eb47ba49235195aca00888aeacbc4 (diff) | |
| download | mariadb-git-c06845d6f04e092b64c105eb6786056cea2ab593.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index b8e6f12b900..e28b90885b4 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -181,13 +181,7 @@ extern void wsrep_prepend_PATH (const char* path); /* Other global variables */ extern wsrep_seqno_t wsrep_locked_seqno; -#define WSREP_ON \ - (global_system_variables.wsrep_on) - -#define WSREP_ON_NEW \ - ((global_system_variables.wsrep_on) && \ - wsrep_provider && \ - strcmp(wsrep_provider, WSREP_NONE)) +#define WSREP_ON unlikely(global_system_variables.wsrep_on) #define WSREP(thd) \ (WSREP_ON && thd->variables.wsrep_on) |