skip query cache if it's not set,

remove references where it is set to 0
mrlesmithjr · Jan 10, 2024 · eab38b9 · eab38b9
1 parent fd605ea
commit eab38b9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/templates/etc/my.cnf.d/server.cnf.j2 b/templates/etc/my.cnf.d/server.cnf.j2
@@ -2,8 +2,6 @@
 binlog_format=ROW
 default_storage_engine=InnoDB
 innodb_autoinc_lock_mode=2
-query_cache_size=0
-query_cache_type=0
 
 #
 # Allow server to accept connections on this interface

diff --git a/templates/etc/my.cnf.d/server.cnf.temp.j2 b/templates/etc/my.cnf.d/server.cnf.temp.j2
@@ -2,8 +2,6 @@
 binlog_format=ROW
 default_storage_engine=InnoDB
 innodb_autoinc_lock_mode=2
-query_cache_size=0
-query_cache_type=0
 
 #
 # Allow server to accept connections on this interface

diff --git a/templates/etc/mysql/conf.d/galera.cnf.j2 b/templates/etc/mysql/conf.d/galera.cnf.j2
@@ -2,8 +2,6 @@
 binlog_format=ROW
 default_storage_engine=InnoDB
 innodb_autoinc_lock_mode=2
-query_cache_size=0
-query_cache_type=0
 
 #
 # Allow server to accept connections on this interface

diff --git a/templates/etc/mysql/conf.d/galera.cnf.temp.j2 b/templates/etc/mysql/conf.d/galera.cnf.temp.j2
@@ -2,8 +2,6 @@
 binlog_format=ROW
 default_storage_engine=InnoDB
 innodb_autoinc_lock_mode=2
-query_cache_size=0
-query_cache_type=0
 
 #
 # Allow server to accept connections on this interface

diff --git a/templates/etc/mysql/my.cnf.j2 b/templates/etc/mysql/my.cnf.j2
@@ -18,8 +18,12 @@ max_allowed_packet = {{ mariadb_mysql_settings['max_allowed_packet'] }}
 max_binlog_size = {{ mariadb_mysql_settings['max_binlog_size'] }}
 myisam-recover = BACKUP
 port = {{ mariadb_mysql_port }}
+{% if mariadb_mysql_settings['query_cache_limit'] is defined -%}
 query_cache_limit = {{ mariadb_mysql_settings['query_cache_limit'] }}
+{%- endif %}
+{% if mariadb_mysql_settings['query_cache_size'] is defined -%}
 query_cache_size = {{ mariadb_mysql_settings['query_cache_size'] }}
+{%- endif %}
 skip-external-locking
 socket = {{ mariadb_login_unix_socket }}
 thread_cache_size = {{ mariadb_mysql_settings['thread_cache_size'] }}