Skip to content

Commit 8b3af56

Browse files
committed
Adjust file_format setting as well.
1 parent e87dc05 commit 8b3af56

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

defaults/main.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ mysql_max_connections: 151
5050
mysql_wait_timeout: 28800
5151

5252
# InnoDB settings.
53-
mysql_innodb_large_prefix: "1"
54-
mysql_innodb_file_format: "barracuda"
5553
mysql_innodb_file_per_table: "1"
5654
# Set .._buffer_pool_size up to 80% of RAM but beware of setting too high.
5755
mysql_innodb_buffer_pool_size: "256M"
@@ -61,6 +59,10 @@ mysql_innodb_log_buffer_size: "8M"
6159
mysql_innodb_flush_log_at_trx_commit: "1"
6260
mysql_innodb_lock_wait_timeout: 50
6361

62+
# These settings require MySQL > 5.5.
63+
mysql_innodb_large_prefix: "1"
64+
mysql_innodb_file_format: "barracuda"
65+
6466
# mysqldump settings.
6567
mysql_mysqldump_max_allowed_packet: "64M"
6668

templates/my.cnf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ wait_timeout = {{ mysql_wait_timeout }}
8484
# InnoDB settings.
8585
{% if mysql_supports_innodb_large_prefix %}
8686
innodb_large_prefix = {{ mysql_innodb_large_prefix }}
87-
{% endif %}
8887
innodb_file_format = {{ mysql_innodb_file_format }}
88+
{% endif %}
8989
innodb_file_per_table = {{ mysql_innodb_file_per_table }}
9090
innodb_buffer_pool_size = {{ mysql_innodb_buffer_pool_size }}
9191
innodb_log_file_size = {{ mysql_innodb_log_file_size }}

0 commit comments

Comments
 (0)