Merge "Define safe pid-file and socket paths in config"

This commit is contained in:
Jenkins 2016-08-12 16:27:00 +00:00 committed by Gerrit Code Review
commit 2c0f57e541
5 changed files with 18 additions and 5 deletions

View File

@ -1,5 +1,5 @@
HTTP/1.1 200 OK
Content-Type: application/json
Content-Length: 1094
Content-Length: 1135
Date: Mon, 18 Mar 2013 19:09:17 GMT

View File

@ -20,7 +20,8 @@
"max_user_connections": 100,
"myisam-recover-options": "BACKUP,FORCE",
"open_files_limit": 512,
"pid_file": "/var/run/mysqld/mysqld.pid",
"pid-file": "/var/run/mysqld/mysqld.pid",
"socket": "/var/run/mysqld/mysqld.sock",
"port": 3306,
"query_cache_limit": "1M",
"query_cache_size": "8M",

View File

@ -1,7 +1,10 @@
[client]
port = 3306
socket = /var/run/mysqld/mysqld.sock
[mysqld_safe]
pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
nice = 0
[mysqld]
@ -10,7 +13,8 @@ port = 3306
basedir = /usr
datadir = /var/lib/mysql/data
tmpdir = /var/tmp
pid_file = /var/run/mysqld/mysqld.pid
pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
skip-external-locking = 1
key_buffer_size = {{ (50 * flavor['ram']/512)|int }}M
max_allowed_packet = {{ (1024 * flavor['ram']/512)|int }}K

View File

@ -1,7 +1,10 @@
[client]
port = 3306
socket = /var/run/mysqld/mysqld.sock
[mysqld_safe]
pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
nice = 0
[mysqld]
@ -10,7 +13,8 @@ port = 3306
basedir = /usr
datadir = /var/lib/mysql/data
tmpdir = /var/tmp
pid_file = /var/run/mysqld/mysqld.pid
pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
skip-external-locking = 1
key_buffer_size = {{ (50 * flavor['ram']/512)|int }}M
max_allowed_packet = {{ (1024 * flavor['ram']/512)|int }}K

View File

@ -1,7 +1,10 @@
[client]
port = 3306
socket = /var/run/mysqld/mysqld.sock
[mysqld_safe]
pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
nice = 0
[mysqld]
@ -10,7 +13,8 @@ port = 3306
basedir = /usr
datadir = /var/lib/mysql/data
tmpdir = /var/tmp
pid_file = /var/run/mysqld/mysqld.pid
pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
skip-external-locking = 1
key_buffer_size = {{ (50 * flavor['ram']/512)|int }}M
max_allowed_packet = {{ (1024 * flavor['ram']/512)|int }}K