[mariadb/f20] Update to 5.5.39

Honza Horak hhorak at fedoraproject.org
Fri Aug 22 15:18:08 UTC 2014 

commit 9f257e429e5a0020fb4bb45565cfc8224e4fdc6a
Author: Honza Horak <hhorak at redhat.com>
Date:   Fri Aug 22 17:18:03 2014 +0200

    Update to 5.5.39

 mariadb-basedir.patch       |   12 ++++++------
 mariadb-file-contents.patch |    6 +++---
 mariadb-versioning.patch    |   27 ++++++++-------------------
 mariadb.spec                |    7 +++++--
 4 files changed, 22 insertions(+), 30 deletions(-)
---
diff --git a/mariadb-basedir.patch b/mariadb-basedir.patch
index f5a5ebf..1f63d10 100644
--- a/mariadb-basedir.patch
+++ b/mariadb-basedir.patch
@@ -1,14 +1,14 @@
 Don't guess basedir in mysql_config; we place it under _libdir because
 of multilib conflicts, so use rather configured @prefix@ path directly.
 
-diff -up mariadb-5.5.29/scripts/mysql_config.sh.basedir mariadb-5.5.29/scripts/mysql_config.sh
---- mariadb-5.5.29/scripts/mysql_config.sh.basedir	2013-02-28 09:39:26.628440114 +0100
-+++ mariadb-5.5.29/scripts/mysql_config.sh	2013-02-28 09:39:40.613439729 +0100
-@@ -76,7 +76,7 @@ get_full_path ()
- 
+diff -up mariadb-5.5.39/scripts/mysql_config.sh.p14 mariadb-5.5.39/scripts/mysql_config.sh
+--- mariadb-5.5.39/scripts/mysql_config.sh.p14	2014-08-22 17:04:41.258563756 +0200
++++ mariadb-5.5.39/scripts/mysql_config.sh	2014-08-22 17:05:23.197648131 +0200
+@@ -77,7 +77,7 @@ get_full_path ()
  me=`get_full_path $0`
  
--basedir=`echo $me | sed -e 's;/bin/mysql_config;;'`
+ # Script might have been renamed but assume mysql_<something>config<something>
+-basedir=`echo $me | sed -e 's;/bin/mysql_.*config.*;;'`
 +basedir='@prefix@'
  
  ldata='@localstatedir@'
diff --git a/mariadb-file-contents.patch b/mariadb-file-contents.patch
index 8ad8c73..a3f09f2 100644
--- a/mariadb-file-contents.patch
+++ b/mariadb-file-contents.patch
@@ -6,9 +6,9 @@ to know about this.
 Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425
 
 
-diff -up mariadb-5.5.34/mysql-test/t/file_contents.test.p10 mariadb-5.5.34/mysql-test/t/file_contents.test
---- mariadb-5.5.34/mysql-test/t/file_contents.test.p10	2013-11-20 13:28:56.000000000 +0100
-+++ mariadb-5.5.34/mysql-test/t/file_contents.test	2013-11-22 08:50:30.244702013 +0100
+diff -up mariadb-5.5.39/mysql-test/t/file_contents.test.p10 mariadb-5.5.39/mysql-test/t/file_contents.test
+--- mariadb-5.5.39/mysql-test/t/file_contents.test.p10	2014-08-22 17:08:55.339195213 +0200
++++ mariadb-5.5.39/mysql-test/t/file_contents.test	2014-08-22 17:12:02.776798881 +0200
 @@ -32,6 +32,15 @@ if ($dir_bin eq '/usr/') {
      # RedHat/Debian: version number in directory name
      $dir_docs = glob "$dir_docs/mariadb-server-*";
diff --git a/mariadb-versioning.patch b/mariadb-versioning.patch
index cf9cc27..034dd48 100644
--- a/mariadb-versioning.patch
+++ b/mariadb-versioning.patch
@@ -13,9 +13,9 @@ Upstream bug: https://mariadb.atlassian.net/browse/MDEV-5529
 However, to stay binary compatible in F20 and lower, we need to use the
 former way.
 
-diff -up mariadb-5.5.37/libmysql/CMakeLists.txt.p5bak mariadb-5.5.37/libmysql/CMakeLists.txt
---- mariadb-5.5.37/libmysql/CMakeLists.txt.p5bak	2014-04-17 17:41:10.502124767 +0200
-+++ mariadb-5.5.37/libmysql/CMakeLists.txt	2014-04-17 17:41:43.048127870 +0200
+diff -up mariadb-5.5.39/libmysql/CMakeLists.txt.p5 mariadb-5.5.39/libmysql/CMakeLists.txt
+--- mariadb-5.5.39/libmysql/CMakeLists.txt.p5	2014-08-16 00:47:21.000000000 +0200
++++ mariadb-5.5.39/libmysql/CMakeLists.txt	2014-08-22 16:56:48.745812519 +0200
 @@ -1,5 +1,4 @@
 -# Copyright (c) 2006, 2013, Oracle and/or its affiliates.
 -# Copyright (c) 2009, 2013, SkySQL Ab.
@@ -45,7 +45,7 @@ diff -up mariadb-5.5.37/libmysql/CMakeLists.txt.p5bak mariadb-5.5.37/libmysql/CM
  )
  
  SET(CLIENT_API_FUNCTIONS_5_5
-@@ -157,8 +152,6 @@ mysql_close_cont
+@@ -162,8 +157,6 @@ mysql_close_cont
  mysql_close_start
  mysql_commit_cont
  mysql_commit_start
@@ -54,7 +54,7 @@ diff -up mariadb-5.5.37/libmysql/CMakeLists.txt.p5bak mariadb-5.5.37/libmysql/CM
  mysql_fetch_row_cont
  mysql_fetch_row_start
  mysql_free_result_cont
-@@ -245,114 +238,73 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+@@ -250,114 +243,73 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
    # for compatibility with distribution packages, so client shared library can 
    # painlessly replace the one supplied by the distribution.
    
@@ -234,18 +234,7 @@ diff -up mariadb-5.5.37/libmysql/CMakeLists.txt.p5bak mariadb-5.5.37/libmysql/CM
  ENDIF()
  
  
-@@ -380,10 +332,8 @@ SET(LIBS clientlib dbug strings vio mysy
- MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
- 
- # Visual Studio users need debug  static library for debug projects
--INSTALL_DEBUG_SYMBOLS(clientlib)
- IF(MSVC)
-  INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
-- INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
- ENDIF()
- 
- IF(UNIX)
-@@ -402,9 +352,7 @@ IF(UNIX)
+@@ -406,9 +358,7 @@ IF(UNIX)
  ENDIF()
  
  IF(NOT DISABLE_SHARED)
@@ -256,7 +245,7 @@ diff -up mariadb-5.5.37/libmysql/CMakeLists.txt.p5bak mariadb-5.5.37/libmysql/CM
    IF(UNIX)
      # libtool compatability
      IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -421,8 +369,11 @@ IF(NOT DISABLE_SHARED)
+@@ -425,8 +375,11 @@ IF(NOT DISABLE_SHARED)
        SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
      IF(LINK_FLAG_NO_UNDEFINED OR VERSION_SCRIPT_LINK_FLAGS)
        GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS)
@@ -265,7 +254,7 @@ diff -up mariadb-5.5.37/libmysql/CMakeLists.txt.p5bak mariadb-5.5.37/libmysql/CM
 +      ENDIF()
        SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS 
 -        "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED} ${VERSION_SCRIPT_LINK_FLAGS}")
-+        "${libmysql_link_flags} -Wl,libmysql.version ${LINK_FLAG_NO_UNDEFINED}")
++        "${libmysql_link_flags} -Wl,--version-script=libmysql.version ${LINK_FLAG_NO_UNDEFINED}")
      ENDIF() 
      # clean direct output needs to be set several targets have the same name
      #(mysqlclient in this case)
diff --git a/mariadb.spec b/mariadb.spec
index 5eaff0f..51a57c4 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -10,8 +10,8 @@
 %endif
 
 Name: mariadb
-Version: 5.5.38
-Release: 3%{?dist}
+Version: 5.5.39
+Release: 1%{?dist}
 Epoch: 1
 
 Summary: A community developed branch of MySQL
@@ -794,6 +794,9 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri Aug 22 2014 Honza Horak <hhorak at redhat.com> - 1:5.5.39-1
+- Update to 5.5.39
+
 * Fri Jun 27 2014 Honza Horak <hhorak at redhat.com> - 1:5.5.38-3
 - Add compatible libmysqlclient_18 version for symbols
   Resolves: #1111776

More information about the scm-commits mailing list