diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-04-13 01:33:24 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-04-13 01:33:24 +0300 |
| commit | 2fc1ec43560b453b4694adbc1aac11f3f23b1761 (patch) | |
| tree | 880c3875dae28574a90bf891ef901027723d21f6 /sql/sql_reload.cc | |
| parent | 51c77ec5d406843bb8c8131f0687f4f75839d045 (diff) | |
| download | mariadb-git-2fc1ec43560b453b4694adbc1aac11f3f23b1761.tar.gz | |
Initial push of codership-wsrep API implementation for MariaDB.
Merge of:
lp:maria/5.5, #3334: http://bazaar.launchpad.net/~maria-captains/maria/5.5/revision/3334
lp:codership-mysql/5.5, #3725: http://bazaar.launchpad.net/~codership/codership-mysql/wsrep-5.5/revision/3725
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index d2f118b62c9..cb33110d9eb 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -224,7 +224,18 @@ bool reload_acl_and_cache(THD *thd, unsigned 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 + modified the tables too. + */ + if (WSREP(thd) && + close_cached_tables(thd, tables, (options & REFRESH_FAST) ? + FALSE : TRUE, TRUE)) + result= 1; +#endif /* WITH_WSREP */ + } else { if (thd && thd->locked_tables_mode) |