diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-23 10:42:55 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-23 10:42:55 -0500 |
| commit | 000eba94f50da12f154b734f2a36f5f37ecd6b4f (patch) | |
| tree | 61f1c1382e205ab05240d1f275b4d31c8754b98e /sql/sql_reload.cc | |
| parent | 8efdfc8b58a84f8e8d62f0bb8b31f5b763664c06 (diff) | |
| parent | 89a264809d660fb5a4e7d43e9324b1f529a3a1d7 (diff) | |
| download | mariadb-git-000eba94f50da12f154b734f2a36f5f37ecd6b4f.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index 1796d4549c7..089f60a2dd8 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -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 : |