diff options
author | Sergei Golubchik <serg@mariadb.org> | 2014-09-25 23:00:45 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-01 23:38:27 +0200 |
commit | 3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98 (patch) | |
tree | d08462d84d10324bd05836c968288d8ab1739e11 /sql/sql_base.cc | |
parent | b04f848176b0d8af41eb3627ba1b6ed4dd3327e3 (diff) | |
download | mariadb-git-3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98.tar.gz |
cleanup: galera merge, simple changes
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 68f325e20ab..00689aad1f3 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -9019,14 +9019,12 @@ bool mysql_notify_thread_having_shared_lock(THD *thd, THD *in_use, if (!thd_table->needs_reopen()) { signalled|= mysql_lock_abort_for_thread(thd, thd_table); -#ifdef WITH_WSREP if (thd && WSREP(thd) && wsrep_thd_is_BF((void *)thd, true)) { WSREP_DEBUG("remove_table_from_cache: %llu", (unsigned long long) thd->real_id); wsrep_abort_thd((void *)thd, (void *)in_use, FALSE); } -#endif } } mysql_mutex_unlock(&in_use->LOCK_thd_data); |