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

cleanup: galera merge, simple changes

Browse Source
This commit is contained in:
Sergei Golubchik
2014-09-25 23:00:45 +02:00
parent b04f848176
commit 3620910eea
69 changed files with 492 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_reload.cc
View File

@ -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
{