[Midnightbsd-cvs] mports [24461] trunk/databases: add mysql 5.7
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Oct 12 19:32:46 EDT 2018
Revision: 24461
http://svnweb.midnightbsd.org/mports/?rev=24461
Author: laffer1
Date: 2018-10-12 19:32:43 -0400 (Fri, 12 Oct 2018)
Log Message:
-----------
add mysql 5.7
Modified Paths:
--------------
trunk/databases/Makefile
Added Paths:
-----------
trunk/databases/mysql57-client/
trunk/databases/mysql57-client/Makefile
trunk/databases/mysql57-client/files/
trunk/databases/mysql57-client/files/patch-CMakeLists.txt
trunk/databases/mysql57-client/files/patch-client_CMakeLists.txt
trunk/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
trunk/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake
trunk/databases/mysql57-client/files/patch-cmake_plugin.cmake
trunk/databases/mysql57-client/files/patch-cmake_ssl.cmake
trunk/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h
trunk/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c
trunk/databases/mysql57-client/files/patch-configure.cmake
trunk/databases/mysql57-client/files/patch-extra_CMakeLists.txt
trunk/databases/mysql57-client/files/patch-include_CMakeLists.txt
trunk/databases/mysql57-client/files/patch-include_my__compare.h
trunk/databases/mysql57-client/files/patch-include_myisam.h
trunk/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
trunk/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt
trunk/databases/mysql57-client/files/patch-man_CMakeLists.txt
trunk/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
trunk/databases/mysql57-client/files/patch-mysys_my__symlink.c
trunk/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
trunk/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c
trunk/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
trunk/databases/mysql57-client/pkg-message
trunk/databases/mysql57-client/pkg-plist
trunk/databases/mysql57-server/
trunk/databases/mysql57-server/Makefile
trunk/databases/mysql57-server/distinfo
trunk/databases/mysql57-server/files/
trunk/databases/mysql57-server/files/extra-patch-config.h.cmake
trunk/databases/mysql57-server/files/my.cnf.sample.in
trunk/databases/mysql57-server/files/mysql-server.in
trunk/databases/mysql57-server/files/patch-CMakeLists.txt
trunk/databases/mysql57-server/files/patch-client_CMakeLists.txt
trunk/databases/mysql57-server/files/patch-cmake_plugin.cmake
trunk/databases/mysql57-server/files/patch-cmake_ssl.cmake
trunk/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h
trunk/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c
trunk/databases/mysql57-server/files/patch-include_CMakeLists.txt
trunk/databases/mysql57-server/files/patch-include_my__compare.h
trunk/databases/mysql57-server/files/patch-include_my__thread__os__id.h
trunk/databases/mysql57-server/files/patch-include_myisam.h
trunk/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt
trunk/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
trunk/databases/mysql57-server/files/patch-libservices_CMakeLists.txt
trunk/databases/mysql57-server/files/patch-man_CMakeLists.txt
trunk/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
trunk/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc
trunk/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt
trunk/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
trunk/databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
trunk/databases/mysql57-server/files/patch-scripts_CMakeLists.txt
trunk/databases/mysql57-server/files/patch-sql_CMakeLists.txt
trunk/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc
trunk/databases/mysql57-server/files/patch-sql_sys__vars.cc
trunk/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h
trunk/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c
trunk/databases/mysql57-server/files/patch-support-files_CMakeLists.txt
trunk/databases/mysql57-server/pkg-descr
trunk/databases/mysql57-server/pkg-message
trunk/databases/mysql57-server/pkg-plist
Modified: trunk/databases/Makefile
===================================================================
--- trunk/databases/Makefile 2018-10-12 22:53:43 UTC (rev 24460)
+++ trunk/databases/Makefile 2018-10-12 23:32:43 UTC (rev 24461)
@@ -42,6 +42,8 @@
SUBDIR += mysql55-server
SUBDIR += mysql56-client
SUBDIR += mysql56-server
+SUBDIR += mysql57-client
+SUBDIR += mysql57-server
SUBDIR += mysql80-client
SUBDIR += mysql80-server
SUBDIR += ntdb
Added: trunk/databases/mysql57-client/Makefile
===================================================================
--- trunk/databases/mysql57-client/Makefile (rev 0)
+++ trunk/databases/mysql57-client/Makefile 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,51 @@
+# $MidnightBSD$
+
+PORTNAME= mysql
+PORTREVISION= 1
+PKGNAMESUFFIX= 57-client
+
+COMMENT= Multithreaded SQL database (client)
+
+LICENSE+= lgpl2.1
+
+BROKEN_powerpc64= does not build: reports unsupported compiler
+BROKEN_sparc64= does not build: reports unsupported compiler
+
+MASTERDIR= ${.CURDIR}/../mysql57-server
+
+PKGMESSAGE= ${.CURDIR}/pkg-message
+PATCHDIR= ${.CURDIR}/files
+PLIST= ${.CURDIR}/pkg-plist
+
+CONFLICTS_INSTALL= mysql5[0-68-9]-client-* \
+ mysql[0-46-9][0-9]-client-* \
+ mariadb[0-9][0-9]-client-* \
+ percona[0-9][0-9]-client-*
+
+CMAKE_ARGS+= -DWITHOUT_SERVER=1 \
+ -DWITH_NDBCLUSTER=1
+
+USE_LDCONFIG+= ${PREFIX}/lib/mysql
+
+MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
+ mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
+ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
+
+CLIENT_ONLY= yes
+
+OPTIONS_GROUP+= PLUGINS
+PLUGINS_DESC= Default Client Plugins
+OPTIONS_GROUP_PLUGINS= SASLCLIENT
+SASLCLIENT_DESC= SASL client plugin module
+SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
+SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
+SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/sasl/sasl.h:net/openldap24-sasl-client
+OPTIONS_DEFAULT+= SASLCLIENT
+
+# issue 166367: adding symlinks for back-compatibility with ${lib}_r
+post-install:
+ @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
+ @${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
+ @${LN} -s libmysqlclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20
+
+.include "${MASTERDIR}/Makefile"
Property changes on: trunk/databases/mysql57-client/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-client/files/patch-CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-client/files/patch-CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,46 @@
+--- CMakeLists.txt.orig 2017-06-22 14:13:19 UTC
++++ CMakeLists.txt
+@@ -610,9 +610,6 @@ IF(NOT WITHOUT_SERVER)
+ SET (MYSQLD_STATIC_EMBEDDED_PLUGIN_LIBS "" CACHE INTERNAL "")
+ # Add storage engines and plugins.
+ CONFIGURE_PLUGINS()
+-ELSE()
+- # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1
+- ADD_SUBDIRECTORY(storage/ndb)
+ ENDIF()
+
+ ADD_SUBDIRECTORY(include)
+@@ -647,8 +644,8 @@ ENDIF()
+
+ ADD_SUBDIRECTORY(extra)
+ ADD_SUBDIRECTORY(client)
+-ADD_SUBDIRECTORY(sql/share)
+ ADD_SUBDIRECTORY(libservices)
++ADD_SUBDIRECTORY(support-files)
+
+ IF(UNIX)
+ ADD_SUBDIRECTORY(man)
+@@ -719,14 +716,13 @@ ELSE()
+ SET(CPACK_GENERATOR "TGZ")
+ ENDIF()
+ ADD_SUBDIRECTORY(packaging/WiX)
+-ADD_SUBDIRECTORY(packaging/solaris)
+
+ IF(UNIX)
+- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
+ ENDIF()
+ #
+ # RPM installs documentation directly from the source tree
+ #
++IF(FALSE)
+ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ INSTALL(FILES COPYING LICENSE.mysql
+ DESTINATION ${INSTALL_DOCREADMEDIR}
+@@ -749,6 +745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ PATTERN "sp-imp-spec.txt" EXCLUDE
+ )
+ ENDIF()
++ENDIF()
+
+ INCLUDE(CPack)
+
Property changes on: trunk/databases/mysql57-client/files/patch-CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-client_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-client/files/patch-client_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-client/files/patch-client_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,54 @@
+--- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ client/CMakeLists.txt
+@@ -47,6 +47,7 @@ IF(UNIX)
+ TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
+ ENDIF(UNIX)
+
++IF(FALSE)
+ IF(NOT WITHOUT_SERVER)
+ MYSQL_ADD_EXECUTABLE(mysql_upgrade
+ upgrade/program.cc
+@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
+ TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
+ ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
+ ENDIF()
++ENDIF()
+
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
+ SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+ TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
+ ADD_DEPENDENCIES(mysqltest GenError)
++ENDIF()
+
+ ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
+@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
+ MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
+ TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
+ TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
++ENDIF()
+
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
+ ADD_COMPILE_FLAGS(
+@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
+ TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
+
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
+ TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
++ENDIF()
+
+ IF(UNIX AND NOT WITHOUT_SERVER)
+ MYSQL_ADD_EXECUTABLE(mysql_install_db
+@@ -122,7 +130,6 @@ IF(WIN32)
+ ENDIF(WIN32)
+
+ SET_TARGET_PROPERTIES (
+- mysql_plugin
+ mysqlcheck
+ mysqldump
+ mysqlimport
Property changes on: trunk/databases/mysql57-client/files/patch-client_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
===================================================================
--- trunk/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake (rev 0)
+++ trunk/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,20 @@
+--- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC
++++ cmake/build_configurations/compiler_options.cmake
+@@ -29,7 +29,7 @@ IF(UNIX)
+
+ # Default GCC flags
+ IF(CMAKE_COMPILER_IS_GNUCC)
+- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
++ SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+ # Disable inline optimizations for valgrind testing to avoid false positives
+ IF(WITH_VALGRIND)
+ SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
+@@ -42,7 +42,7 @@ IF(UNIX)
+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
+ ENDIF()
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
++ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+ # GCC 6 has C++14 as default, set it explicitly to the old default.
+ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
+ OUTPUT_VARIABLE GXX_VERSION)
Property changes on: trunk/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake
===================================================================
--- trunk/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake (rev 0)
+++ trunk/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,27 @@
+--- cmake/os/DragonFly.cmake.orig 2016-04-14 10:16:17 UTC
++++ cmake/os/DragonFly.cmake
+@@ -0,0 +1,24 @@
++INCLUDE(CheckCSourceRuns)
++
++# We require at least GCC 4.4 or Clang 3.3.
++IF(NOT FORCE_UNSUPPORTED_COMPILER)
++ IF(CMAKE_COMPILER_IS_GNUCC)
++ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
++ OUTPUT_VARIABLE GCC_VERSION)
++ IF(GCC_VERSION VERSION_LESS 4.4)
++ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
++ ENDIF()
++ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
++ CHECK_C_SOURCE_RUNS("
++ int main()
++ {
++ return (__clang_major__ < 3) ||
++ (__clang_major__ == 3 && __clang_minor__ < 3);
++ }" HAVE_SUPPORTED_CLANG_VERSION)
++ IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
++ MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
++ ENDIF()
++ ELSE()
++ MESSAGE(FATAL_ERROR "Unsupported compiler!")
++ ENDIF()
++ENDIF()
Property changes on: trunk/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-cmake_plugin.cmake
===================================================================
--- trunk/databases/mysql57-client/files/patch-cmake_plugin.cmake (rev 0)
+++ trunk/databases/mysql57-client/files/patch-cmake_plugin.cmake 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,25 @@
+--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC
++++ cmake/plugin.cmake
+@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN)
+ MYSQL_INSTALL_TARGETS(${target}
+ DESTINATION ${INSTALL_PLUGINDIR}
+ COMPONENT ${INSTALL_COMPONENT})
+- INSTALL_DEBUG_TARGET(${target}
+- DESTINATION ${INSTALL_PLUGINDIR}/debug
+- COMPONENT ${INSTALL_COMPONENT})
++ IF(CMAKE_BUILD_TYPE MATCHES "Debug")
++ INSTALL_DEBUG_TARGET(${target}
++ DESTINATION ${INSTALL_PLUGINDIR}/debug
++ COMPONENT ${INSTALL_COMPONENT})
++ # Add installed files to list for RPMs
++ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
++ ENDIF()
+ # Add installed files to list for RPMs
+ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
+- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
+- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n")
+ # For internal testing in PB2, append collections files
+ IF(DEFINED ENV{PB2WORKDIR})
+ PLUGIN_APPEND_COLLECTIONS(${plugin})
Property changes on: trunk/databases/mysql57-client/files/patch-cmake_plugin.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-cmake_ssl.cmake
===================================================================
--- trunk/databases/mysql57-client/files/patch-cmake_ssl.cmake (rev 0)
+++ trunk/databases/mysql57-client/files/patch-cmake_ssl.cmake 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,15 @@
+--- cmake/ssl.cmake.orig 2016-08-12 10:55:07 UTC
++++ cmake/ssl.cmake
+@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL)
+ OPENSSL_MAJOR_VERSION STREQUAL "1"
+ )
+ SET(OPENSSL_FOUND TRUE)
++ ELSEIF(OPENSSL_INCLUDE_DIR AND
++ OPENSSL_LIBRARY AND
++ CRYPTO_LIBRARY AND
++ OPENSSL_MAJOR_VERSION STREQUAL "2"
++ )
++ SET(OPENSSL_FOUND TRUE)
+ ELSE()
+ SET(OPENSSL_FOUND FALSE)
+ ENDIF()
Property changes on: trunk/databases/mysql57-client/files/patch-cmake_ssl.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h
===================================================================
--- trunk/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h (rev 0)
+++ trunk/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,11 @@
+--- cmd-line-utils/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC
++++ cmd-line-utils/libedit/chartype.h
+@@ -49,7 +49,7 @@
+ TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
+ #if !defined(__NetBSD__) && !defined(__sun) \
+ && !(defined(__APPLE__) && defined(__MACH__)) \
+- && !defined(__FreeBSD__) && !defined(_AIX)
++ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
+ #ifndef __STDC_ISO_10646__
+ /* In many places it is assumed that the first 127 code points are ASCII
+ * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
Property changes on: trunk/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c
===================================================================
--- trunk/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c (rev 0)
+++ trunk/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,20 @@
+--- cmd-line-utils/libedit/vi.c.orig 2016-03-28 18:06:12 UTC
++++ cmd-line-utils/libedit/vi.c
+@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
+ * NB: posix implies that we should enter insert mode, however
+ * this is against historical precedent...
+ */
+-#if defined(__weak_reference) && !defined(__FreeBSD__)
++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
+ __weakref_visible char *my_get_alias_text(const char *)
+ __weak_reference(get_alias_text);
+ #endif
+@@ -928,7 +928,7 @@ protected el_action_t
+ vi_alias(EditLine *el __attribute__((__unused__)),
+ Int c __attribute__((__unused__)))
+ {
+-#if defined(__weak_reference) && !defined(__FreeBSD__)
++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
+ char alias_name[3];
+ char *alias_text;
+
Property changes on: trunk/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-configure.cmake
===================================================================
--- trunk/databases/mysql57-client/files/patch-configure.cmake (rev 0)
+++ trunk/databases/mysql57-client/files/patch-configure.cmake 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,15 @@
+--- configure.cmake.orig 2018-01-16 23:26:09 UTC
++++ configure.cmake
+@@ -43,6 +43,12 @@ IF(UNIX)
+ ENDIF()
+
+
++IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
++ SET(CMAKE_SHARED_LIBRARY_C_FLAGS
++ "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%")
++ENDIF()
++
++
+ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX)
+ ## We will be using gcc to generate .so files
+ ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS
Property changes on: trunk/databases/mysql57-client/files/patch-configure.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-extra_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-client/files/patch-extra_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-client/files/patch-extra_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,33 @@
+--- extra/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ extra/CMakeLists.txt
+@@ -45,6 +45,7 @@ ENDIF()
+
+ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h
+ ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
++ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/
+ COMMAND comp_err
+ --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets
+ --out-dir=${PROJECT_BINARY_DIR}/sql/share/
+@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
+ ENDIF()
+
+
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
+ TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
+ SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
+@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
+ TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY})
+ ADD_DEPENDENCIES(innochecksum GenError)
+ ENDIF()
++ENDIF()
+
++IF(FALSE)
+ IF(UNIX)
+ MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
+ TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
+ ENDIF()
++ENDIF()
+
+ # In published release builds on Solaris, we need to bundle gcc source.
+ # PB2 will take care of putting it in extra/ when needed
Property changes on: trunk/databases/mysql57-client/files/patch-extra_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-include_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-client/files/patch-include_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-client/files/patch-include_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,10 @@
+--- include/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ include/CMakeLists.txt
+@@ -38,6 +38,7 @@ SET(HEADERS_ABI
+
+ SET(HEADERS
+ ${HEADERS_ABI}
++ hash.h
+ my_dbug.h
+ m_string.h
+ my_sys.h
Property changes on: trunk/databases/mysql57-client/files/patch-include_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-include_my__compare.h
===================================================================
--- trunk/databases/mysql57-client/files/patch-include_my__compare.h (rev 0)
+++ trunk/databases/mysql57-client/files/patch-include_my__compare.h 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,11 @@
+--- include/my_compare.h.orig 2016-03-28 18:06:12 UTC
++++ include/my_compare.h
+@@ -40,7 +40,7 @@ extern "C" {
+ But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
+ */
+
+-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
+ #define HA_MAX_KEY_SEG 16 /* Max segments for key */
+
+ #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
Property changes on: trunk/databases/mysql57-client/files/patch-include_my__compare.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-include_myisam.h
===================================================================
--- trunk/databases/mysql57-client/files/patch-include_myisam.h (rev 0)
+++ trunk/databases/mysql57-client/files/patch-include_myisam.h 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,11 @@
+--- include/myisam.h.orig 2016-03-28 18:06:12 UTC
++++ include/myisam.h
+@@ -45,7 +45,7 @@ extern "C" {
+ The following defines can be increased if necessary.
+ But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
+ */
+-#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */
++#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */
+ #define MI_MAX_KEY_SEG 16 /* Max segments for key */
+
+ #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
Property changes on: trunk/databases/mysql57-client/files/patch-include_myisam.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,11 @@
+--- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ libmysql/CMakeLists.txt
+@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)
+ COMPONENT SharedLibraries)
+ IF(UNIX)
+ # libtool compatability
+- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
++ IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly" OR APPLE)
+ SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
+ ELSE()
+ SET(OS_SHARED_LIB_VERSION
Property changes on: trunk/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,11 @@
+--- libmysql/authentication_ldap/CMakeLists.txt.orig 2018-03-04 13:40:40 UTC
++++ libmysql/authentication_ldap/CMakeLists.txt
+@@ -54,7 +54,7 @@ ENDIF()
+ IF (CMAKE_SYSTEM_NAME MATCHES "SunOS")
+ SET(SASL_LIBRARY "sasl")
+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+- SET(SASL_LIBRARY "-L/usr/local/lib -R/usr/local/lib -lsasl2")
++ SET(SASL_LIBRARY "-L/usr/local/lib -rpath /usr/local/lib -lsasl2")
+ ELSE()
+ SET(SASL_LIBRARY "sasl2")
+ ENDIF ()
Property changes on: trunk/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-man_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-client/files/patch-man_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-client/files/patch-man_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,13 @@
+--- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
++++ man/CMakeLists.txt
+@@ -15,10 +15,6 @@
+
+ # Copy man pages
+ FILE(GLOB MAN1_FILES *.1)
+-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
+-FILE(GLOB MAN1_NDB ndb*.1)
+-FILE(GLOB MAN8_FILES *.8)
+-FILE(GLOB MAN8_NDB ndb*.8)
+ IF(MAN1_FILES)
+ IF(MAN1_EXCLUDE)
+ LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
Property changes on: trunk/databases/mysql57-client/files/patch-man_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
===================================================================
--- trunk/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc (rev 0)
+++ trunk/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,61 @@
+--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC
++++ mysys_ssl/my_default.cc
+@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
+
+ /* Which directories are searched for options (and in which order) */
+
+-#define MAX_DEFAULT_DIRS 6
++#define MAX_DEFAULT_DIRS 7
+ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
+ static const char **default_directories = NULL;
+
+@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
+ return 1; /* Ignore wrong files */
+ }
+
++ if (strstr(name, "/etc") == name)
++ {
++ fprintf(stderr,
++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++ name,name);
++ goto err;
++ }
++
+ while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
+ {
+ line++;
+@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
+ end[(strlen(end)-1)] = ' ';
+ else
+ strxmov(end, conf_file, *ext , " ", NullS);
+- fputs(name, stdout);
++ if (strstr(name, "/etc") != name)
++ fputs(name, stdout);
+ }
+ }
+ }
+@@ -1411,13 +1420,8 @@ static const char **init_default_directo
+
+ #else
+
+- errors += add_directory(alloc, "/etc/", dirs);
+- errors += add_directory(alloc, "/etc/mysql/", dirs);
+-
+-#if defined(DEFAULT_SYSCONFDIR)
+- if (DEFAULT_SYSCONFDIR[0])
+- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
+-#endif /* DEFAULT_SYSCONFDIR */
++ errors += add_directory(alloc, "/usr/local/etc/", dirs);
++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
+
+ #endif
+
+@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
+ MY_STAT stat_info;
+
+ if (!my_stat(file_name,&stat_info,MYF(0)))
+- return 1;
++ return 0;
+ /*
+ Ignore .mylogin.cnf file if not exclusively readable/writable
+ by current user.
Property changes on: trunk/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-mysys_my__symlink.c
===================================================================
--- trunk/databases/mysql57-client/files/patch-mysys_my__symlink.c (rev 0)
+++ trunk/databases/mysql57-client/files/patch-mysys_my__symlink.c 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,10 @@
+--- mysys/my_symlink.c.orig 2017-07-19 12:10:42 UTC
++++ mysys/my_symlink.c
+@@ -23,6 +23,7 @@
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #endif
++#include "my_dir.h"
+
+ /*
+ Reads the content of a symbolic link
Property changes on: trunk/databases/mysql57-client/files/patch-mysys_my__symlink.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-client/files/patch-scripts_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-client/files/patch-scripts_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,64 @@
+--- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ scripts/CMakeLists.txt
+@@ -43,6 +43,7 @@ ELSE()
+ MESSAGE(FATAL_ERROR "Cannot concatenate files")
+ ENDIF()
+
++IF(FALSE)
+ # Build mysql_fix_privilege_tables.c
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
+@@ -63,6 +64,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
+ ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
+ )
++ENDIF()
+
+ # If we do not have performance schema compiled in then sys will not work,
+ # so only create an empty sys database with an auto-generated file,
+@@ -143,6 +145,7 @@ IF(NOT WITHOUT_SERVER)
+ )
+ ENDIF()
+
++IF(FALSE)
+ IF(UNIX)
+ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
+ "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
+@@ -150,6 +153,7 @@ IF(UNIX)
+ COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
+ )
+ ENDIF()
++ENDIF()
+
+ IF(NOT WITHOUT_SERVER)
+ INSTALL(FILES
+@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
+ STRING(REGEX REPLACE "^lib" "" lib "${lib}")
+ SET(${var} "${${var}}-l${lib} " )
++ ELSEIF(lib STREQUAL "-pthread")
++ SET(${var} "${${var}}-pthread " )
+ ELSE()
+ SET(${var} "${${var}}-l${lib} " )
+ ENDIF()
+@@ -430,19 +436,7 @@ ELSE()
+ # On Unix, most of the files end up in the bin directory
+ SET(mysql_config_COMPONENT COMPONENT Development)
+
+- IF(WITH_SYSTEMD)
+- SET(BIN_SCRIPTS
+- mysql_config
+- mysqldumpslow
+- )
+- ELSE()
+- SET(BIN_SCRIPTS
+- mysql_config
+- mysqldumpslow
+- mysqld_multi
+- mysqld_safe
+- )
+- ENDIF()
++ SET(BIN_SCRIPTS mysql_config)
+
+ SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
+ STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
Property changes on: trunk/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c
===================================================================
--- trunk/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c (rev 0)
+++ trunk/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,23 @@
+--- storage/myisam/mi_dynrec.c.orig 2016-03-28 18:06:12 UTC
++++ storage/myisam/mi_dynrec.c
+@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
+ DBUG_RETURN(1);
+ }
+ /*
+- I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
+- MAP_NORESERVE
+- Do not reserve swap space for this mapping. When swap space is
+- reserved, one has the guarantee that it is possible to modify the
+- mapping. When swap space is not reserved one might get SIGSEGV
+- upon a write if no physical memory is available.
++ MAP_NORESERVE is unimplemented in FreeBSD
+ */
+ info->s->file_map= (uchar*)
+ my_mmap(0, (size_t) size,
+ info->s->mode==O_RDONLY ? PROT_READ :
+ PROT_READ | PROT_WRITE,
+- MAP_SHARED | MAP_NORESERVE,
++ MAP_SHARED,
+ info->dfile, 0L);
+ if (info->s->file_map == (uchar*) MAP_FAILED)
+ {
Property changes on: trunk/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-client/files/patch-support-files_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-client/files/patch-support-files_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,27 @@
+--- support-files/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC
++++ support-files/CMakeLists.txt
+@@ -47,6 +47,7 @@ IF(UNIX)
+ SET (PIDOF "pgrep -d' ' -f")
+ ENDIF()
+ SET(prefix ${CMAKE_INSTALL_PREFIX})
++IF (FALSE)
+ FOREACH(script mysqld_multi.server mysql-log-rotate)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
+ ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
+@@ -59,9 +60,11 @@ IF(UNIX)
+ IF(INSTALL_SUPPORTFILESDIR)
+ INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
+ ENDIF()
++ENDIF()
+
+ INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
+
++IF(FALSE)
+ SET(bindir ${prefix}/${INSTALL_BINDIR})
+ SET(sbindir ${prefix}/${INSTALL_SBINDIR})
+ SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR})
+@@ -74,3 +77,4 @@ IF(UNIX)
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
+ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ ENDIF()
++ENDIF()
Property changes on: trunk/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/pkg-message
===================================================================
--- trunk/databases/mysql57-client/pkg-message (rev 0)
+++ trunk/databases/mysql57-client/pkg-message 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,6 @@
+* * * * * * * * * * * * * * * * * * * * * * * *
+
+This is the mysql CLIENT without the server.
+for complete server and client, please install databases/mysql57-server
+
+* * * * * * * * * * * * * * * * * * * * * * * *
Property changes on: trunk/databases/mysql57-client/pkg-message
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-client/pkg-plist
===================================================================
--- trunk/databases/mysql57-client/pkg-plist (rev 0)
+++ trunk/databases/mysql57-client/pkg-plist 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,140 @@
+bin/mysql
+bin/mysql_config
+bin/mysql_config_editor
+bin/mysql_ssl_rsa_setup
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
+bin/mysqldump
+bin/mysqlimport
+bin/mysqlpump
+bin/mysqlshow
+bin/mysqlslap
+include/mysql/binary_log_types.h
+include/mysql/big_endian.h
+include/mysql/byte_order_generic.h
+include/mysql/byte_order_generic_x86.h
+include/mysql/decimal.h
+include/mysql/errmsg.h
+include/mysql/hash.h
+include/mysql/keycache.h
+include/mysql/little_endian.h
+include/mysql/m_ctype.h
+include/mysql/m_string.h
+include/mysql/my_alloc.h
+include/mysql/my_byteorder.h
+include/mysql/my_command.h
+include/mysql/my_compiler.h
+include/mysql/my_config.h
+include/mysql/my_dbug.h
+include/mysql/my_dir.h
+include/mysql/my_getopt.h
+include/mysql/my_global.h
+include/mysql/my_list.h
+include/mysql/my_sys.h
+include/mysql/my_thread.h
+include/mysql/my_thread_local.h
+include/mysql/my_xml.h
+include/mysql/mysql.h
+include/mysql/mysql/client_authentication.h
+include/mysql/mysql/client_plugin.h
+include/mysql/mysql/client_plugin.h.pp
+include/mysql/mysql/com_data.h
+include/mysql/mysql/get_password.h
+include/mysql/mysql/group_replication_priv.h
+include/mysql/mysql/innodb_priv.h
+include/mysql/mysql/mysql_lex_string.h
+include/mysql/mysql/plugin.h
+include/mysql/mysql/plugin_audit.h
+include/mysql/mysql/plugin_audit.h.pp
+include/mysql/mysql/plugin_auth.h
+include/mysql/mysql/plugin_auth.h.pp
+include/mysql/mysql/plugin_auth_common.h
+include/mysql/mysql/plugin_ftparser.h
+include/mysql/mysql/plugin_ftparser.h.pp
+include/mysql/mysql/plugin_group_replication.h
+include/mysql/mysql/plugin_keyring.h
+include/mysql/mysql/plugin_keyring.h.pp
+include/mysql/mysql/plugin_trace.h
+include/mysql/mysql/plugin_validate_password.h
+include/mysql/mysql/psi/mysql_file.h
+include/mysql/mysql/psi/mysql_idle.h
+include/mysql/mysql/psi/mysql_mdl.h
+include/mysql/mysql/psi/mysql_memory.h
+include/mysql/mysql/psi/mysql_ps.h
+include/mysql/mysql/psi/mysql_socket.h
+include/mysql/mysql/psi/mysql_sp.h
+include/mysql/mysql/psi/mysql_stage.h
+include/mysql/mysql/psi/mysql_statement.h
+include/mysql/mysql/psi/mysql_table.h
+include/mysql/mysql/psi/mysql_thread.h
+include/mysql/mysql/psi/mysql_transaction.h
+include/mysql/mysql/psi/psi.h
+include/mysql/mysql/psi/psi_base.h
+include/mysql/mysql/psi/psi_memory.h
+include/mysql/mysql/service_command.h
+include/mysql/mysql/service_locking.h
+include/mysql/mysql/service_my_plugin_log.h
+include/mysql/mysql/service_my_snprintf.h
+include/mysql/mysql/service_mysql_alloc.h
+include/mysql/mysql/service_mysql_keyring.h
+include/mysql/mysql/service_mysql_password_policy.h
+include/mysql/mysql/service_mysql_string.h
+include/mysql/mysql/service_parser.h
+include/mysql/mysql/service_rpl_transaction_ctx.h
+include/mysql/mysql/service_rpl_transaction_write_set.h
+include/mysql/mysql/service_rules_table.h
+include/mysql/mysql/service_security_context.h
+include/mysql/mysql/service_srv_session.h
+include/mysql/mysql/service_srv_session_info.h
+include/mysql/mysql/service_ssl_wrapper.h
+include/mysql/mysql/service_thd_alloc.h
+include/mysql/mysql/service_thd_engine_lock.h
+include/mysql/mysql/service_thd_wait.h
+include/mysql/mysql/service_thread_scheduler.h
+include/mysql/mysql/services.h
+include/mysql/mysql/services.h.pp
+include/mysql/mysql/thread_pool_priv.h
+include/mysql/mysql/thread_type.h
+include/mysql/mysql_com.h
+include/mysql/mysql_com_server.h
+include/mysql/mysql_embed.h
+include/mysql/mysql_time.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_ername.h
+include/mysql/mysqld_error.h
+include/mysql/plugin.h
+include/mysql/plugin_audit.h
+include/mysql/plugin_ftparser.h
+include/mysql/plugin_group_replication.h
+include/mysql/plugin_keyring.h
+include/mysql/plugin_validate_password.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
+include/mysql/sslopt-case.h
+include/mysql/sslopt-longopts.h
+include/mysql/sslopt-vars.h
+include/mysql/thr_cond.h
+include/mysql/thr_mutex.h
+include/mysql/thr_rwlock.h
+include/mysql/typelib.h
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.20
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
+lib/mysql/libmysqlclient_r.so.20
+%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
+libdata/pkgconfig/mysqlclient.pc
+man/man1/comp_err.1.gz
+man/man1/mysql.1.gz
+man/man1/mysql_config.1.gz
+man/man1/mysql_config_editor.1.gz
+man/man1/mysqladmin.1.gz
+man/man1/mysqlbinlog.1.gz
+man/man1/mysqlcheck.1.gz
+man/man1/mysqldump.1.gz
+man/man1/mysqlimport.1.gz
+man/man1/mysqlshow.1.gz
+man/man1/mysqlslap.1.gz
+share/aclocal/mysql.m4
Property changes on: trunk/databases/mysql57-client/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/Makefile
===================================================================
--- trunk/databases/mysql57-server/Makefile (rev 0)
+++ trunk/databases/mysql57-server/Makefile 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,174 @@
+# $MidnightBSD$
+
+PORTNAME?= mysql
+PORTVERSION= 5.7.22
+PORTREVISION?= 0
+CATEGORIES= databases ipv6
+MASTER_SITES= MYSQL/MySQL-5.7
+PKGNAMESUFFIX?= 57-server
+DISTNAME= ${PORTNAME}-boost-${PORTVERSION}
+
+MAINTAINER= ports at MidnightBSD.org
+COMMENT?= Multithreaded SQL database (server)
+
+LICENSE= gpl2
+
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+SLAVEDIRS= databases/mysql57-client
+USES= bison:build cmake:outsource,noninja compiler:c11 compiler:c++11-lib \
+ cpe libedit localbase perl5 shebangfix ssl
+
+USE_PERL5= run
+
+MY_DBDIR= /var/db/mysql
+MY_SECDIR= /var/db/mysql_secure
+MY_TMPDIR= /var/db/mysql_tmpdir
+
+LIB_DEPENDS+= libcurl.so:ftp/curl \
+ libevent.so:devel/libevent \
+ liblz4.so:archivers/liblz4 \
+ libprotobuf.so:devel/protobuf
+
+CMAKE_BUILD_TYPE= Release
+
+CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
+ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
+ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
+ -DINSTALL_DOCDIR="share/doc/mysql" \
+ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \
+ -DINSTALL_INCLUDEDIR="include/mysql" \
+ -DINSTALL_INFODIR="info" \
+ -DINSTALL_LIBDIR="lib/mysql" \
+ -DINSTALL_MANDIR="man" \
+ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
+ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
+ -DINSTALL_MYSQLSHAREDIR="share/mysql" \
+ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
+ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \
+ -DINSTALL_SBINDIR="libexec" \
+ -DINSTALL_SCRIPTDIR="bin" \
+ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
+ -DINSTALL_SHAREDIR="share" \
+ -DINSTALL_SUPPORTFILESDIR="share/mysql" \
+ -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
+ -DWITH_BOOST="${WRKSRC}/boost" \
+ -DWITH_EDITLINE=system \
+ -DWITH_LIBEVENT=system \
+ -DWITH_LZ4=system \
+ -DWITH_ZLIB=system \
+ -DWITH_PROTOBUF=system \
+ -DWITH_CURL=system \
+ -DINSTALL_MYSQLTESTDIR=0 \
+ -DWITH_DEBUG=0
+
+SHEBANG_FILES= scripts/*.pl* scripts/*.sh
+
+.ifdef USE_MYSQL
+.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+.endif
+
+SUB_LIST= MY_DBDIR=${MY_DBDIR} \
+ MY_SECDIR=${MY_SECDIR} \
+ MY_TMPDIR=${MY_TMPDIR}
+
+PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
+ MY_SECDIR=${MY_SECDIR} \
+ MY_TMPDIR=${MY_TMPDIR}
+
+OPTIONS_SUB= YES
+
+# MySQL-Server part
+.if !defined(CLIENT_ONLY)
+USES+= mysql:57
+
+CONFLICTS_INSTALL= mysql5[0-68-9]-server-* \
+ mysql[0-46-9][0-9]-server-* \
+ mysqlwsrep* \
+ mariadb[0-9][0-9]-server-* \
+ percona[0-9][0-9]-server-*
+
+USE_RC_SUBR= mysql-server
+
+SUB_FILES= my.cnf.sample
+
+USERS= mysql
+GROUPS= mysql
+
+USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
+
+MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
+ mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
+ mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
+ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
+ mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
+ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
+
+CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
+
+OPTIONS_GROUP+= STORAGE
+OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
+STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server)
+ARCHIVE_DESC= Compile "Archive Storage" statically in server
+BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server
+EXAMPLE_DESC= Compile "Example Storage" statically in server
+FEDERATED_DESC= Compile "Federated Storage" statically in server
+INNOBASE_DESC= Compile "InnoDB Storage" statically in server
+PARTITION_DESC= Compile "Partitioning support Storage" statically in server
+PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server
+
+ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1
+BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1
+EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1
+FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1
+INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1
+PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1
+PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1
+
+OPTIONS_GROUP+= FEATURES
+FEATURES_DESC= Default features knobs
+OPTIONS_GROUP_FEATURES= PERFSCHM
+PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage)
+OPTIONS_DEFAULT+= PERFSCHM
+
+PERFSCHM_SUB_LIST+= PERFSCHEMRC=""
+PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"
+FEDERATED_SUB_LIST+= FEDER="--federated"
+FEDERATED_SUB_LIST_OFF+= FEDER=""
+
+# issue 220865: Currently there's no source to be built with server-side support.
+# But this keeps the pkg-plist not overlaping
+CMAKE_ARGS+= -DWITH_AUTHENTICATION_LDAP=0
+.endif
+
+.include <bsd.mport.options.mk>
+
+SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment "
+
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT} == base
+CMAKE_ARGS+= -DWITH_SSL=system
+.else
+CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE}
+.endif
+
+post-extract:
+ @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
+
+post-patch:
+ @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
+ # issue 220865: MySQL developers forgot that FreeBSD != Linux
+ @${REINPLACE_CMD} -e 's|%%FREEBSD_LOCAL_LIB%%|${LOCALBASE}/lib|g' \
+ ${WRKSRC}/configure.cmake
+
+.if !defined(CLIENT_ONLY)
+post-install:
+ ${MKDIR} ${STAGEDIR}${ETCDIR}
+ ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
+ ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
+ ${MKDIR} ${STAGEDIR}${MY_SECDIR}
+ ${MKDIR} ${STAGEDIR}${MY_TMPDIR}
+.endif
+
+.include <bsd.port.post.mk>
Property changes on: trunk/databases/mysql57-server/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/distinfo
===================================================================
--- trunk/databases/mysql57-server/distinfo (rev 0)
+++ trunk/databases/mysql57-server/distinfo 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1524221054
+SHA256 (mysql-boost-5.7.22.tar.gz) = 5b2a61700af7c99f5630a7dfdb099af9283c3029843cddd9e123bcdbcc4aad03
+SIZE (mysql-boost-5.7.22.tar.gz) = 48985783
Property changes on: trunk/databases/mysql57-server/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/extra-patch-config.h.cmake
===================================================================
--- trunk/databases/mysql57-server/files/extra-patch-config.h.cmake (rev 0)
+++ trunk/databases/mysql57-server/files/extra-patch-config.h.cmake 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,12 @@
+--- config.h.cmake.orig 2014-12-05 16:24:02 UTC
++++ config.h.cmake
+@@ -151,7 +151,8 @@
+ #cmakedefine HAVE_FESETROUND 1
+ #cmakedefine HAVE_FINITE 1
+ #cmakedefine HAVE_FP_EXCEPT 1
+-#cmakedefine HAVE_FPSETMASK 1
++#cmakedefine HAVE_FPSETMASK 0
++#cmakedefine HAVE_FEDISABLEEXCEPT 1
+ #cmakedefine HAVE_FSEEKO 1
+ #cmakedefine HAVE_FSYNC 1
+ #cmakedefine HAVE_FTIME 1
Property changes on: trunk/databases/mysql57-server/files/extra-patch-config.h.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/my.cnf.sample.in
===================================================================
--- trunk/databases/mysql57-server/files/my.cnf.sample.in (rev 0)
+++ trunk/databases/mysql57-server/files/my.cnf.sample.in 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,64 @@
+# $FreeBSD: head/databases/mysql57-server/files/my.cnf.sample.in 414707 2016-05-06 14:39:59Z riggs $
+
+[client]
+port = 3306
+socket = /tmp/mysql.sock
+
+[mysql]
+prompt = \u@\h [\d]>\_
+no_auto_rehash
+
+[mysqld]
+user = mysql
+port = 3306
+socket = /tmp/mysql.sock
+bind-address = 127.0.0.1
+basedir = %%PREFIX%%
+datadir = %%MY_DBDIR%%
+tmpdir = %%MY_TMPDIR%%
+slave-load-tmpdir = %%MY_TMPDIR%%
+secure-file-priv = %%MY_SECDIR%%
+log-bin = mysql-bin
+log-output = TABLE
+master-info-repository = TABLE
+relay-log-info-repository = TABLE
+relay-log-recovery = 1
+slow-query-log = 1
+server-id = 1
+sync_binlog = 1
+sync_relay_log = 1
+binlog_cache_size = 16M
+expire_logs_days = 30
+default_password_lifetime = 0
+enforce-gtid-consistency = 1
+gtid-mode = ON
+safe-user-create = 1
+lower_case_table_names = 1
+explicit-defaults-for-timestamp = 1
+myisam-recover-options = BACKUP,FORCE
+open_files_limit = 32768
+table_open_cache = 16384
+table_definition_cache = 8192
+net_retry_count = 16384
+key_buffer_size = 256M
+max_allowed_packet = 64M
+query_cache_type = 0
+query_cache_size = 0
+long_query_time = 0.5
+innodb_buffer_pool_size = 1G
+innodb_data_home_dir = %%MY_DBDIR%%
+innodb_log_group_home_dir = %%MY_DBDIR%%
+innodb_data_file_path = ibdata1:128M:autoextend
+innodb_temp_data_file_path = ibtmp1:128M:autoextend
+innodb_flush_method = O_DIRECT
+innodb_log_file_size = 256M
+innodb_log_buffer_size = 16M
+innodb_write_io_threads = 8
+innodb_read_io_threads = 8
+innodb_autoinc_lock_mode = 2
+skip-symbolic-links
+
+[mysqldump]
+max_allowed_packet = 256M
+quote_names
+quick
Property changes on: trunk/databases/mysql57-server/files/my.cnf.sample.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/mysql-server.in
===================================================================
--- trunk/databases/mysql57-server/files/mysql-server.in (rev 0)
+++ trunk/databases/mysql57-server/files/mysql-server.in 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,92 @@
+#!/bin/sh
+#
+# $FreeBSD: head/databases/mysql57-server/files/mysql-server.in 466507 2018-04-04 20:57:11Z mmokhi $
+#
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# mysql_enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable MySQL.
+%%LEGACY_LIMITS%%# mysql_limits (bool): Set to "NO" by default.
+%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
+%%LEGACY_LIMITS%%# just before mysql starts.
+# mysql_dbdir (str): Default to "%%MY_DBDIR%%"
+# Base database directory.
+# mysql_confdir (str): Default to "%%ETCDIR%%"
+# Base configuration directory.
+# mysql_optfile (str): Server-specific option file.
+# Set it in the rc.conf or default behaviour of
+# `mysqld_safe` itself, will be picking
+# ${mysql_confdir}/my.cnf if it exists.
+# mysql_pidfile (str): Custum PID file path and name.
+# Default to "${mysql_dbdir}/${hostname}.pid".
+# mysql_args (str): Custom additional arguments to be passed
+# to mysqld_safe (default empty).
+#
+
+. /etc/rc.subr
+
+name="mysql"
+rcvar=mysql_enable
+
+load_rc_config $name
+
+: ${mysql_enable="NO"}
+%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
+: ${mysql_dbdir="%%MY_DBDIR%%"}
+: ${mysql_confdir="%%ETCDIR%%"}
+if [ -f "${mysql_confdir}/my.cnf" ]; then
+: ${mysql_optfile="${mysql_confdir}/my.cnf"}
+elif [ -f "${mysql_dbdir}/my.cnf" ]; then
+: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
+fi
+if [ ! -z "${mysql_optfile}" ]; then
+mysql_extra="--defaults-extra-file=${mysql_optfile}"
+fi
+
+
+mysql_user="mysql"
+%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
+command="/usr/sbin/daemon"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="${name}_prestart"
+start_postcmd="${name}_poststart"
+mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
+mysql_install_db_args="${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname} --user=${mysql_user}"
+
+mysql_create_auth_tables()
+{
+ eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
+}
+
+mysql_prestart()
+{
+ if [ ! -d "${mysql_dbdir}/mysql/." ]; then
+ mysql_create_auth_tables || return 1
+ fi
+%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
+%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+%%LEGACY_LIMITS%% else
+%%LEGACY_LIMITS%% return 0
+%%LEGACY_LIMITS%% fi
+%%MODERN_LIMITS%% return 0
+}
+
+mysql_poststart()
+{
+ local timeout=15
+ while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+ timeout=$(( timeout - 1 ))
+ sleep 1
+ done
+ return 0
+}
+
+run_rc_command "$1"
Property changes on: trunk/databases/mysql57-server/files/mysql-server.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-server/files/patch-CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-server/files/patch-CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,40 @@
+--- CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ CMakeLists.txt
+@@ -614,12 +614,10 @@ IF(UNIX)
+ ENDIF()
+
+ IF(NOT WITHOUT_SERVER)
+- ADD_SUBDIRECTORY(testclients)
+ ADD_SUBDIRECTORY(sql)
+ OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
+ IF(WITH_EMBEDDED_SERVER)
+ ADD_SUBDIRECTORY(libmysqld)
+- ADD_SUBDIRECTORY(libmysqld/examples)
+ ENDIF(WITH_EMBEDDED_SERVER)
+ ENDIF()
+
+@@ -628,8 +626,6 @@ ENDIF()
+ ADD_SUBDIRECTORY(scripts)
+
+ IF(NOT WITHOUT_SERVER)
+- ADD_SUBDIRECTORY(mysql-test)
+- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
+ ADD_SUBDIRECTORY(support-files)
+ IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
+ ADD_SUBDIRECTORY(internal)
+@@ -684,6 +680,7 @@ ENDIF()
+ #
+ # RPM installs documentation directly from the source tree
+ #
++IF(FALSE)
+ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ INSTALL(FILES COPYING LICENSE.mysql
+ DESTINATION ${INSTALL_DOCREADMEDIR}
+@@ -706,6 +703,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ PATTERN "sp-imp-spec.txt" EXCLUDE
+ )
+ ENDIF()
++ENDIF()
+
+ INCLUDE(CPack)
+
Property changes on: trunk/databases/mysql57-server/files/patch-CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-client_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-server/files/patch-client_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-server/files/patch-client_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,78 @@
+--- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ client/CMakeLists.txt
+@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
+
+ ## Subdirectory with common client code.
+ ADD_SUBDIRECTORY(base)
+-## Subdirectory for mysqlpump code.
+-ADD_SUBDIRECTORY(dump)
+
+ ## We will need libeay32.dll and ssleay32.dll when running client executables.
+ COPY_OPENSSL_DLLS(copy_openssl_client)
+@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+ ADD_DEFINITIONS(${SSL_DEFINES})
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc)
+ TARGET_LINK_LIBRARIES(mysql mysqlclient)
+ IF(UNIX)
+ TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
+ ENDIF(UNIX)
++ENDIF()
+
+ IF(NOT WITHOUT_SERVER)
+ MYSQL_ADD_EXECUTABLE(mysql_upgrade
+@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
+ ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
+ TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
+
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
+ TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
+
+@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
+
+ MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
+ TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
++ENDIF()
+
+ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
+ TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
+
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
+ ADD_COMPILE_FLAGS(
+ mysqlbinlog.cc
+@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+
+ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
+ TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
++ENDIF()
+
+ MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
+ TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
+@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
+ ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
+ ENDIF()
+
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
+ TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
+ SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX)
++ENDIF()
+
+ # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
+ IF(WIN32)
+@@ -123,11 +129,6 @@ ENDIF(WIN32)
+
+ SET_TARGET_PROPERTIES (
+ mysql_plugin
+- mysqlcheck
+- mysqldump
+- mysqlimport
+- mysqlshow
+- mysqlslap
+ PROPERTIES HAS_CXX TRUE)
+
+ ADD_DEFINITIONS(-DHAVE_DLOPEN)
Property changes on: trunk/databases/mysql57-server/files/patch-client_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-cmake_plugin.cmake
===================================================================
--- trunk/databases/mysql57-server/files/patch-cmake_plugin.cmake (rev 0)
+++ trunk/databases/mysql57-server/files/patch-cmake_plugin.cmake 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,25 @@
+--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC
++++ cmake/plugin.cmake
+@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN)
+ MYSQL_INSTALL_TARGETS(${target}
+ DESTINATION ${INSTALL_PLUGINDIR}
+ COMPONENT ${INSTALL_COMPONENT})
+- INSTALL_DEBUG_TARGET(${target}
+- DESTINATION ${INSTALL_PLUGINDIR}/debug
+- COMPONENT ${INSTALL_COMPONENT})
++ IF(CMAKE_BUILD_TYPE MATCHES "Debug")
++ INSTALL_DEBUG_TARGET(${target}
++ DESTINATION ${INSTALL_PLUGINDIR}/debug
++ COMPONENT ${INSTALL_COMPONENT})
++ # Add installed files to list for RPMs
++ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
++ ENDIF()
+ # Add installed files to list for RPMs
+ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
+- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
+- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n")
+ # For internal testing in PB2, append collections files
+ IF(DEFINED ENV{PB2WORKDIR})
+ PLUGIN_APPEND_COLLECTIONS(${plugin})
Property changes on: trunk/databases/mysql57-server/files/patch-cmake_plugin.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-cmake_ssl.cmake
===================================================================
--- trunk/databases/mysql57-server/files/patch-cmake_ssl.cmake (rev 0)
+++ trunk/databases/mysql57-server/files/patch-cmake_ssl.cmake 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,15 @@
+--- cmake/ssl.cmake.orig 2016-08-12 10:55:07 UTC
++++ cmake/ssl.cmake
+@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL)
+ OPENSSL_MAJOR_VERSION STREQUAL "1"
+ )
+ SET(OPENSSL_FOUND TRUE)
++ ELSEIF(OPENSSL_INCLUDE_DIR AND
++ OPENSSL_LIBRARY AND
++ CRYPTO_LIBRARY AND
++ OPENSSL_MAJOR_VERSION STREQUAL "2"
++ )
++ SET(OPENSSL_FOUND TRUE)
+ ELSE()
+ SET(OPENSSL_FOUND FALSE)
+ ENDIF()
Property changes on: trunk/databases/mysql57-server/files/patch-cmake_ssl.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h
===================================================================
--- trunk/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h (rev 0)
+++ trunk/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,11 @@
+--- cmd-line-utils/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC
++++ cmd-line-utils/libedit/chartype.h
+@@ -49,7 +49,7 @@
+ TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
+ #if !defined(__NetBSD__) && !defined(__sun) \
+ && !(defined(__APPLE__) && defined(__MACH__)) \
+- && !defined(__FreeBSD__) && !defined(_AIX)
++ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
+ #ifndef __STDC_ISO_10646__
+ /* In many places it is assumed that the first 127 code points are ASCII
+ * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
Property changes on: trunk/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c
===================================================================
--- trunk/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c (rev 0)
+++ trunk/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,20 @@
+--- cmd-line-utils/libedit/vi.c.orig 2016-03-28 18:06:12 UTC
++++ cmd-line-utils/libedit/vi.c
+@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
+ * NB: posix implies that we should enter insert mode, however
+ * this is against historical precedent...
+ */
+-#if defined(__weak_reference) && !defined(__FreeBSD__)
++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
+ __weakref_visible char *my_get_alias_text(const char *)
+ __weak_reference(get_alias_text);
+ #endif
+@@ -928,7 +928,7 @@ protected el_action_t
+ vi_alias(EditLine *el __attribute__((__unused__)),
+ Int c __attribute__((__unused__)))
+ {
+-#if defined(__weak_reference) && !defined(__FreeBSD__)
++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
+ char alias_name[3];
+ char *alias_text;
+
Property changes on: trunk/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-include_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-server/files/patch-include_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-server/files/patch-include_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,19 @@
+--- include/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ include/CMakeLists.txt
+@@ -69,14 +69,13 @@ SET(HEADERS
+ ${HEADERS_GEN_CONFIGURE}
+ )
+
++IF(FALSE)
+ INSTALL(FILES
+ ../libbinlogevents/export/binary_log_types.h
+ DESTINATION ${INSTALL_INCLUDEDIR}
+- COMPONENT Development)
+-INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
+-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development
+ PATTERN "*.h"
+ PATTERN "psi_abi*" EXCLUDE
+ )
++ENDIF()
+
+
Property changes on: trunk/databases/mysql57-server/files/patch-include_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-include_my__compare.h
===================================================================
--- trunk/databases/mysql57-server/files/patch-include_my__compare.h (rev 0)
+++ trunk/databases/mysql57-server/files/patch-include_my__compare.h 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,11 @@
+--- include/my_compare.h.orig 2016-03-28 18:06:12 UTC
++++ include/my_compare.h
+@@ -40,7 +40,7 @@ extern "C" {
+ But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
+ */
+
+-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
+ #define HA_MAX_KEY_SEG 16 /* Max segments for key */
+
+ #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
Property changes on: trunk/databases/mysql57-server/files/patch-include_my__compare.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-include_my__thread__os__id.h
===================================================================
--- trunk/databases/mysql57-server/files/patch-include_my__thread__os__id.h (rev 0)
+++ trunk/databases/mysql57-server/files/patch-include_my__thread__os__id.h 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,15 @@
+--- include/my_thread_os_id.h.orig 2016-03-28 18:06:12 UTC
++++ include/my_thread_os_id.h
+@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa
+ return pthread_getthreadid_np();
+ #else
+ #ifdef HAVE_INTEGER_PTHREAD_SELF
++# ifdef __DragonFly__
++ return syscall(SYS_lwp_gettid);
++# else
+ /* Unknown platform, fallback. */
+ return pthread_self();
++# endif
+ #else
+ /* Feature not available. */
+ return 0;
Property changes on: trunk/databases/mysql57-server/files/patch-include_my__thread__os__id.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-include_myisam.h
===================================================================
--- trunk/databases/mysql57-server/files/patch-include_myisam.h (rev 0)
+++ trunk/databases/mysql57-server/files/patch-include_myisam.h 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,11 @@
+--- include/myisam.h.orig 2016-03-28 18:06:12 UTC
++++ include/myisam.h
+@@ -45,7 +45,7 @@ extern "C" {
+ The following defines can be increased if necessary.
+ But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
+ */
+-#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */
++#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */
+ #define MI_MAX_KEY_SEG 16 /* Max segments for key */
+
+ #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
Property changes on: trunk/databases/mysql57-server/files/patch-include_myisam.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,29 @@
+--- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ libmysql/CMakeLists.txt
+@@ -235,7 +235,7 @@ MESSAGE(STATUS
+ ADD_SUBDIRECTORY(authentication_ldap)
+
+ # Merge several convenience libraries into one big mysqlclient
+-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)
+ # and link them together into shared library.
+ MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+ EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
+- COMPONENT SharedLibraries)
++ 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
+ #
+ SET(CLIENT_API_FUNCTION_LIST "")
++ ENDIF()
+ FOREACH(api ${CLIENT_API_FUNCTIONS})
+ SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},")
+ ENDFOREACH()
Property changes on: trunk/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,18 @@
+--- libmysql/authentication_ldap/CMakeLists.txt.orig 2017-07-20 22:54:16 UTC
++++ libmysql/authentication_ldap/CMakeLists.txt
+@@ -52,8 +52,10 @@ ELSE ()
+ SET(SASL_LIBRARY "sasl2")
+ ENDIF ()
+
+-MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
+- auth_ldap_sasl_client.cc log_client.cc
+- LINK_LIBRARIES ${SASL_LIBRARY}
+- MODULE_ONLY
+- MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
++IF (WITH_AUTHENTICATION_LDAP)
++ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
++ auth_ldap_sasl_client.cc log_client.cc
++ LINK_LIBRARIES ${SASL_LIBRARY}
++ MODULE_ONLY
++ MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
++ENDIF()
Property changes on: trunk/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-libservices_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-server/files/patch-libservices_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-server/files/patch-libservices_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,9 @@
+--- libservices/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ libservices/CMakeLists.txt
+@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES
+ mysql_keyring_service.c)
+
+ ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
++IF(FALSE)
+ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
++ENDIF()
Property changes on: trunk/databases/mysql57-server/files/patch-libservices_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-man_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-server/files/patch-man_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-server/files/patch-man_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,11 @@
+--- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
++++ man/CMakeLists.txt
+@@ -15,8 +15,6 @@
+
+ # Copy man pages
+ FILE(GLOB MAN1_FILES *.1)
+-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
+-FILE(GLOB MAN1_NDB ndb*.1)
+ FILE(GLOB MAN8_FILES *.8)
+ FILE(GLOB MAN8_NDB ndb*.8)
+ IF(MAN1_FILES)
Property changes on: trunk/databases/mysql57-server/files/patch-man_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
===================================================================
--- trunk/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc (rev 0)
+++ trunk/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,61 @@
+--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC
++++ mysys_ssl/my_default.cc
+@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
+
+ /* Which directories are searched for options (and in which order) */
+
+-#define MAX_DEFAULT_DIRS 6
++#define MAX_DEFAULT_DIRS 7
+ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
+ static const char **default_directories = NULL;
+
+@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
+ return 1; /* Ignore wrong files */
+ }
+
++ if (strstr(name, "/etc") == name)
++ {
++ fprintf(stderr,
++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++ name,name);
++ goto err;
++ }
++
+ while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
+ {
+ line++;
+@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
+ end[(strlen(end)-1)] = ' ';
+ else
+ strxmov(end, conf_file, *ext , " ", NullS);
+- fputs(name, stdout);
++ if (strstr(name, "/etc") != name)
++ fputs(name, stdout);
+ }
+ }
+ }
+@@ -1411,13 +1420,8 @@ static const char **init_default_directo
+
+ #else
+
+- errors += add_directory(alloc, "/etc/", dirs);
+- errors += add_directory(alloc, "/etc/mysql/", dirs);
+-
+-#if defined(DEFAULT_SYSCONFDIR)
+- if (DEFAULT_SYSCONFDIR[0])
+- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
+-#endif /* DEFAULT_SYSCONFDIR */
++ errors += add_directory(alloc, "/usr/local/etc/", dirs);
++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
+
+ #endif
+
+@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
+ MY_STAT stat_info;
+
+ if (!my_stat(file_name,&stat_info,MYF(0)))
+- return 1;
++ return 0;
+ /*
+ Ignore .mylogin.cnf file if not exclusively readable/writable
+ by current user.
Property changes on: trunk/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc
===================================================================
--- trunk/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc (rev 0)
+++ trunk/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,11 @@
+--- plugin/password_validation/validate_password.cc.orig 2016-03-28 18:06:12 UTC
++++ plugin/password_validation/validate_password.cc
+@@ -18,6 +18,8 @@
+ #include <mysql/plugin_validate_password.h>
+ #include <mysql/service_my_plugin_log.h>
+ #include <mysql/service_mysql_string.h>
++/* solve clash between libc++ bitset::test() and test macro from my_global.h */
++#undef test
+ #include <set>
+ #include <iostream>
+ #include <fstream>
Property changes on: trunk/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,20 @@
+--- rapid/plugin/x/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC
++++ rapid/plugin/x/CMakeLists.txt
+@@ -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}
+ ${PROTOBUF_INCLUDE_DIRS}
+ ${LIBEVENT_INCLUDE_DIR}
++ ${SSL_INCLUDE_DIRS}
++ ${ZLIB_INCLUDE_DIR}
+ )
+
+ IF(XPLUGIN_NO_LITE_PROTOBUF)
Property changes on: trunk/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
===================================================================
--- trunk/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake (rev 0)
+++ trunk/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,15 @@
+--- rapid/plugin/x/mysqlx_configure.cmake.orig 2016-09-14 15:25:26 UTC
++++ rapid/plugin/x/mysqlx_configure.cmake
+@@ -29,6 +29,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src
+ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h )
+
++IF(FALSE)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h
+ DESTINATION ${INSTALL_INCLUDEDIR}
+ COMPONENT Developement)
+@@ -36,3 +37,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h
+ DESTINATION ${INSTALL_INCLUDEDIR}
+ COMPONENT Developement)
++ENDIF()
Property changes on: trunk/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,18 @@
+--- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ rapid/unittest/gunit/xplugin/CMakeLists.txt
+@@ -65,7 +65,6 @@ ENDIF()
+ ADD_DEFINITIONS(${GMOCK_CFLAGS} -DBOOST_ALL_NO_LIB -DBOOST_NO_AUTO_PTR -DUSE_MYSQLX_FULL_PROTO)
+
+ INCLUDE_DIRECTORIES(SYSTEM
+- ${BOOST_INCLUDE_DIR}
+ ${PROTOBUF_INCLUDE_DIRS}
+ ${SSL_INCLUDE_DIRS}
+ ${LIBEVENT_INCLUDE_DIR}
+@@ -75,6 +74,7 @@ INCLUDE_DIRECTORIES(SYSTEM
+ )
+
+ INCLUDE_DIRECTORIES(
++ ${BOOST_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/testing/include
+ ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include
+ ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs
Property changes on: trunk/databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-scripts_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-server/files/patch-scripts_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-server/files/patch-scripts_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,36 @@
+--- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ scripts/CMakeLists.txt
+@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
+ STRING(REGEX REPLACE "^lib" "" lib "${lib}")
+ SET(${var} "${${var}}-l${lib} " )
++ ELSEIF(lib STREQUAL "-pthread")
++ SET(${var} "${${var}}-pthread " )
+ ELSE()
+ SET(${var} "${${var}}-l${lib} " )
+ ENDIF()
+@@ -430,14 +432,13 @@ ELSE()
+ # On Unix, most of the files end up in the bin directory
+ SET(mysql_config_COMPONENT COMPONENT Development)
+
++
+ IF(WITH_SYSTEMD)
+ SET(BIN_SCRIPTS
+- mysql_config
+ mysqldumpslow
+ )
+ ELSE()
+ SET(BIN_SCRIPTS
+- mysql_config
+ mysqldumpslow
+ mysqld_multi
+ mysqld_safe
+@@ -471,7 +472,7 @@ ELSE()
+ FOREACH(file ${BIN_SCRIPTS})
+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
+- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
++ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
+ ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
Property changes on: trunk/databases/mysql57-server/files/patch-scripts_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-sql_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-server/files/patch-sql_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-server/files/patch-sql_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,11 @@
+--- sql/CMakeLists.txt.orig 2016-08-25 11:52:06 UTC
++++ sql/CMakeLists.txt
+@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(
+ ${ZLIB_INCLUDE_DIR}
+ ${SSL_INCLUDE_DIRS}
+ ${CMAKE_BINARY_DIR}/sql
++ ${CMAKE_BINARY_DIR}/include
++ ${CMAKE_BINARY_DIR}
+ ${LZ4_INCLUDE_DIR}
+ )
+
Property changes on: trunk/databases/mysql57-server/files/patch-sql_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc
===================================================================
--- trunk/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc (rev 0)
+++ trunk/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,32 @@
+--- sql/conn_handler/socket_connection.cc.orig 2017-03-18 07:45:14 UTC
++++ sql/conn_handler/socket_connection.cc
+@@ -942,22 +942,25 @@ 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);
+- fromhost(&req);
++ void (*my_fromhost) (void *) = (void (*)(void *)) fromhost;
++ my_fromhost(&req);
+
+- if (!hosts_access(&req))
++ int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access;
++ if (!my_hosts_access(&req))
+ {
+ /*
+ This may be stupid but refuse() includes an exit(0)
+ which we surely don't want...
+ clean_exit() - same stupid thing ...
+ */
++ char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
+ syslog(LOG_AUTH | m_deny_severity,
+- "refused connect from %s", eval_client(&req));
++ "refused connect from %s", my_eval_client(&req));
+
+ #ifdef HAVE_LIBWRAP_PROTOTYPES
+ // Some distros have patched tcpd.h to have proper prototypes
+ if (req.sink)
+- (req.sink)(req.fd);
++ ((void (*)(int)) (req.sink))(req.fd);
+ #else
+ // Some distros have not patched tcpd.h
+ if (req.sink)
Property changes on: trunk/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-sql_sys__vars.cc
===================================================================
--- trunk/databases/mysql57-server/files/patch-sql_sys__vars.cc (rev 0)
+++ trunk/databases/mysql57-server/files/patch-sql_sys__vars.cc 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,38 @@
+--- sql/sys_vars.cc.orig 2016-03-28 18:06:12 UTC
++++ sql/sys_vars.cc
+@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim
+ "connection before closing it",
+ SESSION_VAR(net_interactive_timeout),
+ CMD_LINE(REQUIRED_ARG),
+- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
++ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
+
+ static Sys_var_ulong Sys_join_buffer_size(
+ "join_buffer_size",
+@@ -2552,7 +2552,7 @@ static Sys_var_ulong Sys_net_read_timeou
+ "Number of seconds to wait for more data from a connection before "
+ "aborting the read",
+ SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
+- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
++ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
+ NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
+ ON_UPDATE(fix_net_read_timeout));
+
+@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_write_timeo
+ "Number of seconds to wait for a block to be written to a connection "
+ "before aborting the write",
+ SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
+- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
++ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
+ NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
+ ON_UPDATE(fix_net_write_timeout));
+
+@@ -4083,7 +4083,7 @@ static Sys_var_ulong Sys_net_wait_timeou
+ "The number of seconds the server waits for activity on a "
+ "connection before closing it",
+ SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
+- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
++ VALID_RANGE(1, INT_MAX32/1000),
+ DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
+
+ static Sys_var_plugin Sys_default_storage_engine(
Property changes on: trunk/databases/mysql57-server/files/patch-sql_sys__vars.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h
===================================================================
--- trunk/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h (rev 0)
+++ trunk/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,13 @@
+--- storage/innobase/include/srv0mon.h.orig 2016-03-28 18:06:12 UTC
++++ storage/innobase/include/srv0mon.h
+@@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang
+ /* Required for FreeBSD so that INT64_MAX is defined. */
+ #define __STDC_LIMIT_MACROS
+ #endif /* __STDC_LIMIT_MACROS */
++#ifdef __DragonFly__
++/* The hack above doen't work for dragonfly, stdint.h already imported */
++#include <machine/int_limits.h>
++#endif
+
+ #include <stdint.h>
+
Property changes on: trunk/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c
===================================================================
--- trunk/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c (rev 0)
+++ trunk/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,23 @@
+--- storage/myisam/mi_dynrec.c.orig 2016-03-28 18:06:12 UTC
++++ storage/myisam/mi_dynrec.c
+@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
+ DBUG_RETURN(1);
+ }
+ /*
+- I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
+- MAP_NORESERVE
+- Do not reserve swap space for this mapping. When swap space is
+- reserved, one has the guarantee that it is possible to modify the
+- mapping. When swap space is not reserved one might get SIGSEGV
+- upon a write if no physical memory is available.
++ MAP_NORESERVE is unimplemented in FreeBSD
+ */
+ info->s->file_map= (uchar*)
+ my_mmap(0, (size_t) size,
+ info->s->mode==O_RDONLY ? PROT_READ :
+ PROT_READ | PROT_WRITE,
+- MAP_SHARED | MAP_NORESERVE,
++ MAP_SHARED,
+ info->dfile, 0L);
+ if (info->s->file_map == (uchar*) MAP_FAILED)
+ {
Property changes on: trunk/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/files/patch-support-files_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-server/files/patch-support-files_CMakeLists.txt (rev 0)
+++ trunk/databases/mysql57-server/files/patch-support-files_CMakeLists.txt 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,12 @@
+--- support-files/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
++++ support-files/CMakeLists.txt
+@@ -69,7 +69,9 @@ IF(UNIX)
+ INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
+ ENDIF()
+
++IF(FALSE)
+ INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
++ENDIF()
+
+ SET(bindir ${prefix}/${INSTALL_BINDIR})
+ SET(sbindir ${prefix}/${INSTALL_SBINDIR})
Property changes on: trunk/databases/mysql57-server/files/patch-support-files_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/pkg-descr
===================================================================
--- trunk/databases/mysql57-server/pkg-descr (rev 0)
+++ trunk/databases/mysql57-server/pkg-descr 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,4 @@
+MySQL is a very fast, multi-threaded, multi-user and robust SQL
+(Structured Query Language) database server.
+
+WWW: http://www.mysql.com/
Property changes on: trunk/databases/mysql57-server/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/pkg-message
===================================================================
--- trunk/databases/mysql57-server/pkg-message (rev 0)
+++ trunk/databases/mysql57-server/pkg-message 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,14 @@
+*****************************************************************************
+
+Remember to run mysql_upgrade the first time you start the MySQL server
+after an upgrade from an earlier version.
+
+Initial password for first time use of MySQL is saved in $HOME/.mysql_secret
+ie. when you want to use "mysql -u root -p" first you should see password
+in /root/.mysql_secret
+
+MySQL57 has a default %%ETCDIR%%/my.cnf,
+remember to replace it wit your own
+or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf.
+
+*****************************************************************************
Property changes on: trunk/databases/mysql57-server/pkg-message
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql57-server/pkg-plist
===================================================================
--- trunk/databases/mysql57-server/pkg-plist (rev 0)
+++ trunk/databases/mysql57-server/pkg-plist 2018-10-12 23:32:43 UTC (rev 24461)
@@ -0,0 +1,161 @@
+bin/innochecksum
+bin/lz4_decompress
+bin/my_print_defaults
+bin/myisam_ftdump
+bin/myisamchk
+bin/myisamlog
+bin/myisampack
+bin/mysql_install_db
+bin/mysql_plugin
+bin/mysql_secure_installation
+bin/mysql_tzinfo_to_sql
+bin/mysql_upgrade
+bin/mysqld_multi
+bin/mysqld_safe
+bin/mysqldumpslow
+bin/mysqltest
+bin/mysqlxtest
+bin/perror
+bin/replace
+bin/resolve_stack_dump
+bin/resolveip
+bin/zlib_decompress
+lib/mysql/libmysqld.a
+lib/mysql/plugin/adt_null.so
+lib/mysql/plugin/auth.so
+lib/mysql/plugin/auth_test_plugin.so
+lib/mysql/plugin/connection_control.so
+lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/group_replication.so
+%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
+lib/mysql/plugin/keyring_file.so
+lib/mysql/plugin/libdaemon_example.so
+lib/mysql/plugin/libtest_framework.so
+lib/mysql/plugin/libtest_services.so
+lib/mysql/plugin/libtest_services_threaded.so
+lib/mysql/plugin/libtest_session_detach.so
+lib/mysql/plugin/libtest_session_in_thd.so
+lib/mysql/plugin/libtest_session_info.so
+lib/mysql/plugin/libtest_sql_2_sessions.so
+lib/mysql/plugin/libtest_sql_all_col_types.so
+lib/mysql/plugin/libtest_sql_cmds_1.so
+lib/mysql/plugin/libtest_sql_commit.so
+lib/mysql/plugin/libtest_sql_complex.so
+lib/mysql/plugin/libtest_sql_errors.so
+lib/mysql/plugin/libtest_sql_lock.so
+lib/mysql/plugin/libtest_sql_processlist.so
+lib/mysql/plugin/libtest_sql_replication.so
+lib/mysql/plugin/libtest_sql_shutdown.so
+lib/mysql/plugin/libtest_sql_sqlmode.so
+lib/mysql/plugin/libtest_sql_stored_procedures_functions.so
+lib/mysql/plugin/libtest_sql_views_triggers.so
+lib/mysql/plugin/libtest_x_sessions_deinit.so
+lib/mysql/plugin/libtest_x_sessions_init.so
+lib/mysql/plugin/locking_service.so
+lib/mysql/plugin/mypluglib.so
+lib/mysql/plugin/mysql_no_login.so
+lib/mysql/plugin/mysqlx.so
+lib/mysql/plugin/qa_auth_client.so
+lib/mysql/plugin/qa_auth_interface.so
+lib/mysql/plugin/qa_auth_server.so
+lib/mysql/plugin/replication_observers_example_plugin.so
+lib/mysql/plugin/rewrite_example.so
+lib/mysql/plugin/rewriter.so
+lib/mysql/plugin/semisync_master.so
+lib/mysql/plugin/semisync_slave.so
+lib/mysql/plugin/test_security_context.so
+lib/mysql/plugin/keyring_udf.so
+lib/mysql/plugin/test_udf_services.so
+lib/mysql/plugin/validate_password.so
+lib/mysql/plugin/version_token.so
+libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc
+libexec/mysqld
+man/man1/my_print_defaults.1.gz
+man/man1/myisam_ftdump.1.gz
+man/man1/myisamchk.1.gz
+man/man1/myisamlog.1.gz
+man/man1/myisampack.1.gz
+man/man1/mysql.server.1.gz
+man/man1/mysql_install_db.1.gz
+man/man1/mysql_plugin.1.gz
+man/man1/mysql_secure_installation.1.gz
+man/man1/mysql_tzinfo_to_sql.1.gz
+man/man1/mysql_upgrade.1.gz
+man/man1/mysqld_multi.1.gz
+man/man1/mysqld_safe.1.gz
+man/man1/mysqldumpslow.1.gz
+man/man1/mysqlman.1.gz
+man/man1/perror.1.gz
+man/man1/replace.1.gz
+man/man1/resolve_stack_dump.1.gz
+man/man1/resolveip.1.gz
+man/man8/mysqld.8.gz
+%%DATADIR%%/bulgarian/errmsg.sys
+%%DATADIR%%/charsets/Index.xml
+%%DATADIR%%/charsets/README
+%%DATADIR%%/charsets/armscii8.xml
+%%DATADIR%%/charsets/ascii.xml
+%%DATADIR%%/charsets/cp1250.xml
+%%DATADIR%%/charsets/cp1251.xml
+%%DATADIR%%/charsets/cp1256.xml
+%%DATADIR%%/charsets/cp1257.xml
+%%DATADIR%%/charsets/cp850.xml
+%%DATADIR%%/charsets/cp852.xml
+%%DATADIR%%/charsets/cp866.xml
+%%DATADIR%%/charsets/dec8.xml
+%%DATADIR%%/charsets/geostd8.xml
+%%DATADIR%%/charsets/greek.xml
+%%DATADIR%%/charsets/hebrew.xml
+%%DATADIR%%/charsets/hp8.xml
+%%DATADIR%%/charsets/keybcs2.xml
+%%DATADIR%%/charsets/koi8r.xml
+%%DATADIR%%/charsets/koi8u.xml
+%%DATADIR%%/charsets/latin1.xml
+%%DATADIR%%/charsets/latin2.xml
+%%DATADIR%%/charsets/latin5.xml
+%%DATADIR%%/charsets/latin7.xml
+%%DATADIR%%/charsets/macce.xml
+%%DATADIR%%/charsets/macroman.xml
+%%DATADIR%%/charsets/swe7.xml
+%%DATADIR%%/czech/errmsg.sys
+%%DATADIR%%/danish/errmsg.sys
+%%DATADIR%%/dictionary.txt
+%%DATADIR%%/dutch/errmsg.sys
+%%DATADIR%%/english/errmsg.sys
+%%DATADIR%%/errmsg-utf8.txt
+%%DATADIR%%/estonian/errmsg.sys
+%%DATADIR%%/fill_help_tables.sql
+%%DATADIR%%/french/errmsg.sys
+%%DATADIR%%/german/errmsg.sys
+%%DATADIR%%/greek/errmsg.sys
+%%DATADIR%%/hungarian/errmsg.sys
+%%DATADIR%%/innodb_memcached_config.sql
+%%DATADIR%%/install_rewriter.sql
+%%DATADIR%%/italian/errmsg.sys
+%%DATADIR%%/japanese/errmsg.sys
+%%DATADIR%%/korean/errmsg.sys
+%%DATADIR%%/magic
+%%DATADIR%%/mysql-log-rotate
+%%DATADIR%%/mysql.server
+%%DATADIR%%/mysql_security_commands.sql
+%%DATADIR%%/mysql_sys_schema.sql
+%%DATADIR%%/mysql_system_tables.sql
+%%DATADIR%%/mysql_system_tables_data.sql
+%%DATADIR%%/mysql_test_data_timezone.sql
+%%DATADIR%%/mysqld_multi.server
+%%DATADIR%%/norwegian-ny/errmsg.sys
+%%DATADIR%%/norwegian/errmsg.sys
+%%DATADIR%%/polish/errmsg.sys
+%%DATADIR%%/portuguese/errmsg.sys
+%%DATADIR%%/romanian/errmsg.sys
+%%DATADIR%%/russian/errmsg.sys
+%%DATADIR%%/serbian/errmsg.sys
+%%DATADIR%%/slovak/errmsg.sys
+%%DATADIR%%/spanish/errmsg.sys
+%%DATADIR%%/swedish/errmsg.sys
+%%DATADIR%%/ukrainian/errmsg.sys
+%%DATADIR%%/uninstall_rewriter.sql
+ at sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
+ at dir(mysql,mysql,0750) %%ETCDIR%%/keyring
+ at dir(mysql,mysql,0750) %%MY_SECDIR%%
+ at dir(mysql,mysql,0750) %%MY_TMPDIR%%
Property changes on: trunk/databases/mysql57-server/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list