diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-05-08 16:29:41 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-05-08 16:29:41 +0530 |
| commit | 0e3170e30d2a4e8f1ed6fd4bbe935355f7370a34 (patch) | |
| tree | 5c1031515b70137fbb2b170b94205b212de038e9 /sql | |
| parent | 10d7a2f8e0e9076596ecbe9531d0448837cabf63 (diff) | |
| download | mariadb-git-0e3170e30d2a4e8f1ed6fd4bbe935355f7370a34.tar.gz | |
Fix galera tests part II(Fix previous commit)
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_class.cc | 2 | ||||
| -rw-r--r-- | sql/wsrep_mysqld.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 92bccadc84b..a8db8463e8e 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2177,7 +2177,7 @@ bool THD::notify_shared_lock(MDL_context_owner *ctx_in_use, #ifdef WITH_WSREP { signalled|= mysql_lock_abort_for_thread(this, thd_table); - if (this && WSREP(this) && wsrep_thd_is_BF((void *)this, FALSE)) + if (WSREP(this) && wsrep_thd_is_BF((void *)this, FALSE)) { WSREP_DEBUG("remove_table_from_cache: %llu", (unsigned long long) this->real_id); diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 7f574cb996a..5ec183f7186 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -207,7 +207,7 @@ extern wsrep_seqno_t wsrep_locked_seqno; strcmp(wsrep_provider, WSREP_NONE)) #define WSREP(thd) \ - (WSREP_ON && wsrep && (thd->variables.wsrep_on)) + (WSREP_ON && wsrep && (thd && thd->variables.wsrep_on)) #define WSREP_CLIENT(thd) \ (WSREP(thd) && thd->wsrep_client_thread) |