Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 689412 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/dev-db/mariadb/mariadb-10.4.6.ebuild (-2 / +2 lines)
Lines 62-67 Link Here
62
	"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
62
	"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
63
	"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
63
	"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
64
	"${MY_PATCH_DIR}"/20035_all_mariadb-10.3-atomic-detection.patch
64
	"${MY_PATCH_DIR}"/20035_all_mariadb-10.3-atomic-detection.patch
65
	"$FILESDIR"/mariadb-10.4.6-fix-path.patch
65
)
66
)
66
67
67
# Be warned, *DEPEND are version-dependant
68
# Be warned, *DEPEND are version-dependant
Lines 907-914 Link Here
907
	[[ -f "${cmd}" ]] || cmd=( "${EROOT}/usr/bin/mysql_install_db" )
908
	[[ -f "${cmd}" ]] || cmd=( "${EROOT}/usr/bin/mysql_install_db" )
908
	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
909
	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
909
	einfo "Command: ${cmd[*]}"
910
	einfo "Command: ${cmd[*]}"
910
	su -s /bin/sh -c "${cmd[*]}" mysql \
911
	/bin/sh -c "${cmd[*]}" >"${TMPDIR}"/mysql_install_db.log 2>&1
911
		>"${TMPDIR}"/mysql_install_db.log 2>&1
912
	if [[ $? -ne 0 ]]; then
912
	if [[ $? -ne 0 ]]; then
913
		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
913
		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
914
		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
914
		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"

Return to bug 689412