[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf mysql.install mysqld)

[Andrea Scarpino]

    Date: Friday, April 23, 2010 @ 17:10:11
  Author: andrea
Revision: 78446

mysql_install_db will create /var/lib/mysql dir; fix skip-locking warning

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/my.cnf
  mysql/trunk/mysql.install
  mysql/trunk/mysqld

---------------+
 PKGBUILD      |   11 +++--------
 my.cnf        |    2 +-
 mysql.install |    3 ++-
 mysqld        |    2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-23 20:26:35 UTC (rev 78445)
+++ PKGBUILD	2010-04-23 21:10:11 UTC (rev 78446)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.1.46
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.mysql.com/"
@@ -15,8 +15,8 @@
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz"
         'mysqld' 'my.cnf')
 md5sums=('04f7c1422199c73a88a3d408b9161b63'
-         'eb4104ab4cf0ba5b5232adaf78427db7'
-         '5b197896a429537fea7cbe52bbe440bc')
+         '92dac61b92253e0878f27318da1dc45f'
+         '0337741fa9afbe57939993636081a827')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -102,7 +102,6 @@
   install=mysql.install
   depends=('mysql-clients')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
-  options=('emptydirs') # we need the empty /var/lib/mysql directory
 
   cd ${srcdir}/${pkgbase}-${pkgver}  
   make DESTDIR=${pkgdir} install
@@ -110,10 +109,6 @@
   install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf || return 1
   install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld || return 1
 
-  # create default MYSQLD_ROOT dir and set mysql rights
-  install -d ${pkgdir}/var/lib/mysql || return 1
-  chown 89:89 ${pkgdir}/var/lib/mysql
-
   # provided by libmysqlclient
   rm -f ${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
   rm -rf ${pkgdir}/usr/{include,lib}

Modified: my.cnf
===================================================================
--- my.cnf	2010-04-23 20:26:35 UTC (rev 78445)
+++ my.cnf	2010-04-23 21:10:11 UTC (rev 78446)
@@ -21,7 +21,7 @@
 port		= 3306
 socket		= /var/run/mysqld/mysqld.sock
 datadir		= /var/lib/mysql
-skip-locking
+skip-external-locking
 key_buffer = 16M
 max_allowed_packet = 1M
 table_cache = 64

Modified: mysql.install
===================================================================
--- mysql.install	2010-04-23 20:26:35 UTC (rev 78445)
+++ mysql.install	2010-04-23 21:10:11 UTC (rev 78446)
@@ -1,7 +1,8 @@
 post_install(){
   groupadd -g 89 mysql &>/dev/null
   useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  usr/bin/mysql_install_db --datadir=var/lib/mysql --user=mysql
+  usr/bin/mysql_install_db --user=mysql
+  chown -R mysql:mysql var/lib/mysql &>/dev/null
 }
 
 post_upgrade(){

Modified: mysqld
===================================================================
--- mysqld	2010-04-23 20:26:35 UTC (rev 78445)
+++ mysqld	2010-04-23 21:10:11 UTC (rev 78446)
@@ -16,7 +16,7 @@
       chown mysql:mysql /var/run/mysqld &>/dev/null
     fi
     if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe &>/dev/null &
+       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
       if [ $? -gt 0 ]; then
         stat_fail
         exit 1