[arch-commits] Commit in mysql/repos (3 files)
Douglas Soares de Andrade
douglas at archlinux.org
Mon Jan 26 11:32:37 UTC 2009
Date: Monday, January 26, 2009 @ 06:32:37
Author: douglas
Revision: 25307
Merged revisions 25306 via svnmerge from
svn+ssh://archlinux.org/srv/svn-packages/mysql/trunk
........
r25306 | douglas | 2009-01-26 09:31:59 -0200 (Seg, 26 Jan 2009) | 1 line
upgpkg: mysql 5.0.75-3
........
Modified:
mysql/repos/extra-i686/ (properties)
mysql/repos/extra-i686/PKGBUILD
mysql/repos/extra-i686/mysqld
----------+
PKGBUILD | 4 ++--
mysqld | 11 +++++++----
2 files changed, 9 insertions(+), 6 deletions(-)
Property changes on: mysql/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /mysql/trunk:1-25097
+ /mysql/trunk:1-25306
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-01-26 11:31:59 UTC (rev 25306)
+++ extra-i686/PKGBUILD 2009-01-26 11:32:37 UTC (rev 25307)
@@ -3,7 +3,7 @@
# Contributor: judd <jvinet at zeroflux.org>
pkgname=mysql
pkgver=5.0.75
-pkgrel=2
+pkgrel=3
pkgdesc="A fast SQL database server"
arch=(i686 x86_64)
backup=(etc/my.cnf etc/conf.d/mysqld)
@@ -50,6 +50,6 @@
}
md5sums=('a234f0a60a7f8c290d9875cba3a2c5a2'
'e892aac36cbeb57f0e003ec0936afb3b'
- '4a37c296cbb00dbdf47df3502bdd2099'
+ '25a4de5954fbdb758cb03cb6a3e0fde3'
'0ee035590ffc61d32de994f461fd2bd2'
'4a9077fc95ec6db1d5420e0cdc74d31c')
Modified: extra-i686/mysqld
===================================================================
--- extra-i686/mysqld 2009-01-26 11:31:59 UTC (rev 25306)
+++ extra-i686/mysqld 2009-01-26 11:32:37 UTC (rev 25307)
@@ -9,9 +9,12 @@
. /etc/rc.d/functions
getPID() {
- if [ -f $MYSQLD_ROOT/$HOSTNAME.pid ]; then
- echo `cat $MYSQLD_ROOT/$HOSTNAME.pid`
- fi
+ if [ -f $MYSQLD_ROOT/$HOSTNAME.pid ]; then
+ echo `cat $MYSQLD_ROOT/$HOSTNAME.pid`
+ else
+ PID=`pidof -o %PPID /usr/sbin/mysqld`
+ echo $PID
+ fi
}
if [ ! `egrep '^mysql:' /etc/group` ]; then
@@ -46,7 +49,7 @@
stat_fail
exit 1
else
- cp $MYSQLD_ROOT/$HOSTNAME.pid /var/run/mysqld.pid
+ cp $MYSQLD_ROOT/$HOSTNAME.pid /var/run/mysqld.pid 2> /dev/null
add_daemon mysqld
stat_done
fi
More information about the arch-commits
mailing list