Update to 5.6.39-83.1

PR:		226067
Submitted by:	Thomas Babut
This commit is contained in:
Florian Smeets 2018-03-09 22:15:52 +00:00
parent 39ba191d51
commit d9592b194d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=464034
5 changed files with 16 additions and 25 deletions

View File

@ -1,20 +1,21 @@
--- client/CMakeLists.txt.orig 2014-03-15 18:08:38.000000000 +0100
+++ client/CMakeLists.txt 2014-03-22 19:41:40.272474641 +0100
@@ -37,9 +37,11 @@
TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
--- client/CMakeLists.txt 2018-02-01 14:51:01.000000000 +0100
+++ client/CMakeLists.txt.new 2018-02-20 15:53:56.534072000 +0100
@@ -37,10 +37,12 @@
TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
ENDIF(UNIX)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
ADD_DEPENDENCIES(mysqltest GenError)
+ENDIF()
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
@@ -51,15 +53,19 @@
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
@@ -52,15 +54,19 @@
TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
@ -32,7 +33,7 @@
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
../sql/rpl_filter.cc ../sql/sql_list.cc)
@@ -81,8 +87,6 @@
@@ -82,8 +88,6 @@
ENDIF(WIN32)
SET_TARGET_PROPERTIES (

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= percona
DISTVERSION= 5.6.38-83.0
DISTVERSION= 5.6.39-83.1
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1513433380
SHA256 (percona-server-5.6.38-83.0.tar.gz) = 9152489f41e3371fe920eae7530dd587beec55c0ef909b33f47278916e963782
SIZE (percona-server-5.6.38-83.0.tar.gz) = 56390422
TIMESTAMP = 1518686306
SHA256 (percona-server-5.6.39-83.1.tar.gz) = 48939062738cd5e7769381e31ec581492317ff48c19d0b7ce362e0e61b5d01e2
SIZE (percona-server-5.6.39-83.1.tar.gz) = 56307662

View File

@ -1,5 +1,5 @@
--- client/CMakeLists.txt 2015-11-03 12:14:08.000000000 +0100
+++ client/CMakeLists.txt.new 2015-11-06 10:28:27.753882068 +0100
--- client/CMakeLists.txt 2018-02-01 14:51:01.000000000 +0100
+++ client/CMakeLists.txt.new 2018-02-20 13:41:20.066976000 +0100
@@ -31,17 +31,20 @@
COPY_OPENSSL_DLLS(copy_openssl_client)
@ -15,7 +15,7 @@
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
ADD_DEPENDENCIES(mysqltest GenError)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)

View File

@ -1,10 +0,0 @@
--- include/mysql/plugin.h.orig
+++ include/mysql/plugin.h
@@ -51,6 +51,7 @@
typedef void * MYSQL_PLUGIN;
#include <mysql/services.h>
+#include <my_global.h>
#define MYSQL_XIDDATASIZE 128
/**