diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-29 19:46:59 +0200 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-30 21:13:24 +0200 |
commit | ded07724eebb6c3afe882884fbad32e8dc907b0c (patch) | |
tree | d826abf6d2c4e75dc146bb8c7fe3cdefddf3a048 | |
parent | 547ec8ce27c9035e2f0a823866a7e4ed1b02d4c8 (diff) | |
download | mariadb-git-ded07724eebb6c3afe882884fbad32e8dc907b0c.tar.gz |
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.
-rw-r--r-- | sql/sql_cache.cc | 1 |
1 files changed, 1 insertions, 0 deletions
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; } |