From 3d4882feb280330b2adc571626fcbb22e267ed9f Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sun, 30 Apr 2017 13:58:18 +1000 Subject: [PATCH] Remove compile warning - "this" canot be null /home/travis/build/MariaDB/server/sql/sql_class.cc:1941:15: warning: 'this' pointer cannot be null in well-defined C++ code; pointer may be assumed to always convert to true [-Wundefined-bool-conversion] if (this && WSREP(this) && wsrep_thd_is_BF(this, FALSE)) ^~~~ ~~ --- sql/sql_class.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sql_class.cc b/sql/sql_class.cc index eeac6ef1eee..68006b7c1e9 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2011,7 +2011,7 @@ bool THD::notify_shared_lock(MDL_context_owner *ctx_in_use, if (!thd_table->needs_reopen()) { signalled|= mysql_lock_abort_for_thread(this, thd_table); - if (this && WSREP(this) && wsrep_thd_is_BF(this, FALSE)) + if (WSREP(this) && wsrep_thd_is_BF(this, FALSE)) { WSREP_DEBUG("remove_table_from_cache: %llu", (unsigned long long) this->real_id);