1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).

This commit is contained in:
Nirbhay Choubey
2014-03-25 14:42:15 -04:00
parent 3c0b3babd9
commit 3088d52c20
13 changed files with 93 additions and 99 deletions

View File

@@ -8830,7 +8830,7 @@ bool mysql_notify_thread_having_shared_lock(THD *thd, THD *in_use,
#ifdef WITH_WSREP
{
signalled|= mysql_lock_abort_for_thread(thd, thd_table);
if (thd && WSREP(thd) && wsrep_thd_is_brute_force((void *)thd))
if (thd && WSREP(thd) && wsrep_thd_is_BF((void *)thd, true))
{
WSREP_DEBUG("remove_table_from_cache: %llu",
(unsigned long long) thd->real_id);