Changes 5.7.18:

* Windows builds now use the default runtime libraries (builds use the /MD flag).
* CMake support was added for compiling with Developer Studio 12.6.
* MySQL failed to compile if -DENABLE_DEBUG_SYNC=OFF AND -DWITH_DEBUG=ON were both given. The ENABLE_DEBUG_SYNC option has been removed and enabling WITH_DEBUG enables Debug Sync.
* The --temp-pool server option is deprecated and will be removed in MySQL 8.0.
* Support for DTrace is deprecated and is removed in MySQL 8.0.
* Changes in RPM package structure require a larger set of packages to be removed to install MySQL Server cleanly.
* To avoid potential race conditions, Debian packages now use the GNU install utility rather than a combination of mkdir, touch, and chown.
* The my-default.cnf.sh file (used to produce a default my-default.cnf or my-default.ini file) is no longer included in source distributions and my-default.cnf and my-default.ini are no longer included in or installed by distribution packages.
* Reminder: MySQL 5.7 requires the Microsoft Visual C++ 2013 Redistributable Package to run on Windows platforms. Users should make sure the package has been installed on the system before starting the server. The package is available at the Microsoft Download Center.
* PROCEDURE ANALYSE() syntax is now deprecated and is removed in MySQL 8.0.
* The use of \N as a synonym for NULL in SQL statements is deprecated and is removed in MySQL 8.0. Use NULL instead.
* The linked OpenSSL library for the MySQL Commercial Server has been updated to version 1.0.2k.

3 files changed, 17 insertions, 22 deletions

diff --git a/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake b/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake
index 831a36ae8c4..383b844cb59 100644
--- a/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake
+++ b/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake
@@ -1,10 +1,10 @@
-$NetBSD: patch-cmake_os_SunOS.cmake,v 1.1 2017/01/03 12:27:27 jperkin Exp $
+$NetBSD: patch-cmake_os_SunOS.cmake,v 1.2 2017/04/11 20:49:15 adam Exp $
 
 Do not attempt to detect ISA, it conflicts with wrappers.
 
---- cmake/os/SunOS.cmake.orig	2016-11-28 13:32:52.000000000 +0000
+--- cmake/os/SunOS.cmake.orig	2017-03-18 07:45:14.000000000 +0000
 +++ cmake/os/SunOS.cmake
-@@ -61,6 +61,7 @@ ADD_DEFINITIONS(-D__EXTENSIONS__)
+@@ -62,6 +62,7 @@ ADD_DEFINITIONS(-D__EXTENSIONS__)
  # http://docs.oracle.com/cd/E19455-01/806-5257/6je9h033k/index.html
  ADD_DEFINITIONS(-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_PTHREADS)
  
@@ -12,8 +12,8 @@ Do not attempt to detect ISA, it conflicts with wrappers.
  IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLAGS}" MATCHES "-m32|-m64")
    EXECUTE_PROCESS(COMMAND isainfo -b
      OUTPUT_VARIABLE ISAINFO_B
-@@ -75,6 +76,7 @@ IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLA
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${ISAINFO_B}")
+@@ -86,6 +87,7 @@ ELSE()
+     SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -m64")
    ENDIF()
  ENDIF()
 +ENDIF()
diff --git a/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt b/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
index 56d3b995034..f0265e426d4 100644
--- a/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
+++ b/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
@@ -1,21 +1,20 @@
-$NetBSD: patch-rapid_plugin_x_CMakeLists.txt,v 1.1 2016/09/16 06:49:11 adam Exp $
+$NetBSD: patch-rapid_plugin_x_CMakeLists.txt,v 1.2 2017/04/11 20:49:15 adam Exp $
 
-Use bundled boost, but system OpenSSL and zlib.
+Use system OpenSSL and zlib.
 Fix mysqlxtest binary linking.
 
---- rapid/plugin/x/CMakeLists.txt.orig	2016-06-30 06:22:11.000000000 +0000
+--- rapid/plugin/x/CMakeLists.txt.orig	2017-03-18 07:45:14.000000000 +0000
 +++ rapid/plugin/x/CMakeLists.txt
-@@ -91,14 +91,14 @@ ELSE()
-     ${CMAKE_CURRENT_SOURCE_DIR}/ngs/include
+@@ -92,14 +92,14 @@ ELSE()
      ${CMAKE_SOURCE_DIR}/include #temporary
      ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql
+     ${CMAKE_CURRENT_BINARY_DIR}/generated
 -    ${SSL_INCLUDE_DIRS}
 -    ${ZLIB_INCLUDE_DIR}
-+    ${BOOST_INCLUDE_DIR}
    )
  
    INCLUDE_DIRECTORIES(SYSTEM
--    ${BOOST_INCLUDE_DIR}
+     ${BOOST_INCLUDE_DIR}
      ${PROTOBUF_INCLUDE_DIRS}
      ${LIBEVENT_INCLUDE_DIR}
 +    ${SSL_INCLUDE_DIRS}
@@ -23,7 +22,7 @@ Fix mysqlxtest binary linking.
    )
  
    IF(XPLUGIN_NO_LITE_PROTOBUF)
-@@ -200,7 +200,10 @@ ELSE()
+@@ -215,7 +215,10 @@ ELSE()
    ENDIF()
  
    TARGET_LINK_LIBRARIES(mysqlxtest mysys strings mysqlclient)
diff --git a/databases/mysql57-client/patches/patch-sql_conn__handler_socket__connection.cc b/databases/mysql57-client/patches/patch-sql_conn__handler_socket__connection.cc
index c12b4041137..cdf8d00fd58 100644
--- a/databases/mysql57-client/patches/patch-sql_conn__handler_socket__connection.cc
+++ b/databases/mysql57-client/patches/patch-sql_conn__handler_socket__connection.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-sql_conn__handler_socket__connection.cc,v 1.1 2016/09/16 06:49:11 adam Exp $
+$NetBSD: patch-sql_conn__handler_socket__connection.cc,v 1.2 2017/04/11 20:49:15 adam Exp $
 
---- sql/conn_handler/socket_connection.cc.orig	2016-03-28 18:06:12.000000000 +0000
+--- sql/conn_handler/socket_connection.cc.orig	2017-03-18 07:45:14.000000000 +0000
 +++ sql/conn_handler/socket_connection.cc
-@@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li
+@@ -942,17 +942,20 @@ Channel_info* Mysqld_socket_listener::li
      signal(SIGCHLD, SIG_DFL);
      request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
                   mysql_socket_getfd(connect_sock), NULL);
@@ -24,9 +24,5 @@ $NetBSD: patch-sql_conn__handler_socket__connection.cc,v 1.1 2016/09/16 06:49:11
 -             "refused connect from %s", eval_client(&req));
 +             "refused connect from %s", my_eval_client(&req));
  
-       if (req.sink)
--        (req.sink)(req.fd);
-+        ((void (*)(int)) (req.sink))(req.fd);
- 
-       mysql_socket_shutdown(listen_sock, SHUT_RDWR);
-       mysql_socket_close(listen_sock);
+ #ifdef HAVE_LIBWRAP_PROTOTYPES
+       // Some distros have patched tcpd.h to have proper prototypes