rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

Accepting request 1000486 from home:dspinella:branches:server:database

Browse Source 
- Update mysql-systemd-helper to be aware of custom group, bsc#1200105
- Respect socket setting in mysql-systemd-helper
- Fix my_print_defaults call in mysql-system-helper

OBS-URL: https://build.opensuse.org/request/show/1000486
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=299
This commit is contained in:
Danilo Spinella 2022-08-31 15:10:09 +00:00 committed by Git OBS Bridge
parent 1419babec6
commit db87f8622c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mariadb.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Aug 31 15:06:37 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
- Update mysql-systemd-helper to be aware of custom group, bsc#1200105
- Respect socket setting in mysql-systemd-helper
- Fix my_print_defaults call in mysql-system-helper
-------------------------------------------------------------------
Tue Aug 2 23:36:11 UTC 2022 - chris@computersalat.de

6
mysql-systemd-helper
View File

@ -23,7 +23,7 @@ read_config() {
# Read options - important for multi setup
if [[ -n "$INSTANCE" ]]; then
opts="$(/usr/bin/my_print_defaults mysqld mysqld_multi "$INSTANCE" --defaults-extra-file=/etc/my${INSTANCE}.cnf)"
opts="$(/usr/bin/my_print_defaults --defaults-extra-file=/etc/my${INSTANCE}.cnf mysqld mysqld_multi "$INSTANCE")"
tmp_opts="$opts"
config="/etc/my${INSTANCE}.cnf"
else
@ -39,6 +39,7 @@ read_config() {
--socket=*) socket="$(echo "$arg" | sed -e 's/^[^=]*=//')" ;;
--datadir=*) datadir="$(echo "$arg" | sed -e 's/^[^=]*=//')" ;;
--user=*) mysql_daemon_user="$(echo "$arg" | sed -e 's/^[^=]*=//')" ;;
--group=*) mysql_daemon_group="$(echo "$arg" | sed -e 's/^[^=]*=//')" ;;
esac
done
@ -171,7 +172,8 @@ mysql_start() {
exec /usr/sbin/mysqld \
--defaults-file="$config" \
$ignore_db_dir \
--user="$mysql_daemon_user"
--user="$mysql_daemon_user" \
--socket="$socket"
}
# We rely on output in english at some points