| 1 |
commit: 6299b59049946059e63fa02c74edb2547a063b48 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net> |
| 3 |
AuthorDate: Thu Nov 17 21:43:28 2011 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 17 21:43:28 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6299b590 |
| 7 |
|
| 8 |
Port in fix by dev-zero from tree for bug #388673, so that emerge --config mysql works properly again. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql-v2.eclass | 2 +- |
| 12 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
| 15 |
index d556230..de9a79e 100644 |
| 16 |
--- a/eclass/mysql-v2.eclass |
| 17 |
+++ b/eclass/mysql-v2.eclass |
| 18 |
@@ -640,7 +640,7 @@ mysql-v2_pkg_config() { |
| 19 |
help_tables="${TMPDIR}/fill_help_tables.sql" |
| 20 |
|
| 21 |
pushd "${TMPDIR}" &>/dev/null |
| 22 |
- "${EROOT}/usr/bin/mysql_install_db --basedir=/usr" >"${TMPDIR}"/mysql_install_db.log 2>&1 |
| 23 |
+ "${EROOT}/usr/bin/mysql_install_db" --basedir=/usr >"${TMPDIR}"/mysql_install_db.log 2>&1 |
| 24 |
if [ $? -ne 0 ]; then |
| 25 |
grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 |
| 26 |
die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" |
Archives