Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 85095
Collapse All | Expand All

(-)/etc/init.d/mysql (-5 / +5 lines)
Lines 20-26 Link Here
20
	#dir=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
20
	#dir=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
21
	#dir=`my_print_defaults mysqld | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
21
	#dir=`my_print_defaults mysqld | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
22
	local mysqld_cnf="`my_print_defaults --config-file=${MY_CNF} mysqld`"
22
	local mysqld_cnf="`my_print_defaults --config-file=${MY_CNF} mysqld`"
23
	dir=`echo "${mysqld_cnf}" | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
23
	datadir=`echo "${mysqld_cnf}" | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
24
	pid_file=`echo "${mysqld_cnf}" | sed -ne '/pid-file/s|^--pid-file=||p' | tail -n1`
24
	pid_file=`echo "${mysqld_cnf}" | sed -ne '/pid-file/s|^--pid-file=||p' | tail -n1`
25
	
25
	
26
	# push these out to the script
26
	# push these out to the script
Lines 28-34 Link Here
28
}
28
}
29
29
30
checkconfig() {
30
checkconfig() {
31
	getconfig
31
	getconfig /usr/bin/mysqld_safe
32
	if [ -z "$datadir" ]; then
32
	if [ -z "$datadir" ]; then
33
		eerror "Your mysql doesn't have any datadir setting, default or specific"
33
		eerror "Your mysql doesn't have any datadir setting, default or specific"
34
		eerror "Please check your my.cnf : ${MY_CNF}"
34
		eerror "Please check your my.cnf : ${MY_CNF}"
Lines 43-59 Link Here
43
}
43
}
44
44
45
start() {
45
start() {
46
	getconfig
46
	getconfig /usr/bin/mysqld_safe
47
	checkconfig || return 1
47
	checkconfig || return 1
48
	ebegin "Starting mysqld (${MY_NAME})"
48
	ebegin "Starting mysqld (${MY_NAME})"
49
	start-stop-daemon --start --quiet --pidfile=${pid_file}
49
	start-stop-daemon --start --quiet --pidfile=${pid_file} \
50
		--exec /usr/bin/mysqld_safe \
50
		--exec /usr/bin/mysqld_safe \
51
		--background --defaults-file=${MY_CNF} -- >/dev/null 2>&1
51
		--background --defaults-file=${MY_CNF} -- >/dev/null 2>&1
52
	eend $?
52
	eend $?
53
}
53
}
54
54
55
stop () {
55
stop () {
56
	getconfig
56
	getconfig /usr/bin/mysqld_safe
57
	ebegin "Stopping mysqld (${MY_NAME})"
57
	ebegin "Stopping mysqld (${MY_NAME})"
58
	start-stop-daemon --stop --retry 5 --quiet --pidfile=${pid_file}
58
	start-stop-daemon --stop --retry 5 --quiet --pidfile=${pid_file}
59
	eend $?
59
	eend $?

Return to bug 85095