Skip to content

Commit 7a0a482

Browse files
committed
Merge pull request geerlingguy#108 from geerlingguy/63-ubuntu-xenial
Fixes geerlingguy#63: Running role on Ubuntu 15/16.04 fails.
2 parents 9b3c7c8 + ab21fa1 commit 7a0a482

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

defaults/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,10 @@ mysql_max_connections: 151
4848
# Other settings.
4949
mysql_wait_timeout: 28800
5050

51-
# Try number of CPU's * 2 for thread_concurrency.
52-
mysql_thread_concurrency: 2
53-
5451
# InnoDB settings.
5552
# Set .._buffer_pool_size up to 80% of RAM but beware of setting too high.
5653
mysql_innodb_file_per_table: "1"
5754
mysql_innodb_buffer_pool_size: "256M"
58-
mysql_innodb_additional_mem_pool_size: "20M"
5955
# Set .._log_file_size to 25% of buffer pool size.
6056
mysql_innodb_log_file_size: "64M"
6157
mysql_innodb_log_buffer_size: "8M"

tasks/configure.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,19 @@
4242
mode: 0644
4343
when: mysql_slow_query_log_enabled
4444

45+
- name: Create error log file (if configured).
46+
shell: "touch {{ mysql_log_error }} creates={{ mysql_log_error }}"
47+
when: mysql_log == "" and mysql_log_error != ""
48+
49+
- name: Set ownership on error log file (if configured).
50+
file:
51+
path: "{{ mysql_log_error }}"
52+
state: file
53+
owner: mysql
54+
group: mysql
55+
mode: 0644
56+
when: mysql_slow_query_log_enabled
57+
4558
- name: Ensure MySQL is started and enabled on boot.
4659
service: "name={{ mysql_daemon }} state=started enabled={{ mysql_enabled_on_startup }}"
4760
register: mysql_service_configuration

templates/my.cnf.j2

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,9 @@ max_connections = {{ mysql_max_connections }}
7878
# Other settings.
7979
wait_timeout = {{ mysql_wait_timeout }}
8080

81-
# Try number of CPU's * 2 for thread_concurrency.
82-
thread_concurrency = {{ mysql_thread_concurrency }}
83-
8481
# InnoDB settings.
8582
innodb_file_per_table = {{ mysql_innodb_file_per_table }}
8683
innodb_buffer_pool_size = {{ mysql_innodb_buffer_pool_size }}
87-
innodb_additional_mem_pool_size = {{ mysql_innodb_additional_mem_pool_size }}
8884
innodb_log_file_size = {{ mysql_innodb_log_file_size }}
8985
innodb_log_buffer_size = {{ mysql_innodb_log_buffer_size }}
9086
innodb_flush_log_at_trx_commit = {{ mysql_innodb_flush_log_at_trx_commit }}

0 commit comments

Comments
 (0)