Skip to content

Commit 66ec3f7

Browse files
committed
changelog in README, replace default my.cnf with 10.1 version
1 parent 1128222 commit 66ec3f7

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The container also has mysqltuner included which can either be run from within t
6060

6161

6262
## Versions
63-
+ **09.03.2016:** Change to use custom.cnf over my.cnf in /config. Restructured init files to change config options on startup, rather than in the dockerfile.
63+
+ **09.03.2016:** Update to mariadb 10.1. Change to use custom.cnf over my.cnf in /config. Restructured init files to change config options on startup, rather than in the dockerfile.
6464
+ **26.01.2016:** Change user of mysqld_safe script to abc, better unclean shutdown handling on restart.
6565
+ **23.12.2015:** Remove autoupdating, between some version updates the container breaks
6666
+ **12.08.2015:** Initial Release.

defaults/my.cnf

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## custom configuration file, please be aware that changing options here may break things
1+
## custom configuration file, please be aware that changing options here may break things
22

33
[mysqld_safe]
44
nice = 0
@@ -13,13 +13,12 @@ sort_buffer_size = 4M
1313
bulk_insert_buffer_size = 16M
1414
tmp_table_size = 32M
1515
max_heap_table_size = 32M
16-
1716
#
1817
# * MyISAM
1918
#
2019
# This replaces the startup script and checks MyISAM tables if needed
2120
# the first time they are touched. On error, make copy and try a repair.
22-
myisam_recover = BACKUP
21+
myisam_recover_options = BACKUP
2322
key_buffer_size = 128M
2423
#open-files-limit = 2000
2524
table_open_cache = 400
@@ -108,13 +107,33 @@ innodb_flush_method = O_DIRECT
108107
# ssl-cert=/etc/mysql/server-cert.pem
109108
# ssl-key=/etc/mysql/server-key.pem
110109

110+
#
111+
# * Galera-related settings
112+
#
113+
[galera]
114+
# Mandatory settings
115+
#wsrep_on=ON
116+
#wsrep_provider=
117+
#wsrep_cluster_address=
118+
#binlog_format=row
119+
#default_storage_engine=InnoDB
120+
#innodb_autoinc_lock_mode=2
121+
#
122+
# Allow server to accept connections on all interfaces.
123+
#
124+
#bind-address=0.0.0.0
125+
#
126+
# Optional setting
127+
#wsrep_slave_threads=1
128+
#innodb_flush_log_at_trx_commit=0
129+
111130
[mysqldump]
112131
quick
113132
quote-names
114133
max_allowed_packet = 16M
115134

116135
[mysql]
117-
#no-auto-rehash # faster start of mysql but no tab completition
136+
#no-auto-rehash # faster start of mysql but no tab completion
118137

119138
[isamchk]
120139
key_buffer_size = 16M

0 commit comments

Comments
 (0)