mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge branch '10.1' into 10.2
Revert commit db0917f68f
, because the fix for MDEV-12696
is coming from 5.5 and 10.1 in this merge.
This commit is contained in:
@ -1938,7 +1938,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);
|
||||
|
Reference in New Issue
Block a user