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

[Pierre Schmitz]

    Date: Tuesday, February 2, 2010 @ 00:51:51
  Author: pierre
Revision: 66986

Merged revisions 66605,66957 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mysql/trunk

........
  r66605 | andrea | 2010-02-01 02:41:19 +0100 (Mo, 01 Feb 2010) | 1 line
  
  removed wrong line (FS#18083)
........
  r66957 | pierre | 2010-02-02 06:43:31 +0100 (Di, 02 Feb 2010) | 2 lines
  
  upgpkg: mysql 5.1.42-2
      downgrade to non-broken version
........

Modified:
  mysql/repos/extra-x86_64/	(properties)
  mysql/repos/extra-x86_64/PKGBUILD
  mysql/repos/extra-x86_64/my.cnf

----------+
 PKGBUILD |   12 ++++++------
 my.cnf   |    1 -
 2 files changed, 6 insertions(+), 7 deletions(-)


Property changes on: mysql/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /mysql/trunk:1-66600
   + /mysql/trunk:1-66983

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-02-02 05:51:37 UTC (rev 66985)
+++ extra-x86_64/PKGBUILD	2010-02-02 05:51:51 UTC (rev 66986)
@@ -5,20 +5,20 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.43
-pkgrel=1
+pkgver=5.1.42
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.mysql.com/"
 makedepends=('tcp_wrappers' 'zlib' 'perl' 'openssl' 'libtool' 'patch')
-options=('!libtool')
+options=('!libtool' 'force')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf'
         'mysqld.conf.d')
-md5sums=('451fd3e8c55eecdf4c3ed109dce62f01'
+md5sums=('b644b219e130b7c6bca81948f75d72d7'
          '7e1c46ccbd91553cc11df7199fbfca32'
-         '26589ea08b78fc38dd174caeb93b810c'
+         '5b197896a429537fea7cbe52bbe440bc'
 	 '4a9077fc95ec6db1d5420e0cdc74d31c')
 
 build() {
@@ -122,4 +122,4 @@
 
   # create directory for PID and sock files
   install -d ${pkgdir}/var/run/mysqld
-}
\ No newline at end of file
+}

Modified: extra-x86_64/my.cnf
===================================================================
--- extra-x86_64/my.cnf	2010-02-02 05:51:37 UTC (rev 66985)
+++ extra-x86_64/my.cnf	2010-02-02 05:51:51 UTC (rev 66986)
@@ -113,7 +113,6 @@
 #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