Skip to content

Commit 0e3170e

Browse files
Fix galera tests part II(Fix previous commit)
1 parent 10d7a2f commit 0e3170e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

sql/sql_class.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2177,7 +2177,7 @@ bool THD::notify_shared_lock(MDL_context_owner *ctx_in_use,
21772177
#ifdef WITH_WSREP
21782178
{
21792179
signalled|= mysql_lock_abort_for_thread(this, thd_table);
2180-
if (this && WSREP(this) && wsrep_thd_is_BF((void *)this, FALSE))
2180+
if (WSREP(this) && wsrep_thd_is_BF((void *)this, FALSE))
21812181
{
21822182
WSREP_DEBUG("remove_table_from_cache: %llu",
21832183
(unsigned long long) this->real_id);

sql/wsrep_mysqld.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ extern wsrep_seqno_t wsrep_locked_seqno;
207207
strcmp(wsrep_provider, WSREP_NONE))
208208

209209
#define WSREP(thd) \
210-
(WSREP_ON && wsrep && (thd->variables.wsrep_on))
210+
(WSREP_ON && wsrep && (thd && thd->variables.wsrep_on))
211211

212212
#define WSREP_CLIENT(thd) \
213213
(WSREP(thd) && thd->wsrep_client_thread)

0 commit comments

Comments
 (0)