diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 14:24:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 14:24:41 +0300 |
| commit | 2e12d471eab9db77473ec80637f8d0d2d03bf69f (patch) | |
| tree | eea2f8df98e8ccbd28d59b75706f44330fd4407d /sql/wsrep_mysqld.h | |
| parent | 61c0df94655f2dc3146456e49f3f51610251e79f (diff) | |
| parent | c06845d6f04e092b64c105eb6786056cea2ab593 (diff) | |
| download | mariadb-git-2e12d471eab9db77473ec80637f8d0d2d03bf69f.tar.gz | |
Merge 10.2 into 10.3
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 395dabb39be..55ea032e835 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) |