Skip to content

Commit ffd45c8

Browse files
committed
Revert "Exclude older configuration options that are no longer supported on newer versions of MariaDB."
This reverts commit 0a1fc38.
1 parent 5a320bb commit ffd45c8

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

templates/my.cnf.j2

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,8 @@ relay-log-index = relay-bin.index
7878
{% endif %}
7979
{% endif %}
8080

81-
{% if mysql_daemon == 'mysql' or (mysql_daemon == 'mariadb' and mysql_cli_version is version('11.0', '<')) %}
8281
# Disabling symbolic-links is recommended to prevent assorted security risks
8382
symbolic-links = 0
84-
{% endif %}
8583

8684
# User is ignored when systemd is used (fedora >= 15).
8785
user = mysql
@@ -99,7 +97,7 @@ read_rnd_buffer_size = {{ mysql_read_rnd_buffer_size }}
9997
myisam_sort_buffer_size = {{ mysql_myisam_sort_buffer_size }}
10098
thread_cache_size = {{ mysql_thread_cache_size }}
10199
{% if (mysql_daemon == 'mysql' and mysql_cli_version is version('8.0', '<')) or
102-
(mysql_daemon == 'mariadb' and mysql_cli_version is version('10.9', '<')) %}
100+
mysql_daemon == 'mariadb' %}
103101
query_cache_type = {{ mysql_query_cache_type }}
104102
query_cache_size = {{ mysql_query_cache_size }}
105103
query_cache_limit = {{ mysql_query_cache_limit }}

0 commit comments

Comments
 (0)