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

[Andrea Scarpino]

    Date: Tuesday, April 13, 2010 @ 06:44:34
  Author: andrea
Revision: 77444

removed conf.d/mysql; mysqld_safe takes datadir from my.cnf

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysqld
Deleted:
  mysql/trunk/mysqld.conf.d

---------------+
 PKGBUILD      |   10 +++++-----
 mysqld        |    9 ++-------
 mysqld.conf.d |    1 -
 3 files changed, 7 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-13 10:32:23 UTC (rev 77443)
+++ PKGBUILD	2010-04-13 10:44:34 UTC (rev 77444)
@@ -13,12 +13,11 @@
 makedepends=('tcp_wrappers' 'zlib' 'perl' 'openssl' 'libtool' 'patch')
 options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz"
-        'mysqld' 'my.cnf' 'mysqld.conf.d'
+        'mysqld' 'my.cnf'
 	'fix-charsets.patch')
 md5sums=('06b5deb3a13c7600c38ba65b9f7e42c4'
          'a564aaf42e62da454f27b62b7eaf01d5'
          '5b197896a429537fea7cbe52bbe440bc'
-         '0d1e778ddeeaedffa0e63dc3f6e51fc4'
          '117c10003d0df905ce744d62d8c461d4')
 
 build() {
@@ -104,7 +103,7 @@
 
 package_mysql(){
   pkgdesc="A fast SQL database server"
-  backup=('etc/my.cnf' 'etc/mysql/my.cnf' 'etc/conf.d/mysqld')
+  backup=('etc/my.cnf' 'etc/mysql/my.cnf')
   install=mysql.install
   depends=('mysql-clients')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
@@ -113,10 +112,8 @@
   cd ${srcdir}/${pkgbase}-${pkgver}  
   make DESTDIR=${pkgdir} install
 
-  rm -rf ${pkgdir}/usr/{mysql-test,sql-bench,lib,include}
   install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf || return 1
   install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld || return 1
-  install -Dm644 ${srcdir}/mysqld.conf.d ${pkgdir}/etc/conf.d/mysqld || return 1
 
   # create default MYSQLD_ROOT dir and set mysql rights
   install -d ${pkgdir}/var/lib/mysql || return 1
@@ -128,4 +125,7 @@
   
   # provided by mysql-clients
   rm -f ${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+
+  # not needed
+  rm -rf ${pkgdir}/usr/{mysql-test,sql-bench}
 }

Modified: mysqld
===================================================================
--- mysqld	2010-04-13 10:32:23 UTC (rev 77443)
+++ mysqld	2010-04-13 10:44:34 UTC (rev 77444)
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-MYSQLD_ROOT="/var/lib/mysql"
-
-# source application-specific settings
-[ -f /etc/conf.d/mysqld ] && . /etc/conf.d/mysqld
-
 # general config
 . /etc/rc.conf
 . /etc/rc.d/functions
@@ -21,7 +16,7 @@
       chown mysql:mysql /var/run/mysqld &>/dev/null
     fi
     if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --datadir=$MYSQLD_ROOT &>/dev/null &
+       /usr/bin/mysqld_safe &>/dev/null &
       if [ $? -gt 0 ]; then
         stat_fail
         exit 1
@@ -68,7 +63,7 @@
 
   restart)
     $0 stop
-    sleep 3
+    sleep 5
     $0 start
     ;;
   *)

Deleted: mysqld.conf.d
===================================================================
--- mysqld.conf.d	2010-04-13 10:32:23 UTC (rev 77443)
+++ mysqld.conf.d	2010-04-13 10:44:34 UTC (rev 77444)
@@ -1 +0,0 @@
-#MYSQLD_ROOT="/var/lib/mysql"