diff options
| -rw-r--r-- | databases/mysql57-client/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql57-client/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/mysql57-client/PLIST | 4 | ||||
| -rw-r--r-- | databases/mysql57-client/distinfo | 12 | ||||
| -rw-r--r-- | databases/mysql57-client/patches/patch-cmake_boost.cmake | 53 | ||||
| -rw-r--r-- | databases/mysql57-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql57-server/PLIST | 13 |
7 files changed, 34 insertions, 58 deletions
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile index 40093e424cb..d1fda29c84d 100644 --- a/databases/mysql57-client/Makefile +++ b/databases/mysql57-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.22 2019/05/05 12:12:14 wiedi Exp $ +# $NetBSD: Makefile,v 1.22.2.1 2019/08/10 13:12:45 bsiegert Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} -PKGREVISION= 2 COMMENT= MySQL 5, a free SQL database (client) CONFLICTS= mysql3-client-[0-9]* diff --git a/databases/mysql57-client/Makefile.common b/databases/mysql57-client/Makefile.common index 59b24e9036c..2f7f1a60561 100644 --- a/databases/mysql57-client/Makefile.common +++ b/databases/mysql57-client/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.19 2019/05/06 15:47:39 wiedi Exp $ +# $NetBSD: Makefile.common,v 1.19.2.1 2019/08/10 13:12:45 bsiegert Exp $ # # used by databases/mysql57-client/Makefile # used by databases/mysql57-server/Makefile -DISTNAME= mysql-5.7.26 +DISTNAME= mysql-5.7.27 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/} diff --git a/databases/mysql57-client/PLIST b/databases/mysql57-client/PLIST index 447bc4409ed..2b470839a09 100644 --- a/databases/mysql57-client/PLIST +++ b/databases/mysql57-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2019/04/25 10:13:04 adam Exp $ +@comment $NetBSD: PLIST,v 1.13.2.1 2019/08/10 13:12:45 bsiegert Exp $ bin/mysql bin/mysql_client_test bin/mysql_config @@ -122,7 +122,7 @@ include/mysql/typelib.h lib/libmysqlclient.a lib/libmysqlclient.so lib/libmysqlclient.so.20 -lib/libmysqlclient.so.20.3.13 +lib/libmysqlclient.so.20.3.14 lib/pkgconfig/mysqlclient.pc man/man1/comp_err.1 man/man1/innochecksum.1 diff --git a/databases/mysql57-client/distinfo b/databases/mysql57-client/distinfo index 6f011ab7929..f872e43aff5 100644 --- a/databases/mysql57-client/distinfo +++ b/databases/mysql57-client/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.29 2019/04/25 10:13:04 adam Exp $ +$NetBSD: distinfo,v 1.29.2.1 2019/08/10 13:12:45 bsiegert Exp $ -SHA1 (mysql-5.7.26.tar.gz) = 06afaa471c4d17f00e0717467094027eeaff8ad5 -RMD160 (mysql-5.7.26.tar.gz) = 3ab0a5b4d6883af767869fa9d55a5c8fd9013121 -SHA512 (mysql-5.7.26.tar.gz) = 7bb03cd3f56ce4ef97d9d431f633b73044a2577903b2ba0872bc49773ecd268dbd72f1e6eb0165f7b08d0052e1ab4cfd9ecc4780a7ac87fb6ac33d150c511717 -Size (mysql-5.7.26.tar.gz) = 54056899 bytes +SHA1 (mysql-5.7.27.tar.gz) = 455e1de773ebc105c5d7888b17a84df741abdc6a +RMD160 (mysql-5.7.27.tar.gz) = 5b3cb0ae9a0ebc2530b92be24550a360fbaa0572 +SHA512 (mysql-5.7.27.tar.gz) = 76c8cf7206af2342b30af288ac0c3397875c3bf8de6af08288096181078b9aaad539e3c67a0f4f919f184d68d4b2f2a62aa812899dfe6bea07d37cb08608a7d6 +Size (mysql-5.7.27.tar.gz) = 54398696 bytes SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc SHA1 (patch-client_CMakeLists.txt) = 990d6df52380981f11a4ac5aafe48f34a3b2097f SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93 -SHA1 (patch-cmake_boost.cmake) = cab30ebdff1e773d6970f541f96fce8ed51257f8 +SHA1 (patch-cmake_boost.cmake) = ecf03b396c57c69e0d251497e7217e47632613c2 SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = 7a1fb8c686f187db8fd9d8ad203c1f764d6e55a6 SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320 SHA1 (patch-cmake_plugin.cmake) = 4480438969e297f67890b1974a86fb88a23d28ed diff --git a/databases/mysql57-client/patches/patch-cmake_boost.cmake b/databases/mysql57-client/patches/patch-cmake_boost.cmake index 9d3ca940e24..e142f7f9ad0 100644 --- a/databases/mysql57-client/patches/patch-cmake_boost.cmake +++ b/databases/mysql57-client/patches/patch-cmake_boost.cmake @@ -1,49 +1,20 @@ -$NetBSD: patch-cmake_boost.cmake,v 1.10 2018/12/13 19:51:45 adam Exp $ +$NetBSD: patch-cmake_boost.cmake,v 1.10.6.1 2019/08/10 13:12:45 bsiegert Exp $ -Fix to use a newer version of Boost. +Allow newer Boost. ---- cmake/boost.cmake.orig 2017-06-22 14:13:19.000000000 +0000 +--- cmake/boost.cmake.orig 2019-04-13 13:32:15.000000000 +0000 +++ cmake/boost.cmake -@@ -13,7 +13,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - --# We want boost 1.59.0 in order to build our boost/geometry code. -+# We want boost 1.69.0 in order to build our boost/geometry code. - # The boost tarball is fairly big, and takes several minutes - # to download. So we recommend downloading/unpacking it - # only once, in a place visible from any bzr sandbox. -@@ -31,10 +31,10 @@ - # we assume that the correct version (see below) - # is installed on the compile host in the standard location. - --SET(BOOST_PACKAGE_NAME "boost_1_59_0") -+SET(BOOST_PACKAGE_NAME "boost_1_69_0") - SET(BOOST_TARBALL "${BOOST_PACKAGE_NAME}.tar.gz") - SET(BOOST_DOWNLOAD_URL -- "http://sourceforge.net/projects/boost/files/boost/1.59.0/${BOOST_TARBALL}" -+ "http://sourceforge.net/projects/boost/files/boost/1.69.0/${BOOST_TARBALL}" - ) - - SET(OLD_PACKAGE_NAMES "boost_1_55_0 boost_1_56_0 boost_1_57_0 boost_1_58_0") -@@ -244,7 +244,7 @@ ENDIF() - # // BOOST_VERSION % 100 is the patch level - # // BOOST_VERSION / 100 % 1000 is the minor version - # // BOOST_VERSION / 100000 is the major version --# #define BOOST_VERSION 105900 -+# #define BOOST_VERSION 106900 - FILE(STRINGS "${BOOST_INCLUDE_DIR}/boost/version.hpp" - BOOST_VERSION_NUMBER - REGEX "^#define[\t ]+BOOST_VERSION[\t ][0-9]+.*" -@@ -262,9 +262,9 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10) +@@ -262,12 +262,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10) COULD_NOT_FIND_BOOST() ENDIF() -IF(NOT BOOST_MINOR_VERSION EQUAL 59) -+IF(NOT BOOST_MINOR_VERSION EQUAL 69) - MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} " +- MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} " - "we need 59" -+ "we need 69" - ) - COULD_NOT_FIND_BOOST() - ENDIF() +- ) +- COULD_NOT_FIND_BOOST() +-ENDIF() ++ + + MESSAGE(STATUS "BOOST_INCLUDE_DIR ${BOOST_INCLUDE_DIR}") + diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 10f6ae79f68..8311ce5c0ae 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.22 2019/05/05 12:12:14 wiedi Exp $ +# $NetBSD: Makefile,v 1.22.2.1 2019/08/10 13:12:45 bsiegert Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 2 COMMENT= MySQL 5, a free SQL database (server) CONFLICTS= mysql3-server-[0-9]* diff --git a/databases/mysql57-server/PLIST b/databases/mysql57-server/PLIST index 497eeacebd0..94d078c1d05 100644 --- a/databases/mysql57-server/PLIST +++ b/databases/mysql57-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2019/04/25 10:13:04 adam Exp $ +@comment $NetBSD: PLIST,v 1.12.2.1 2019/08/10 13:12:45 bsiegert Exp $ @pkgdir lib/mysql/plugin/debug bin/innochecksum bin/lz4_decompress @@ -462,6 +462,7 @@ share/mysql/test/include/delete_all_rows.inc share/mysql/test/include/delete_anonymous_users.inc share/mysql/test/include/diff_servers.inc share/mysql/test/include/diff_tables.inc +share/mysql/test/include/disconnect_connections.inc share/mysql/test/include/end_include_file.inc share/mysql/test/include/end_replace_gtid_combination.inc share/mysql/test/include/endspace.inc @@ -2143,6 +2144,7 @@ share/mysql/test/std_data/crl-client-revoked.crl share/mysql/test/std_data/crl-server-cert.pem share/mysql/test/std_data/crl-server-key.pem share/mysql/test/std_data/crldir/ab8a3803.r0 +share/mysql/test/std_data/data_50722.zip share/mysql/test/std_data/des_key_file share/mysql/test/std_data/dtrace.d share/mysql/test/std_data/expired-ca-key.pem @@ -2235,6 +2237,9 @@ share/mysql/test/std_data/server-key.pem share/mysql/test/std_data/server8k-cert.pem share/mysql/test/std_data/server8k-key.pem share/mysql/test/std_data/shutdown.sql +share/mysql/test/std_data/slave-relay-bin-win.index +share/mysql/test/std_data/slave-relay-bin.000001 +share/mysql/test/std_data/slave-relay-bin.index share/mysql/test/std_data/slave-relay-bin_linux.index share/mysql/test/std_data/slave-relay-bin_win.index share/mysql/test/std_data/system_tap.stp @@ -2500,6 +2505,7 @@ share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_start_stop.result share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_start_stop_slave_server_id.result share/mysql/test/suite/binlog/r/binlog_nogtid_mix_response_packet.result +share/mysql/test/suite/binlog/r/binlog_noop_dml_with_readonly.result share/mysql/test/suite/binlog/r/binlog_old_versions.result share/mysql/test/suite/binlog/r/binlog_purge_binary_logs_stall.result share/mysql/test/suite/binlog/r/binlog_purge_binary_logs_to.result @@ -2710,6 +2716,7 @@ share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_start_stop.test share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_start_stop_slave_server_id.test share/mysql/test/suite/binlog/t/binlog_nogtid_mix_response_packet.test +share/mysql/test/suite/binlog/t/binlog_noop_dml_with_readonly.test share/mysql/test/suite/binlog/t/binlog_old_versions.test share/mysql/test/suite/binlog/t/binlog_purge_binary_logs_stall-master.opt share/mysql/test/suite/binlog/t/binlog_purge_binary_logs_stall.test @@ -9674,6 +9681,7 @@ share/mysql/test/suite/rpl/r/rpl_extra_col_slave_innodb.result share/mysql/test/suite/rpl/r/rpl_extra_col_slave_myisam.result share/mysql/test/suite/rpl/r/rpl_extra_row_data.result share/mysql/test/suite/rpl/r/rpl_failed_optimize.result +share/mysql/test/suite/rpl/r/rpl_fde_write.result share/mysql/test/suite/rpl/r/rpl_filter_database.result share/mysql/test/suite/rpl/r/rpl_filter_dbs_dynamic.result share/mysql/test/suite/rpl/r/rpl_filter_rewrite_db_dynamic.result @@ -9694,7 +9702,6 @@ share/mysql/test/suite/rpl/r/rpl_get_master_version_and_clock.result share/mysql/test/suite/rpl/r/rpl_gis_geometry.result share/mysql/test/suite/rpl/r/rpl_grant.result share/mysql/test/suite/rpl/r/rpl_grant_plugin.result -share/mysql/test/suite/rpl/r/rpl_grant_select_columns.result share/mysql/test/suite/rpl/r/rpl_group_commit_deadlock.result share/mysql/test/suite/rpl/r/rpl_group_commit_update_commit_group.result share/mysql/test/suite/rpl/r/rpl_group_replication_commands.result @@ -10370,6 +10377,7 @@ share/mysql/test/suite/rpl/t/rpl_extra_col_slave_innodb.test share/mysql/test/suite/rpl/t/rpl_extra_col_slave_myisam.test share/mysql/test/suite/rpl/t/rpl_extra_row_data.test share/mysql/test/suite/rpl/t/rpl_failed_optimize.test +share/mysql/test/suite/rpl/t/rpl_fde_write.test share/mysql/test/suite/rpl/t/rpl_filter_database-slave.opt share/mysql/test/suite/rpl/t/rpl_filter_database.test share/mysql/test/suite/rpl/t/rpl_filter_dbs_dynamic.test @@ -10400,7 +10408,6 @@ share/mysql/test/suite/rpl/t/rpl_grant.test share/mysql/test/suite/rpl/t/rpl_grant_plugin-master.opt share/mysql/test/suite/rpl/t/rpl_grant_plugin-slave.opt share/mysql/test/suite/rpl/t/rpl_grant_plugin.test -share/mysql/test/suite/rpl/t/rpl_grant_select_columns.test share/mysql/test/suite/rpl/t/rpl_group_commit_deadlock-master.opt share/mysql/test/suite/rpl/t/rpl_group_commit_deadlock.test share/mysql/test/suite/rpl/t/rpl_group_commit_update_commit_group.test |