From d395841430462ab5c2bc73806cf97d9b84cd7d89 Mon Sep 17 00:00:00 2001 From: Florian Smeets Date: Fri, 6 Nov 2015 17:35:01 +0000 Subject: [PATCH] Update to 5.6.27-75.0 PR: 204327 Submitted by: Thomas Babut --- databases/percona56-server/Makefile | 2 +- databases/percona56-server/distinfo | 4 ++-- .../files/patch-client_CMakeLists.txt | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index fe11460349d3..af9bef0e5bf3 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.26-74.0 +DISTVERSION= 5.6.27-75.0 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ diff --git a/databases/percona56-server/distinfo b/databases/percona56-server/distinfo index 5d7b0fab4956..242c4cebadd9 100644 --- a/databases/percona56-server/distinfo +++ b/databases/percona56-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (percona-server-5.6.26-74.0.tar.gz) = 9156038d84bd1190a5b5df963877876584d30bd515ba3ad39e65a532430c1608 -SIZE (percona-server-5.6.26-74.0.tar.gz) = 54819177 +SHA256 (percona-server-5.6.27-75.0.tar.gz) = 7dc4a4efadaee25e11fd78838f4ad2c0d7921ac9cc3b95068626f918c0add8d7 +SIZE (percona-server-5.6.27-75.0.tar.gz) = 54907367 diff --git a/databases/percona56-server/files/patch-client_CMakeLists.txt b/databases/percona56-server/files/patch-client_CMakeLists.txt index c4f04c95831b..0970262dab19 100644 --- a/databases/percona56-server/files/patch-client_CMakeLists.txt +++ b/databases/percona56-server/files/patch-client_CMakeLists.txt @@ -1,5 +1,5 @@ ---- client/CMakeLists.txt.orig 2015-05-06 12:38:47.000000000 +0200 -+++ client/CMakeLists.txt 2015-06-07 18:30:20.496432000 +0200 +--- client/CMakeLists.txt 2015-11-03 12:14:08.000000000 +0100 ++++ client/CMakeLists.txt.new 2015-11-06 10:28:27.753882068 +0100 @@ -31,17 +31,20 @@ COPY_OPENSSL_DLLS(copy_openssl_client) @@ -21,10 +21,10 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient) -@@ -50,17 +53,21 @@ - +@@ -51,17 +54,21 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) @@ -43,7 +43,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc ../sql/rpl_filter.cc ../sql/sql_list.cc) TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient) -@@ -74,6 +81,7 @@ +@@ -75,6 +82,7 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient) @@ -51,7 +51,7 @@ # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -83,11 +91,6 @@ +@@ -84,11 +92,6 @@ SET_TARGET_PROPERTIES ( mysql_plugin mysql_upgrade