diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-09-17 14:59:39 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-09-17 14:59:39 -0400 |
| commit | c4356bfccb972a3b1a8798ba552c92881a3f74e1 (patch) | |
| tree | abcf0c816a0fd9118929ccf5d72cb9b0392ec5f7 /sql | |
| parent | cf180e7f3d075beac02964d23773631edb0423b8 (diff) | |
| download | mariadb-git-c4356bfccb972a3b1a8798ba552c92881a3f74e1.tar.gz | |
MDEV-6447: Galera: Enable QC
* Added galera/query_cache test
* Merged patch for lp:1296403
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/wsrep_check_opts.cc | 4 | ||||
| -rw-r--r-- | sql/wsrep_mysqld.cc | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/sql/wsrep_check_opts.cc b/sql/wsrep_check_opts.cc index 5ec18c79978..75894061d3f 100644 --- a/sql/wsrep_check_opts.cc +++ b/sql/wsrep_check_opts.cc @@ -44,8 +44,10 @@ static struct opt opts[] = { "wsrep_sst_receive_address","AUTO"}, // mysqld.cc { "binlog_format", "ROW" }, // mysqld.cc { "wsrep_provider", "none" }, // mysqld.cc +#if 0 { "query_cache_type", "0" }, // mysqld.cc { "query_cache_size", "0" }, // mysqld.cc +#endif { "locked_in_memory", "0" }, // mysqld.cc { "wsrep_cluster_address", "0" }, // mysqld.cc { "locks_unsafe_for_binlog", "0" }, // ha_innodb.cc @@ -61,8 +63,10 @@ enum WSREP_SST_RECEIVE_ADDRESS, BINLOG_FORMAT, WSREP_PROVIDER, +#if 0 QUERY_CACHE_TYPE, QUERY_CACHE_SIZE, +#endif LOCKED_IN_MEMORY, WSREP_CLUSTER_ADDRESS, LOCKS_UNSAFE_FOR_BINLOG, diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index f2ef776e5a0..d59c9cd65d0 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -254,7 +254,13 @@ wsrep_view_handler_cb (void* app_ctx, wsrep_cluster_size, wsrep_local_index, view->proto_ver); /* Proceed further only if view is PRIMARY */ - if (WSREP_VIEW_PRIMARY != view->status) { + if (WSREP_VIEW_PRIMARY != view->status) + { +#ifdef HAVE_QUERY_CACHE + // query cache must be initialised by now + query_cache.flush(); +#endif /* HAVE_QUERY_CACHE */ + wsrep_ready_set(FALSE); new_status= WSREP_MEMBER_UNDEFINED; /* Always record local_uuid and local_seqno in non-prim since this |