diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-10-09 18:28:14 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-10-09 18:28:14 -0400 |
commit | 542968cf0a68070d7b45859a3148a602e2089a35 (patch) | |
tree | 889399fd2c19496137b61cb7e9131d371763ee09 /sql/wsrep_mysqld.h | |
parent | 068fb8569f2300e4a5c08413a756417d923ecf5f (diff) | |
download | mariadb-git-542968cf0a68070d7b45859a3148a602e2089a35.tar.gz |
bzr merge -r4015..4026 codership/5.5
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 28643af3718..dd47d4dc1a4 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -194,7 +194,7 @@ extern wsrep_seqno_t wsrep_locked_seqno; (global_system_variables.wsrep_on) #define WSREP(thd) \ - (WSREP_ON && (thd && thd->variables.wsrep_on)) + (WSREP_ON && wsrep && (thd && thd->variables.wsrep_on)) #define WSREP_CLIENT(thd) \ (WSREP(thd) && thd->wsrep_client_thread) |