database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.0-galera' into 10.1

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-12-23 10:42:55 -05:00
parent 8efdfc8b58 89a264809d
commit 000eba94f5
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_reload.cc
View File

@ -310,6 +310,16 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
}
}
#ifdef WITH_WSREP
if (thd && thd->wsrep_applier)
{
/*
In case of applier thread, do not wait for table share(s) to be
removed from table definition cache.
*/
options|= REFRESH_FAST;
}
#endif
if (close_cached_tables(thd, tables,
((options & REFRESH_FAST) ? FALSE : TRUE),
(thd ? thd->variables.lock_wait_timeout :