From 2d20a19f12843d4a474600609777af94507dec1d Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Tue, 27 Feb 2018 21:55:10 +0200
Subject: [PATCH] MXS-1475 Act accordingly if cache disabled

If caching is dynamically disabled, then CACHE_USE_AND_POPULATE is
turned into CACHE_POPULATE leading to the cache being refreshed but
not used.
---
 server/modules/filter/cache/cachefiltersession.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/modules/filter/cache/cachefiltersession.cc b/server/modules/filter/cache/cachefiltersession.cc
index ad43bf46f..ba1600e56 100644
--- a/server/modules/filter/cache/cachefiltersession.cc
+++ b/server/modules/filter/cache/cachefiltersession.cc
@@ -890,6 +890,12 @@ CacheFilterSession::cache_action_t CacheFilterSession::get_cache_action(GWBUF* p
         }
     }
 
+    if (!m_enabled && (action == CACHE_USE_AND_POPULATE))
+    {
+        action = CACHE_POPULATE;
+        zReason = "usage disabled";
+    }
+
     if (log_decisions())
     {
         char* pSql;