summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeemu Ollakka <teemu.ollakka@galeracluster.com>2015-03-18 21:17:31 +0200
committerNirbhay Choubey <nirbhay@mariadb.com>2015-03-30 19:56:07 -0400
commita261975d3961e578faf81bba2646e8c88c8b73cf (patch)
tree9433f88fa6ac1cc7e0e2d9028111b53df9aefc86
parent7e1c4b17132c075cc04abc573b4594e3d4df53aa (diff)
downloadmariadb-git-bb-5.5-galera-merge.tar.gz
codership/mysql-wsrep#67 - total order isolation for FLUSHbb-5.5-galera-merge
The following FLUSH commands are now executed under total order isolation: * FLUSH DES_KEY_FILE * FLUSH HOSTS * FLUSH PRIVILEGES * FLUSH QUERY CACHE * FLUSH STATUS * FLUSH USER_RESOURCES This patch was backported from mysql-wsrep/5.6 commit cdea608d9a27701d76d0deec49976aa0a08b1a56
-rw-r--r--sql/sql_parse.cc15
1 files changed, 15 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index c931a02661e..1b965b080e0 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -4119,6 +4119,21 @@ end_with_restore_list:
break;
}
+#ifdef WITH_WSREP
+ if (lex->type & (
+ REFRESH_GRANT |
+ REFRESH_HOSTS |
+ REFRESH_DES_KEY_FILE |
+#ifdef HAVE_QUERY_CACHE
+ REFRESH_QUERY_CACHE_FREE |
+#endif /* HAVE_QUERY_CACHE */
+ REFRESH_STATUS |
+ REFRESH_USER_RESOURCES))
+ {
+ WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL)
+ }
+#endif /* WITH_WSREP*/
+
/*
reload_acl_and_cache() will tell us if we are allowed to write to the
binlog or not.