mysql: using unmodified arch pkgbuild.

only my.cnf is modified to reflect new data dir since the init scripts no longer allow for dynmic setting of this value.

cache and memory values are back at their default, they can be restored at a later date when things are stable.

1 files changed, 20 insertions, 20 deletions

diff --git a/abs/core-testing/mysql/PKGBUILD b/abs/core-testing/mysql/PKGBUILD
index cd219a2..ed65173 100644
--- a/abs/core-testing/mysql/PKGBUILD
+++ b/abs/core-testing/mysql/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 81345 2010-05-28 20:08:31Z jgc $
+# $Id: PKGBUILD 88432 2010-08-23 17:32:08Z pierre $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.47
-pkgrel=3
+pkgver=5.1.50
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.mysql.com/"
 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
-        skip-abi-check.patch)
+source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz"
+        'mysqld'
+        'my.cnf'
+        'skip-abi-check.patch')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -Np0 -i "${srcdir}/skip-abi-check.patch" || return 1
+  patch -Np0 -i "${srcdir}/skip-abi-check.patch"
   # CFLAGS/CXXFLAGS as suggested upstream
   CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
   CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
@@ -37,8 +37,8 @@ build() {
     --with-embedded-server \
     --with-unix-socket-path=/var/run/mysqld/mysqld.sock \
     --enable-local-infile \
-    --with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,innodb_plugin,ndbcluster || return 1
-  make || return 1
+    --with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,innodb_plugin,ndbcluster
+  make
 }
 
 package_libmysqlclient(){
@@ -47,12 +47,12 @@ package_libmysqlclient(){
   
   cd "${srcdir}/${pkgbase}-${pkgver}"
   for dir in include libmysql libmysql_r libmysqld; do
-    make -C ${dir} DESTDIR="${pkgdir}" install || return 1
+    make -C ${dir} DESTDIR="${pkgdir}" install
   done
-  install -m644 include/*.h "${pkgdir}/usr/include/mysql/" || return 1
+  install -m644 include/*.h "${pkgdir}/usr/include/mysql/"
 
   install -d "${pkgdir}/usr/bin"
-  install -m755 scripts/mysql_config "${pkgdir}/usr/bin/" || return 1
+  install -m755 scripts/mysql_config "${pkgdir}/usr/bin/"
   
   # create library symlinks in /usr/lib
   ln -sf mysql/libmysqlclient.so.16 ${pkgdir}/usr/lib/libmysqlclient.so.16
@@ -68,7 +68,7 @@ package_mysql-clients(){
   depends=('libmysqlclient')
   
   cd "${srcdir}/${pkgbase}-${pkgver}/client"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 
   # provided by libmysqlclient
   rm -rf "${pkgdir}/usr/lib/"
@@ -85,10 +85,10 @@ package_mysql(){
   optdepends=('perl-dbi' 'perl-dbd-mysql')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 
-  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}/my.cnf ${pkgdir}/etc/mysql/my.cnf
+  install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld
 
   # provided by libmysqlclient
   rm -f ${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
@@ -103,7 +103,7 @@ package_mysql(){
   rm -rf ${pkgdir}/usr/{mysql-test,sql-bench}
   rm -f ${pkgdir}/usr/lib/mysql/plugin/*.a
 }
-md5sums=('02b9964b3966832f3d6bc87524bfd73f'
-         'cc9e26e8d4eee750c001939232b947e5'
-         '078f6e824d6097d558bcf7c16d508d92'
+md5sums=('23bac4a0aafd683b077dac146ce2701f'
+         '2234207625baa29b2ff7d7b4f088abce'
+         '175b269b665019689d786f5af0968046'
          'a97e574945e19de3908575b956241026')