diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2003-04-22 10:00:18 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-04-22 10:00:18 +0000 |
| commit | 2cc0f1f9a20d270a130c313e8e039f12980beab0 (patch) | |
| tree | 41c4cefd949af4f0c5e68ad8666499c0fed54904 /dev-db | |
| parent | fixes to comments (diff) | |
| download | historical-2cc0f1f9a20d270a130c313e8e039f12980beab0.tar.gz historical-2cc0f1f9a20d270a130c313e8e039f12980beab0.tar.bz2 historical-2cc0f1f9a20d270a130c313e8e039f12980beab0.zip | |
Fixes bug #18833
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mysql/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-db/mysql/files/mysql-4.0.rc6 | 4 | ||||
| -rw-r--r-- | dev-db/mysql/files/mysql.init | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 6fc1c811aba2..1182176b80d4 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,9 +1,14 @@ # ChangeLog for dev-db/mysql # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.45 2003/04/06 16:26:54 zwelch Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.46 2003/04/22 10:00:18 robbat2 Exp $ *mysql-4.0.12 (22 Mar 2003) + 22 Apr 2003; Robin Johnson <robbat2@gentoo.org> files/mysql-4.0.rc6, + files/mysql.init: + Change dir=`awk...` line to use sed instead in a more reliable manner + fixes bug #18833 + 06 Apr 2003; Zach Welch <zwelch@gentoo.org> mysql-4.0.12.ebuild: add arm keyword diff --git a/dev-db/mysql/files/mysql-4.0.rc6 b/dev-db/mysql/files/mysql-4.0.rc6 index d4806ce8abda..0f01962a9c37 100644 --- a/dev-db/mysql/files/mysql-4.0.rc6 +++ b/dev-db/mysql/files/mysql-4.0.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.rc6,v 1.4 2003/02/14 22:39:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.rc6,v 1.5 2003/04/22 10:00:18 robbat2 Exp $ depend() { need net @@ -13,7 +13,7 @@ checkconfig() { eerror "No /etc/mysql/my.cnf file exists!" fi - dir=`awk '{ if ( $0 ~ /^datadir[ \t]+=/ ) { print $3 } }' < /etc/mysql/my.cnf` + dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"` if [ ! -d $dir/mysql ] ; then eerror "You dont appear to have the mysql database installed yet." diff --git a/dev-db/mysql/files/mysql.init b/dev-db/mysql/files/mysql.init index cedf0efc5716..8b636a0b1fdb 100644 --- a/dev-db/mysql/files/mysql.init +++ b/dev-db/mysql/files/mysql.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.4 2003/02/14 22:39:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.5 2003/04/22 10:00:18 robbat2 Exp $ depend() { need net @@ -13,7 +13,7 @@ checkconfig() { eerror "No /etc/mysql/my.cnf file exists!" fi - dir=`awk '{ if ( $0 ~ /^datadir[ \t]+=/ ) { print $3 } }' < /etc/mysql/my.cnf` + dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"` if [ ! -d $dir/mysql ] ; then eerror "You dont appear to have the mysql database installed yet." |