[arch-commits] Commit in mysql/trunk (PKGBUILD mysqld)

[Douglas Soares de Andrade]

    Date: Monday, January 26, 2009 @ 06:31:59
  Author: douglas
Revision: 25306

upgpkg: mysql 5.0.75-3

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysqld

----------+
 PKGBUILD |    4 ++--
 mysqld   |   11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-26 03:11:33 UTC (rev 25305)
+++ PKGBUILD	2009-01-26 11:31:59 UTC (rev 25306)
@@ -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: mysqld
===================================================================
--- mysqld	2009-01-26 03:11:33 UTC (rev 25305)
+++ mysqld	2009-01-26 11:31:59 UTC (rev 25306)
@@ -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