summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2017-05-02 16:28:25 +0300
committerGitHub <noreply@github.com>2017-05-02 16:28:25 +0300
commit6b8225ffe67066e0c5cbc87efe0d49e43fbaee9a (patch)
treee7b268ccd0a37233ac81c33974ac306363aa3be7
parentacce1f37c2518278a31606c7f1b460ad0ac7347c (diff)
parent3d4882feb280330b2adc571626fcbb22e267ed9f (diff)
downloadmariadb-git-6b8225ffe67066e0c5cbc87efe0d49e43fbaee9a.tar.gz
Merge pull request #371 from grooverdan/10.1-wsrep-this_not_null
Remove compile warning - "this" canot be null
-rw-r--r--sql/sql_class.cc2
1 files changed, 1 insertions, 1 deletions
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);