radityo
/
ansible-mysql
mirror of https://github.com/HanXHX/ansible-mysql.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't use certain settings for MariaDB 10.0+ (they're deprecated)

pull/17/head
Jasper N. Brouwer 2017-06-28 21:03:37 +02:00
parent 49af5781ca
commit df36764106
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/etc/mysql/my.cnf.j2
View File

@ -26,7 +26,9 @@ log-error = {{ mysql_log_error }}
{% if mysql_slow_query_log_enabled %} {% if mysql_slow_query_log_enabled %}
# Slow query log configuration. # Slow query log configuration.
{% if mysql_vendor != 'mariadb' or mysql_mariadb_version | version_compare('10.0', '<') %}
log_slow_queries = 1 log_slow_queries = 1
{% endif %}
slow_query_log = 1 slow_query_log = 1
slow_query_log_file = {{ mysql_slow_query_log_file }} slow_query_log_file = {{ mysql_slow_query_log_file }}
long_query_time = {{ mysql_slow_query_time }} long_query_time = {{ mysql_slow_query_time }}
@ -61,7 +63,7 @@ thread_concurrency = {{ mysql_thread_concurrency }}
# InnoDB settings. # InnoDB settings.
innodb_file_per_table = {{ mysql_innodb_file_per_table }} innodb_file_per_table = {{ mysql_innodb_file_per_table }}
innodb_buffer_pool_size = {{ mysql_innodb_buffer_pool_size }} innodb_buffer_pool_size = {{ mysql_innodb_buffer_pool_size }}
{% if mysql_innodb_additional_mem_pool_size is defined %} {% if mysql_vendor != 'mariadb' or mysql_mariadb_version | version_compare('10.0', '<') %}
innodb_additional_mem_pool_size = {{ mysql_innodb_additional_mem_pool_size }} innodb_additional_mem_pool_size = {{ mysql_innodb_additional_mem_pool_size }}
{% endif %} {% endif %}
#innodb_log_file_size = {{ mysql_innodb_log_file_size }} #innodb_log_file_size = {{ mysql_innodb_log_file_size }}