From ded07724eebb6c3afe882884fbad32e8dc907b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <vicentiu@mariadb.org>
Date: Mon, 29 Jan 2018 19:46:59 +0200
Subject: [PATCH] MDEV-15014 Assertion `m_cache_lock_status == LOCKED_NO_WAIT
 || m_cache_status == DISABLE_REQUEST' failed in Query_cache::free_cache on
 startup

The assert guards against not-locked or not-requested query cache
disabling. If during startup we disable query cache, we failed to
request disabling.
---
 sql/sql_cache.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 3fc1edfcb56..6effc376a2f 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -2477,6 +2477,7 @@ void Query_cache::init()
   */
   if (global_system_variables.query_cache_type == 0)
   {
+    m_cache_status= DISABLE_REQUEST;
     free_cache();
     m_cache_status= DISABLED;
   }