View | Details | Raw Unified | Return to bug 122063
Collapse All | Expand All

(-)mysql-server.sh.in.orig (-20 / +1 lines)
Lines 18-25 Link Here
18
#			Base database directory.
18
#			Base database directory.
19
# mysql_args (str):	Custom additional arguments to be passed
19
# mysql_args (str):	Custom additional arguments to be passed
20
#			to mysqld_safe (default empty).
20
#			to mysqld_safe (default empty).
21
# mysql_conn_socket (str): Defaults to "/tmp/mysql.sock"
22
#                          The unix domain socket the daemon listens on.
23
#
21
#
24
22
25
. %%RC_SUBR%%
23
. %%RC_SUBR%%
Lines 32-48 Link Here
32
: ${mysql_enable="NO"}
30
: ${mysql_enable="NO"}
33
: ${mysql_limits="NO"}
31
: ${mysql_limits="NO"}
34
: ${mysql_dbdir="/var/db/mysql"}
32
: ${mysql_dbdir="/var/db/mysql"}
35
: ${mysql_conn_socket="/tmp/mysql.sock"}
36
: ${mysql_args=""}
33
: ${mysql_args=""}
37
34
38
mysql_user="mysql"
35
mysql_user="mysql"
39
mysql_limits_args="-e -U ${mysql_user}"
36
mysql_limits_args="-e -U ${mysql_user}"
40
pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
37
pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
41
command="%%PREFIX%%/bin/mysqld_safe"
38
command="%%PREFIX%%/bin/mysqld_safe"
42
command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
39
command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null &"
43
procname="%%PREFIX%%/libexec/mysqld"
40
procname="%%PREFIX%%/libexec/mysqld"
44
start_precmd="${name}_prestart"
41
start_precmd="${name}_prestart"
45
start_cmd="${name}_start"
46
mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
42
mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
47
mysql_install_db_args="--ldata=${mysql_dbdir}"
43
mysql_install_db_args="--ldata=${mysql_dbdir}"
48
44
Lines 64-82 Link Here
64
	fi
60
	fi
65
}
61
}
66
62
67
mysql_start()
68
{
69
	local timeout=15
70
71
	echo "Starting ${name}"
72
73
	${command} ${command_args} < /dev/null > /dev/null 2>&1 &
74
	while [ ! -S "${mysql_conn_socket}" -a ${timeout} -gt 0 ]; do
75
		timeout=$(( timeout - 1 ))
76
		sleep 1
77
	done
78
79
	return 0
80
}
81
82
run_rc_command "$1"
63
run_rc_command "$1"

Return to bug 122063