[arch-commits] Commit in mysql/repos (3 files)
Douglas Soares de Andrade
douglas at archlinux.org
Fri Jan 23 02:38:01 UTC 2009
Date: Thursday, January 22, 2009 @ 21:38:01
Author: douglas
Revision: 25098
Merged revisions 25097 via svnmerge from
svn+ssh://archlinux.org/srv/svn-packages/mysql/trunk
........
r25097 | douglas | 2009-01-23 00:37:16 -0200 (Sex, 23 Jan 2009) | 1 line
upgpkg: mysql 5.0.75-2
........
Modified:
mysql/repos/extra-i686/ (properties)
mysql/repos/extra-i686/PKGBUILD
mysql/repos/extra-i686/mysqld
----------+
PKGBUILD | 4 ++--
mysqld | 18 +++++++++++-------
2 files changed, 13 insertions(+), 9 deletions(-)
Property changes on: mysql/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /mysql/trunk:1-23594
+ /mysql/trunk:1-25097
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-01-23 02:37:16 UTC (rev 25097)
+++ extra-i686/PKGBUILD 2009-01-23 02:38:01 UTC (rev 25098)
@@ -3,7 +3,7 @@
# Contributor: judd <jvinet at zeroflux.org>
pkgname=mysql
pkgver=5.0.75
-pkgrel=1
+pkgrel=2
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'
- '247e9fa664bccaca62ca0e42a6cfae20'
+ '4a37c296cbb00dbdf47df3502bdd2099'
'0ee035590ffc61d32de994f461fd2bd2'
'4a9077fc95ec6db1d5420e0cdc74d31c')
Modified: extra-i686/mysqld
===================================================================
--- extra-i686/mysqld 2009-01-23 02:37:16 UTC (rev 25097)
+++ extra-i686/mysqld 2009-01-23 02:38:01 UTC (rev 25098)
@@ -8,7 +8,12 @@
. /etc/rc.conf
. /etc/rc.d/functions
-PID=`pidof -o %PPID /usr/sbin/mysqld`
+getPID() {
+ if [ -f $MYSQLD_ROOT/$HOSTNAME.pid ]; then
+ echo `cat $MYSQLD_ROOT/$HOSTNAME.pid`
+ fi
+}
+
if [ ! `egrep '^mysql:' /etc/group` ]; then
stat_busy "Adding mysql group"
groupadd -g 89 mysql
@@ -30,19 +35,18 @@
case "$1" in
start)
stat_busy "Starting MySQL"
- if [ -z "$PID" ]; then
+ if [ -z "$(getPID)" ]; then
/usr/bin/mysqld_safe --datadir=$MYSQLD_ROOT &>/dev/null &
if [ $? -gt 0 ]; then
stat_fail
exit 1
else
sleep 1 # wait on children
- PID=`pidof -o %PPID /usr/sbin/mysqld`
- if [ -z "$PID" ]; then
+ if [ -z "$(getPID)" ]; then
stat_fail
exit 1
else
- echo $PID >/var/run/mysqld.pid
+ cp $MYSQLD_ROOT/$HOSTNAME.pid /var/run/mysqld.pid
add_daemon mysqld
stat_done
fi
@@ -55,8 +59,8 @@
stop)
stat_busy "Stopping MySQL"
- if [ ! -z "$PID" ]; then
- kill $PID &> /dev/null
+ if [ ! -z "$(getPID)" ]; then
+ kill $(getPID) &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
exit 1
More information about the arch-commits
mailing list