diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2018-02-07 14:49:42 +0000 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2018-02-07 14:49:42 +0000 |
| commit | 4c630fbb880692ebb312325eb1c027ebb670d843 (patch) | |
| tree | 14d6b09101a4234935fb8970fd57bbec563acd53 /databases/mysqlwsrep57-server | |
| parent | a9d4e6402175073e2684963a15ff62839b90e2df (diff) | |
| download | ports-4c630fbb880692ebb312325eb1c027ebb670d843.tar.gz ports-4c630fbb880692ebb312325eb1c027ebb670d843.zip | |
databases/mysqlwsrep57-server: Upgrade from 5.7.20 to 5.7.21
Notes
Notes:
svn path=/head/; revision=461148
Diffstat (limited to 'databases/mysqlwsrep57-server')
5 files changed, 23 insertions, 45 deletions
diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile index 5afb6b8409ea..0dbf0448ab9d 100644 --- a/databases/mysqlwsrep57-server/Makefile +++ b/databases/mysqlwsrep57-server/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= mysqlwsrep -PORTVERSION?= 5.7.20 +PORTVERSION?= 5.7.21 DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.13 +DISTVERSIONSUFFIX?= -25.14 CATEGORIES= databases ipv6 MASTER_SITES+= SF/boost/boost/1.59.0:boost PKGNAMESUFFIX= 57-server diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo index 3cc634f73c1d..b25d080a78ae 100644 --- a/databases/mysqlwsrep57-server/distinfo +++ b/databases/mysqlwsrep57-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1501158272 +TIMESTAMP = 1518010828 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 -SHA256 (codership-mysql-wsrep-wsrep_5.7.20-25.13_GH0.tar.gz) = 2c55bbbdc7dc1799ffd39a63bbfcfd1a9b8ae76b674016f7d00988887ecab095 -SIZE (codership-mysql-wsrep-wsrep_5.7.20-25.13_GH0.tar.gz) = 51921340 +SHA256 (codership-mysql-wsrep-wsrep_5.7.21-25.14_GH0.tar.gz) = 30991ae681ba38119e3dc5dfd023da50ebeac4e7c4210ecfa6fbe04b7d1d7d55 +SIZE (codership-mysql-wsrep-wsrep_5.7.21-25.14_GH0.tar.gz) = 52003425 diff --git a/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt index dd39fc7d8977..9b1c1d155b7a 100644 --- a/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt +++ b/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt @@ -1,29 +1,29 @@ ---- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ libmysql/CMakeLists.txt -@@ -215,7 +215,7 @@ IF(WIN32) - ENDIF() - +--- libmysql/CMakeLists.txt.orig 2018-01-23 20:34:50.742425000 +0200 ++++ libmysql/CMakeLists.txt 2018-01-23 20:36:13.066280000 +0200 +@@ -235,7 +235,7 @@ + ADD_SUBDIRECTORY(authentication_ldap) + # Merge several convenience libraries into one big mysqlclient --MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) +-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development) ++MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development SKIP_INSTALL) # Visual Studio users need debug static library for debug projects IF(MSVC) -@@ -257,7 +257,8 @@ IF(NOT DISABLE_SHARED) +@@ -271,7 +271,8 @@ # and link them together into shared library. - MERGE_LIBRARIES(libmysql SHARED ${LIBS} + MERGE_LIBRARIES_SHARED(libmysql ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} - COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries NOINSTALL) -+IF(FALSE) ++ COMPONENT SharedLibraries SKIP_INSTALL) ++ IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -313,6 +314,7 @@ ENDIF() - # to initialize api_calls[] array in api_test.c +@@ -316,6 +317,7 @@ + SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) + + ENDIF() ++ ENDIF() + ENDIF() + # - SET(CLIENT_API_FUNCTION_LIST "") -+ ENDIF() - FOREACH(api ${CLIENT_API_FUNCTIONS}) - SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},") - ENDFOREACH() diff --git a/databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc b/databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc deleted file mode 100644 index 8717b90cb859..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql-common/client_authentication.cc.orig 2018-01-22 16:19:07.776289000 +0200 -+++ sql-common/client_authentication.cc 2018-01-22 16:19:26.756981000 +0200 -@@ -84,7 +84,7 @@ - - if (mysql->options.extension != NULL && - mysql->options.extension->server_public_key_path != NULL && -- mysql->options.extension->server_public_key_path != '\0') -+ mysql->options.extension->server_public_key_path[0] != '\0') - { - pub_key_file= fopen(mysql->options.extension->server_public_key_path, - "r"); diff --git a/databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc b/databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc deleted file mode 100644 index e8799c151318..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- storage/innobase/row/row0sel.cc.orig 2018-01-22 18:12:31.679942000 +0200 -+++ storage/innobase/row/row0sel.cc 2018-01-22 18:12:55.834909000 +0200 -@@ -5193,7 +5193,7 @@ - reporting due to search views etc. */ - if (prev_rec != NULL - && prebuilt->m_mysql_handler->end_range != NULL -- && prebuilt->idx_cond == false && end_loop >= 100) { -+ && prebuilt->idx_cond == NULL && end_loop >= 100) { - - dict_index_t* key_index = prebuilt->index; - bool clust_templ_for_sec = false; |