Attachment 85777 Details for Bug 122063 – file.diff

[patch] file.diff

file.diff (text/plain), 1.50 KB, created by Christopher Sean Hilton on 2008-03-25 04:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher Sean Hilton

Created: 2008-03-25 04:40:03 UTC

Size: 1.50 KB

patch

obsolete

>--- mysql-server.sh.in	2008-03-25 00:10:14.000000000 -0400
>+++ mysql-server.sh.in.orig	2008-03-25 00:02:58.000000000 -0400
>@@ -18,8 +18,6 @@
> #			Base database directory.
> # mysql_args (str):	Custom additional arguments to be passed
> #			to mysqld_safe (default empty).
>-# mysql_conn_socket (str): Defaults to "/tmp/mysql.sock"
>-#                          The unix domain socket the daemon listens on.
> #
> 
> . %%RC_SUBR%%
>@@ -32,17 +30,15 @@
> : ${mysql_enable="NO"}
> : ${mysql_limits="NO"}
> : ${mysql_dbdir="/var/db/mysql"}
>-: ${mysql_conn_socket="/tmp/mysql.sock"}
> : ${mysql_args=""}
> 
> mysql_user="mysql"
> mysql_limits_args="-e -U ${mysql_user}"
> pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
> command="%%PREFIX%%/bin/mysqld_safe"
>-command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
>+command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null &"
> procname="%%PREFIX%%/libexec/mysqld"
> start_precmd="${name}_prestart"
>-start_cmd="${name}_start"
> mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
> mysql_install_db_args="--ldata=${mysql_dbdir}"
> 
>@@ -64,19 +60,4 @@
> 	fi
> }
> 
>-mysql_start()
>-{
>-	local timeout=15
>-
>-	echo "Starting ${name}"
>-
>-	${command} ${command_args} < /dev/null > /dev/null 2>&1 &
>-	while [ ! -S "${mysql_conn_socket}" -a ${timeout} -gt 0 ]; do
>-		timeout=$(( timeout - 1 ))
>-		sleep 1
>-	done
>-
>-	return 0
>-}
>-
> run_rc_command "$1"

Actions: View | Diff

Attachments on bug 122063: 85777