Skip to content

Commit a11d7b3

Browse files
authored
Merge pull request geerlingguy#385 from nkakouros-forks/mode
Allow mysql_mode to be set to the empty string
2 parents 86ffba8 + 22c390e commit a11d7b3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ mysql_port: "3306"
4141
mysql_bind_address: '0.0.0.0'
4242
mysql_skip_name_resolve: false
4343
mysql_datadir: /var/lib/mysql
44-
mysql_sql_mode: ''
44+
mysql_sql_mode: ~
4545
# The following variables have a default value depending on operating system.
4646
# mysql_pid_file: /var/run/mysqld/mysqld.pid
4747
# mysql_socket: /var/lib/mysql/mysql.sock

templates/my.cnf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pid-file = {{ mysql_pid_file }}
1414
{% if mysql_skip_name_resolve %}
1515
skip-name-resolve
1616
{% endif %}
17-
{% if mysql_sql_mode %}
17+
{% if mysql_sql_mode is not none %}
1818
sql_mode = {{ mysql_sql_mode }}
1919
{% endif %}
2020

0 commit comments

Comments
 (0)