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.

4 files changed, 31 insertions, 34 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')
diff --git a/abs/core-testing/mysql/__changelog b/abs/core-testing/mysql/__changelog
index 59cdafd..3362584 100644
--- a/abs/core-testing/mysql/__changelog
+++ b/abs/core-testing/mysql/__changelog
@@ -1,3 +1,2 @@
-6/13/10 - chw - LinHES specific my.cnf
-	- chw - mysqld, added --skip-name-resolve to mysqld_safe line and output to /dev/null
-	-jm corrected typo with /devl/null
+using default arch pkgbuild
+my.cnf has data dir modified to use /data/srv
diff --git a/abs/core-testing/mysql/my.cnf b/abs/core-testing/mysql/my.cnf
index e13331e..4eaeaa0 100644
--- a/abs/core-testing/mysql/my.cnf
+++ b/abs/core-testing/mysql/my.cnf
@@ -1,4 +1,8 @@
-# mysql config file for LinHES.
+# mysql config file for medium systems.
+#
+# This is for a system with little memory (32M - 64M) where MySQL plays
+# a important part and systems up to 128M where MySQL is used together with
+# other programs (like a web server)
 #
 # One can in this file use all long options that the program supports.
 # If you want to know which options a program support, run the program
@@ -8,27 +12,22 @@
 [client]
 #password	= your_password
 port		= 3306
-socket		= /tmp/mysql.sock
+socket		= /var/run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 
 # The MySQL server
 [mysqld]
 port		= 3306
-socket		= /tmp/mysql.sock
+socket		= /var/run/mysqld/mysqld.sock
 datadir		= /data/srv/mysql
-skip-locking
+skip-external-locking
 key_buffer = 16M
 max_allowed_packet = 1M
 table_cache = 64
 sort_buffer_size = 512K
 net_buffer_length = 16K
 myisam_sort_buffer_size = 8M
-query_cache_size = 8M
-tmp_table_size = 36M
-max_heap_table_size = 24M
-thread_cache_size = 4
-table_cache = 96
 
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
@@ -114,7 +113,6 @@ server-id	= 1
 #innodb_data_home_dir = /var/lib/mysql
 #innodb_data_file_path = ibdata1:10M:autoextend
 #innodb_log_group_home_dir = /var/lib/mysql
-#innodb_log_arch_dir = /var/lib/mysql
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 16M
diff --git a/abs/core-testing/mysql/mysqld b/abs/core-testing/mysql/mysqld
index 45cfd7c..1ac88a7 100755
--- a/abs/core-testing/mysql/mysqld
+++ b/abs/core-testing/mysql/mysqld
@@ -13,7 +13,7 @@ case "$1" in
     stat_busy "Starting MySQL Server"
     [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
     if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --skip-name-resolve --user=mysql >/dev/null &>/dev/null &
+       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
       if [ $? -gt 0 ]; then
         stat_fail
         exit 1