Attachment #252909 for bug #339371




	popd &>/dev/null
	[[ -f "${EROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
	|| die "MySQL databases not installed"
	use prefix || chown -R mysql:mysql "${EROOT}/${MY_DATADIR}" 2>/dev/null
	chmod 0750 "${EROOT}/${MY_DATADIR}" 2>/dev/null

	# Figure out which options we need to disable to do the setup

	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
	local mysqld="${EROOT}/usr/sbin/mysqld \
		${options} \
		--user=mysql \
		--basedir=${EROOT}/usr \
		--datadir=${EROOT}/${MY_DATADIR} \
		--max_allowed_packet=8M \


	ebegin "Setting root password"
	# Do this from memory, as we don't want clear text passwords in temp files
	"${EROOT}/usr/bin/mysqladmin" --socket="${socket}" --user=root password "${MYSQL_ROOT_PASSWORD}"
	"${EROOT}/usr/bin/mysql" \
		--socket=${socket} \
		-hlocalhost \
		-e "${sql}"
	eend $?

	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."

Return to bug 339371

Lines 1318-1324 Link Here

(-)mysql.eclass.ori (-7 / +2 lines)
1318	popd &>/dev/null	1318	popd &>/dev/null
1319	[[ -f "${EROOT}/${MY_DATADIR}/mysql/user.frm" ]] \	1319	[[ -f "${EROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
1320	\|\| die "MySQL databases not installed"	1320	\|\| die "MySQL databases not installed"
1321	chown -R mysql:mysql "${EROOT}/${MY_DATADIR}" 2>/dev/null	1321	use prefix \|\| chown -R mysql:mysql "${EROOT}/${MY_DATADIR}" 2>/dev/null
1322	chmod 0750 "${EROOT}/${MY_DATADIR}" 2>/dev/null	1322	chmod 0750 "${EROOT}/${MY_DATADIR}" 2>/dev/null
1323		1323
1324	# Figure out which options we need to disable to do the setup	1324	# Figure out which options we need to disable to do the setup
Lines 1354-1360 Link Here
1354	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"	1354	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
1355	local mysqld="${EROOT}/usr/sbin/mysqld \	1355	local mysqld="${EROOT}/usr/sbin/mysqld \
1356	${options} \	1356	${options} \
1357	--user=mysql \
1358	--basedir=${EROOT}/usr \	1357	--basedir=${EROOT}/usr \
1359	--datadir=${EROOT}/${MY_DATADIR} \	1358	--datadir=${EROOT}/${MY_DATADIR} \
1360	--max_allowed_packet=8M \	1359	--max_allowed_packet=8M \
Lines 1379-1389 Link Here
1379		1378
1380	ebegin "Setting root password"	1379	ebegin "Setting root password"
1381	# Do this from memory, as we don't want clear text passwords in temp files	1380	# Do this from memory, as we don't want clear text passwords in temp files
1382	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"	1381	"${EROOT}/usr/bin/mysqladmin" --socket="${socket}" --user=root password "${MYSQL_ROOT_PASSWORD}"
1383	"${EROOT}/usr/bin/mysql" \
1384	--socket=${socket} \
1385	-hlocalhost \
1386	-e "${sql}"
1387	eend $?	1382	eend $?
1388		1383
1389	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."	1384	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."