diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-08 10:11:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-08 10:11:36 +0300 |
| commit | 1900c2ede547dfac07f92c13e21ee63e0697600e (patch) | |
| tree | 5afa249ca3893fe6bdb440ffdafa281a1b3d3289 /sql/wsrep_mysqld.h | |
| parent | 76db096ae60571bff45f109d889ed033b682e4fa (diff) | |
| parent | 0ba845a8c7e59eec3f7cb84baf924bd5a7190a13 (diff) | |
| download | mariadb-git-1900c2ede547dfac07f92c13e21ee63e0697600e.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index d49e8ce9907..8f20eec0701 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -21,6 +21,7 @@ #ifdef WITH_WSREP extern bool WSREP_ON_; +extern bool WSREP_PROVIDER_EXISTS_; #include <mysql/plugin.h> #include "mysql/service_wsrep.h" @@ -240,7 +241,8 @@ extern wsrep_seqno_t wsrep_locked_seqno; /* use xxxxxx_NNULL macros when thd pointer is guaranteed to be non-null to * avoid compiler warnings (GCC 6 and later) */ -#define WSREP_NNULL(thd) (WSREP_ON && thd->variables.wsrep_on) +#define WSREP_NNULL(thd) \ + (WSREP_PROVIDER_EXISTS_ && thd->variables.wsrep_on) #define WSREP(thd) \ (thd && WSREP_NNULL(thd)) @@ -297,8 +299,7 @@ void WSREP_LOG(void (*fun)(const char* fmt, ...), const char* fmt, ...); WSREP_INFO("context: %s:%d", __FILE__, __LINE__); \ } -#define WSREP_PROVIDER_EXISTS \ - (wsrep_provider && strncasecmp(wsrep_provider, WSREP_NONE, FN_REFLEN)) +#define WSREP_PROVIDER_EXISTS (WSREP_PROVIDER_EXISTS_) static inline bool wsrep_cluster_address_exists() { |