Attachment 168567 Details for Bug 206998 – Fixed rc-script (mysql_install_db), added configureable mysql_confdir option to rc-script

[patch] Fixed rc-script (mysql_install_db), added configureable mysql_confdir option to rc-script

03_bugid_206998_fix_rc_file_add_confdir.diff (text/plain), 2.67 KB, created by Markus Kohlmeyer on 2016-03-24 14:48:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2016-03-24 14:48:04 UTC

Size: 2.67 KB

patch

obsolete

>diff -Naur mysql57-server/Makefile mysql57-server/Makefile
>--- mysql57-server/Makefile	2016-03-24 13:20:48.777681000 +0100
>+++ mysql57-server/Makefile	2016-03-24 13:28:34.285622000 +0100
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mysql
> PORTVERSION=	5.7.11
>-PORTREVISION?=	1
>+PORTREVISION?=	2
> CATEGORIES=	databases ipv6
> MASTER_SITES=	MYSQL/MySQL-5.7
> PKGNAMESUFFIX?=	57-server
>diff -Naur mysql57-server/files/mysql-server.in mysql57-server/files/mysql-server.in
>--- mysql57-server/files/mysql-server.in	2016-03-24 12:49:23.871084000 +0100
>+++ mysql57-server/files/mysql-server.in	2016-03-24 13:35:33.097900000 +0100
>@@ -16,8 +16,10 @@
> #			just before mysql starts.
> # mysql_dbdir (str):	Default to "/var/db/mysql"
> #			Base database directory.
>+# mysql_confdir (str):	Default to "${mysql_dbdir}"
>+#			Base configuration directory.
> # mysql_optfile (str):	Server-specific option file.
>-#			Default to "${mysql_dbdir}/my.cnf".
>+#			Default to "${mysql_confdir}/my.cnf".
> # mysql_pidfile (str):	Custum PID file path and name.
> #			Default to "${mysql_dbdir}/${hostname}.pid".
> # mysql_args (str):	Custom additional arguments to be passed
>@@ -34,29 +36,29 @@
> : ${mysql_enable="NO"}
> : ${mysql_limits="NO"}
> : ${mysql_dbdir="/var/db/mysql"}
>-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
>+: ${mysql_confdir="${mysql_dbdir}"}
>+: ${mysql_optfile="${mysql_confdir}/my.cnf"}
> 
> mysql_user="mysql"
> mysql_limits_args="-e -U ${mysql_user}"
> : ${hostname:=`/bin/hostname`}
> pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
> command="/usr/sbin/daemon"
>-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} %%PERFSCHEMRC%%"
>+command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%PERFSCHEMRC%%"
> procname="%%PREFIX%%/libexec/mysqld"
> start_precmd="${name}_prestart"
> start_postcmd="${name}_poststart"
> mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
>-mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname}"
>+mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user}"
> 
> mysql_create_auth_tables()
> {
> 	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
>-        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
> }
> 
> mysql_prestart()
> {
>-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
>+	if [ ! -d "${mysql_dbdir}/mysql" ]; then
> 		mysql_create_auth_tables || return 1
> 	fi
> 	if checkyesno mysql_limits; then

Actions: View | Diff

Attachments on bug 206998: 166699 | 166705 | 166778 | 166801 | 166802 | 166853 | 166996 | 166997 | 167010 | 167027 | 168565 | 168566 | 168567 | 168568 | 168570 | 168572 | 169320 | 169321 | 169324 | 169325 | 169343 | 169433 | 169437 | 169592 | 169598 | 169982 | 169994 | 170041