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_reload.cc | |
| parent | b04f848176b0d8af41eb3627ba1b6ed4dd3327e3 (diff) | |
| download | mariadb-git-3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98.tar.gz | |
cleanup: galera merge, simple changes
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index 797c9779994..91d412a0c39 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -253,7 +253,6 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options, } if (options & REFRESH_CHECKPOINT) disable_checkpoints(thd); -#ifdef WITH_WSREP /* We need to do it second time after wsrep appliers were blocked in make_global_read_lock_block_commit(thd) above since they could have @@ -263,7 +262,6 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options, close_cached_tables(thd, tables, (options & REFRESH_FAST) ? FALSE : TRUE, TRUE)) result= 1; -#endif /* WITH_WSREP */ } else { |