diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-05 10:48:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-05 10:48:03 +0200 |
| commit | 4e7b382d3132e6be0e597d19d6467a9f58b459a7 (patch) | |
| tree | d4b3816306cfb922de1e593386ecbf38492922ed /sql/wsrep_mysqld.h | |
| parent | 348ccb6f038a6c108ab9b6a01bdc356cefecd3d4 (diff) | |
| parent | 758af98ff7c47cc1fb5debdc138312fa389d528f (diff) | |
| download | mariadb-git-4e7b382d3132e6be0e597d19d6467a9f58b459a7.tar.gz | |
Merge 10.1 to 10.2
Most conflicts are related to the MDEV-11638 InnoDB shutdown refactoring.
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 04ccc1a7e45..0332432a199 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -178,7 +178,7 @@ extern wsrep_seqno_t wsrep_locked_seqno; strcmp(wsrep_provider, WSREP_NONE)) #define WSREP(thd) \ - (WSREP_ON && wsrep && (thd && thd->variables.wsrep_on)) + (WSREP_ON && thd->variables.wsrep_on) #define WSREP_CLIENT(thd) \ (WSREP(thd) && thd->wsrep_client_thread) |