rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add more group names for server's my.cnf

Browse Source
This commit is contained in:
Honza Horak 2014-07-21 09:53:36 +02:00
parent 2c4d13cefc
commit 626b71dbfc
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mariadb-scripts-common
View File

@ -38,19 +38,21 @@ get_mysql_option(){
# must correspond with values defined in mysqld_safe script and source # must correspond with values defined in mysqld_safe script and source
# code itself. # code itself.
get_mysql_option mysqld datadir "/var/lib/mysql" server_sections="mysqld_safe mysqld server mariadb"
get_mysql_option "$server_sections" datadir "/var/lib/mysql"
datadir="$result" datadir="$result"
# if there is log_error in the my.cnf, my_print_defaults still # if there is log_error in the my.cnf, my_print_defaults still
# returns log-error # returns log-error
# log-error might be defined in mysqld_safe and mysqld sections, # log-error might be defined in mysqld_safe and mysqld sections,
# the former has bigger priority # the former has bigger priority
get_mysql_option "mysqld_safe mysqld" log-error "`hostname`.err" get_mysql_option "$server_sections" log-error "`hostname`.err"
errlogfile="$result" errlogfile="$result"
get_mysql_option mysqld socket "/var/lib/mysql/mysql.sock" get_mysql_option "$server_sections" socket "/var/lib/mysql/mysql.sock"
socketfile="$result" socketfile="$result"
get_mysql_option mysqld_safe pid-file "`hostname`.pid" get_mysql_option "$server_sections" pid-file "`hostname`.pid"
pidfile="$result" pidfile="$result"

1
mariadb.spec
View File

@ -853,6 +853,7 @@ fi
- Improve error message when log file is not writable - Improve error message when log file is not writable
- Compile all binaries with full RELRO (RHBZ#1092548) - Compile all binaries with full RELRO (RHBZ#1092548)
- Use modern symbol filtering with compatible backup - Use modern symbol filtering with compatible backup
- Add more groupnames for server's my.cnf
* Wed Jun 18 2014 Mikko Tiihonen <mikko.tiihonen@iki.fi> - 1:10.0.12-2 * Wed Jun 18 2014 Mikko Tiihonen <mikko.tiihonen@iki.fi> - 1:10.0.12-2
- Use -fno-delete-null-pointer-checks to avoid segfaults with gcc 4.9 - Use -fno-delete-null-pointer-checks to avoid segfaults with gcc 4.9