[arch-commits] Commit in mysql/repos (3 files)

[Douglas Soares de Andrade]

    Date: Wednesday, March 18, 2009 @ 06:57:41
  Author: douglas
Revision: 30281

Merged revisions 30280 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/mysql/trunk

........
  r30280 | douglas | 2009-03-18 07:57:04 -0300 (Qua, 18 Mar 2009) | 1 line
  
  upgpkg: mysql 5.0.77-3
........

Modified:
  mysql/repos/extra-i686/	(properties)
  mysql/repos/extra-i686/PKGBUILD
  mysql/repos/extra-i686/mysqld

----------+
 PKGBUILD |    9 +++++++--
 mysqld   |   22 +++++++++-------------
 2 files changed, 16 insertions(+), 15 deletions(-)


Property changes on: mysql/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mysql/trunk:1-29569
   + /mysql/trunk:1-30280

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-18 10:57:04 UTC (rev 30280)
+++ extra-i686/PKGBUILD	2009-03-18 10:57:41 UTC (rev 30281)
@@ -4,7 +4,7 @@
 
 pkgname=mysql
 pkgver=5.0.77
-pkgrel=2
+pkgrel=3
 pkgdesc="A fast SQL database server"
 arch=(i686 x86_64)
 backup=(etc/my.cnf etc/conf.d/mysqld)
@@ -52,6 +52,11 @@
 }
 md5sums=('6c30a20c9059daf053a301e927eb1667'
          'c227818b5157bf2bdb4dd4bd549f2df8'
-         'f62172921e5f39ff3c659cdf682cc532'
+         '247e9fa664bccaca62ca0e42a6cfae20'
          '0ee035590ffc61d32de994f461fd2bd2'
          '4a9077fc95ec6db1d5420e0cdc74d31c')
+md5sums=('6c30a20c9059daf053a301e927eb1667'
+         'c227818b5157bf2bdb4dd4bd549f2df8'
+         '247e9fa664bccaca62ca0e42a6cfae20'
+         '0ee035590ffc61d32de994f461fd2bd2'
+         '4a9077fc95ec6db1d5420e0cdc74d31c')

Modified: extra-i686/mysqld
===================================================================
--- extra-i686/mysqld	2009-03-18 10:57:04 UTC (rev 30280)
+++ extra-i686/mysqld	2009-03-18 10:57:41 UTC (rev 30281)
@@ -8,12 +8,7 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-getPID() {
-   if [ -f $MYSQLD_ROOT/$HOSTNAME.pid ]; then
-       echo `pidof -o %PPID /usr/sbin/mysqld`;
-   fi
-}
-
+PID=`pidof -o %PPID /usr/sbin/mysqld`
 if [ ! `egrep '^mysql:' /etc/group` ]; then
   stat_busy "Adding mysql group"
   groupadd -g 89 mysql
@@ -22,31 +17,32 @@
 if [ ! `egrep '^mysql:' /etc/passwd` ]; then
   stat_busy "Adding mysql user"
   useradd -u 89 -g mysql -d $MYSQLD_ROOT -s /bin/false mysql
-  [ -d $MYSQLD_ROOT ] && chown -R mysql:mysql $MYSQLD_ROOT
+  [ -d $MYSQLD_ROOT ] && chown -R mysql.mysql $MYSQLD_ROOT
   stat_done
 fi
 
 if [ ! -d $MYSQLD_ROOT ]; then
   mkdir $MYSQLD_ROOT
   /usr/bin/mysql_install_db --datadir=$MYSQLD_ROOT --user=mysql
-  chown -R mysql:mysql $MYSQLD_ROOT
+  chown -R mysql.mysql $MYSQLD_ROOT
 fi
 
 case "$1" in
   start)
     stat_busy "Starting MySQL"
-    if [ -z "$(getPID)" ]; then
+    if [ -z "$PID" ]; then
        /usr/bin/mysqld_safe --datadir=$MYSQLD_ROOT &>/dev/null &
       if [ $? -gt 0 ]; then
         stat_fail
         exit 1
       else
         sleep 1 # wait on children
-        if [ -z "$(getPID)" ]; then
+        PID=`pidof -o %PPID /usr/sbin/mysqld`
+        if [ -z "$PID" ]; then
           stat_fail
           exit 1
         else
-          echo $(getPID) >/var/run/mysqld.pid
+          echo $PID >/var/run/mysqld.pid
           add_daemon mysqld
           stat_done
         fi
@@ -59,8 +55,8 @@
 
   stop)
     stat_busy "Stopping MySQL"
-    if [ ! -z "$(getPID)" ]; then
-      kill $(getPID) &> /dev/null      
+    if [ ! -z "$PID" ]; then
+      kill $PID &> /dev/null      
       if [ $? -gt 0 ]; then
         stat_fail
         exit 1