[arch-commits] Commit in mysql/trunk (4 files)

Andrea Scarpino andrea at archlinux.org
Tue Feb 8 08:12:46 UTC 2011 

    Date: Tuesday, February 8, 2011 @ 03:12:46
  Author: andrea
Revision: 109317

upgpkg: mysql 5.5.9-1
upstream release

Modified:
  mysql/trunk/PKGBUILD
Deleted:
  mysql/trunk/fix-embedded-crash.patch
  mysql/trunk/fix-mysql-home.patch
  mysql/trunk/fix-set-default-charset.patch

-------------------------------+
 PKGBUILD                      |   24 +++--------------
 fix-embedded-crash.patch      |   19 -------------
 fix-mysql-home.patch          |   16 -----------
 fix-set-default-charset.patch |   55 ----------------------------------------
 4 files changed, 5 insertions(+), 109 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-08 08:02:42 UTC (rev 109316)
+++ PKGBUILD	2011-02-08 08:12:46 UTC (rev 109317)
@@ -5,8 +5,8 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.8
-pkgrel=9
+pkgver=5.5.9
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.mysql.com/"
@@ -14,23 +14,12 @@
 options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
-        'my.cnf'
-        'fix-set-default-charset.patch'
-        'fix-mysql-home.patch'
-        'fix-embedded-crash.patch')
-md5sums=('42e866302b61f5e213afd33e04677017'
+        'my.cnf')
+md5sums=('701c0c44b7f1c2300adc0dc45729f903'
          '2234207625baa29b2ff7d7b4f088abce'
-         '1c949c0dbea5206af0db14942d9927b6'
-         '6f72b482580d020933ea9a7a4f638051'
-         '56fe8b724ca7ae73b9f96cdf4cca1220'
-         'b2b7ed0289a6d8cce17a68512c0286cc')
+         '1c949c0dbea5206af0db14942d9927b6')
 
 build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -Np1 -i ${srcdir}/fix-set-default-charset.patch
-  patch -Np1 -i ${srcdir}/fix-mysql-home.patch
-  patch -Np1 -i ${srcdir}/fix-embedded-crash.patch
-
   cd "${srcdir}"
   mkdir build
   cd build
@@ -88,9 +77,6 @@
   for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
     install -m644 "${srcdir}/${pkgbase}-${pkgver}/man/$man.1" "${pkgdir}/usr/share/man/man1/$man.1"
   done
-
-  #fix permissions
-  chmod 644 "${pkgdir}/usr/lib/libmysqlclient_r.a"
 }
 
 package_mysql-clients(){

Deleted: fix-embedded-crash.patch
===================================================================
--- fix-embedded-crash.patch	2011-02-08 08:02:42 UTC (rev 109316)
+++ fix-embedded-crash.patch	2011-02-08 08:12:46 UTC (rev 109317)
@@ -1,19 +0,0 @@
-Fix crash in embedded mysql library when mysql_library_init() is invoked
-with argc = 0, as is supposed to be a supported thing to do.
-Patch from upstream bug #57931.
-
-
-diff -Naur mysql-5.5.8.orig/libmysqld/lib_sql.cc mysql-5.5.8/libmysqld/lib_sql.cc
---- mysql-5.5.8.orig/libmysqld/lib_sql.cc	2010-12-03 12:58:26.000000000 -0500
-+++ mysql-5.5.8/libmysqld/lib_sql.cc	2011-01-12 23:10:55.837471629 -0500
-@@ -510,8 +510,8 @@
-     return 1;
-   defaults_argc= *argcp;
-   defaults_argv= *argvp;
--  remaining_argc= argc;
--  remaining_argv= argv;
-+  remaining_argc= *argcp;
-+  remaining_argv= *argvp;
- 
-   /* Must be initialized early for comparison of options name */
-   system_charset_info= &my_charset_utf8_general_ci;

Deleted: fix-mysql-home.patch
===================================================================
--- fix-mysql-home.patch	2011-02-08 08:02:42 UTC (rev 109316)
+++ fix-mysql-home.patch	2011-02-08 08:12:46 UTC (rev 109317)
@@ -1,16 +0,0 @@
-mysql 5.5's new cmake-based build scripts forgot about defining
-DEFAULT_HOME_ENV.  Upstream at http://bugs.mysql.com/bug.php?id=59280
-
-
-diff -Naur mysql-5.5.8.orig/mysys/CMakeLists.txt mysql-5.5.8/mysys/CMakeLists.txt
---- mysql-5.5.8.orig/mysys/CMakeLists.txt	2010-12-03 12:58:26.000000000 -0500
-+++ mysql-5.5.8/mysys/CMakeLists.txt	2011-01-13 11:58:42.583471734 -0500
-@@ -69,6 +69,8 @@
-  SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_port.c)
- ENDIF()
- 
-+ADD_DEFINITIONS( -DDEFAULT_HOME_ENV=MYSQL_HOME)
-+
- ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES})
- TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} 
-  ${LIBNSL} ${LIBM} ${LIBRT})

Deleted: fix-set-default-charset.patch
===================================================================
--- fix-set-default-charset.patch	2011-02-08 08:02:42 UTC (rev 109316)
+++ fix-set-default-charset.patch	2011-02-08 08:12:46 UTC (rev 109317)
@@ -1,55 +0,0 @@
---- a/cmake/character_sets.cmake	2010-02-25 08:15:46 +0000
-+++ b/cmake/character_sets.cmake	2010-12-22 09:23:08 +0000
-@@ -1,4 +1,4 @@
--# Copyright (C) 2009 Sun Microsystems, Inc
-+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- # 
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -13,17 +13,19 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
- 
--#Charsets and collations
-+# Charsets and collations
- IF(NOT DEFAULT_CHARSET)
--SET(DEFAULT_CHARSET "latin1")
-+  SET(DEFAULT_CHARSET "latin1")
- ENDIF()
- 
--IF(NOT DEFAULT_COLLATIONS)
--SET(DEFAULT_COLLATION "latin1_swedish_ci")
-+IF(NOT DEFAULT_COLLATION)
-+  SET(DEFAULT_COLLATION "latin1_swedish_ci")
- ENDIF()
- 
- SET(CHARSETS ${DEFAULT_CHARSET} latin1 utf8 utf8mb4)
--SET(CHARSETS_COMPLEX big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32)
-+SET(CHARSETS_COMPLEX
-+  big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2
-+  sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32)
- 
- SET(CHARSETS_AVAILABLE 
- binary armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257
-
-=== modified file 'config.h.cmake'
---- a/config.h.cmake	2010-12-21 12:00:26 +0000
-+++ b/config.h.cmake	2010-12-22 09:23:08 +0000
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2009 Sun Microsystems, Inc
-+/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-  
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-@@ -518,8 +518,8 @@
- #cmakedefine CYBOZU 1
- 
- /* Character sets and collations */
--#cmakedefine MYSQL_DEFAULT_CHARSET_NAME "latin1"
--#cmakedefine MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"
-+#cmakedefine MYSQL_DEFAULT_CHARSET_NAME "@MYSQL_DEFAULT_CHARSET_NAME@"
-+#cmakedefine MYSQL_DEFAULT_COLLATION_NAME "@MYSQL_DEFAULT_COLLATION_NAME@"
- 
- #cmakedefine USE_MB 1
- #cmakedefine USE_MB_IDENT 1
-

More information about the arch-commits mailing list