Merge pull request #371 from grooverdan/10.1-wsrep-this_not_null

Jan Lindström · web-flow · commit 6b8225ffe670 · 2017-05-02T16:28:25.000+03:00
Remove compile warning - "this" canot be null
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -2011,7 +2011,7 @@ bool THD::notify_shared_lock(MDL_context_owner *ctx_in_use,`
`2011`	`2011`	`if (!thd_table->needs_reopen())`
`2012`	`2012`	`{`
`2013`	`2013`	`signalled\|= mysql_lock_abort_for_thread(this, thd_table);`
`2014`		`- if (this && WSREP(this) && wsrep_thd_is_BF(this, FALSE))`
	`2014`	`+ if (WSREP(this) && wsrep_thd_is_BF(this, FALSE))`
`2015`	`2015`	`{`
`2016`	`2016`	`WSREP_DEBUG("remove_table_from_cache: %llu",`
`2017`	`2017`	`(unsigned long long) this->real_id);`