Skip to content
Snippets Groups Projects
Verified Commit fcd5db18 authored by Michal Hrusecky's avatar Michal Hrusecky :mouse:
Browse files

MariaDB Fix polishing patch

parent 41fcf7a1
No related branches found
No related tags found
No related merge requests found
......@@ -39,9 +39,9 @@ index abc99fc7a..e19e343ab 100644
start_service() {
- local conf='/etc/mysql/my.cnf'
- local datadir="$( sed -nE "s/^\s*datadir\s*=\s*('([^']*)'|\x22([^\x22]*)\x22|(.*\S))\s*$/\2\3\4/p" "$conf" )"
+ local datadir="$(/usr/sbin/mysqld --help --verbose | sed -n 's|^[[:blank:]]*datadir[[:blank:]]*/|/|p')"
+ local pidfile="$(/usr/sbin/mysqld --help --verbose | sed -n 's|^[[:blank:]]*pid-file[[:blank:]]*/|/|p')"
+ local socketfile="$(/usr/sbin/mysqld --help --verbose | sed -n 's|^[[:blank:]]*socket[[:blank:]]*/|/|p')"
+ local datadir="$(/usr/bin/mysqld --help --verbose | sed -n 's|^[[:blank:]]*datadir[[:blank:]]*/|/|p')"
+ local pidfile="$(/usr/bin/mysqld --help --verbose | sed -n 's|^[[:blank:]]*pid-file[[:blank:]]*/|/|p')"
+ local socketfile="$(/usr/bin/mysqld --help --verbose | sed -n 's|^[[:blank:]]*socket[[:blank:]]*/|/|p')"
[ -d "$datadir" ] || {
$LOGGER "datadir '$datadir' in '$conf' does not exist"
......@@ -65,7 +65,7 @@ index abc99fc7a..e19e343ab 100644
- procd_set_param pidfile /var/run/mysqld.pid
# forward stderr to logd
procd_set_param stderr 1
+ procd_set_param user "$my_user"
+ procd_set_param user "$my_user"
procd_close_instance
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment