Attachment #522504 for bug #649724

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

Lines 878-884 mysql-multilib-r1_pkg_config() { Link Here

(-)a/eclass/mysql-multilib-r1.eclass (-1 / +1 lines)
878		878
879	# Fix bug 446200. Don't reference host my.cnf, needs to come first,	879	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
880	# see http://bugs.mysql.com/bug.php?id=31312	880	# see http://bugs.mysql.com/bug.php?id=31312
881	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"	881	use prefix && options="${options} --defaults-file=${MY_SYSCONFDIR}/my.cnf"
882		882
883	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"	883	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
884	[[ -r "${help_tables}" ]] \	884	[[ -r "${help_tables}" ]] \

Lines 962-968 mysql-multilib-r1_pkg_config() { Link Here

(-)a/eclass/mysql-multilib-r1.eclass (-1 / +1 lines)
962	#einfo "About to start mysqld: ${mysqld}"	962	#einfo "About to start mysqld: ${mysqld}"
963	ebegin "Starting mysqld"	963	ebegin "Starting mysqld"
964	einfo "Command ${mysqld}"	964	einfo "Command ${mysqld}"
965	${mysqld} &	965	su -s /bin/sh -c "${mysqld}" &
966	rc=$?	966	rc=$?
967	while ! [[ -S "${socket}" \|\| "${maxtry}" -lt 1 ]] ; do	967	while ! [[ -S "${socket}" \|\| "${maxtry}" -lt 1 ]] ; do
968	maxtry=$((${maxtry}-1))	968	maxtry=$((${maxtry}-1))

Return to bug 649724