svn commit: r403800 - in head: Mk databases databases/mysql57-client databases/mysql57-client/files databases/mysql57-server databases/mysql57-server/files
Kurt Jaeger
pi at FreeBSD.org
Tue Dec 15 19:40:25 UTC 2015
Author: pi
Date: Tue Dec 15 19:40:21 2015
New Revision: 403800
URL: https://svnweb.freebsd.org/changeset/ports/403800
Log:
New ports: databases/mysql57-client, databases/mysql57-server
The next major release of mysql.
MySQL is a very fast, multi-threaded, multi-user and robust SQL
(Structured Query Language) database server.
WWW: http://www.mysql.com/
PR: 204607
Submitted by: mokhi64 at gmail.com
Reviewed by: koobs, brnrd
Approved by: mat
Added:
head/databases/mysql57-client/
head/databases/mysql57-client/Makefile (contents, props changed)
head/databases/mysql57-client/files/
head/databases/mysql57-client/files/patch-CMakeLists.txt (contents, props changed)
head/databases/mysql57-client/files/patch-client_CMakeLists.txt (contents, props changed)
head/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake (contents, props changed)
head/databases/mysql57-client/files/patch-extra_CMakeLists.txt (contents, props changed)
head/databases/mysql57-client/files/patch-include_CMakeLists.txt (contents, props changed)
head/databases/mysql57-client/files/patch-include_my__compare.h (contents, props changed)
head/databases/mysql57-client/files/patch-include_myisam.h (contents, props changed)
head/databases/mysql57-client/files/patch-man_CMakeLists.txt (contents, props changed)
head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc (contents, props changed)
head/databases/mysql57-client/files/patch-scripts_CMakeLists.txt (contents, props changed)
head/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c (contents, props changed)
head/databases/mysql57-client/files/patch-support-files_CMakeLists.txt (contents, props changed)
head/databases/mysql57-client/pkg-message (contents, props changed)
head/databases/mysql57-client/pkg-plist (contents, props changed)
head/databases/mysql57-server/
head/databases/mysql57-server/Makefile (contents, props changed)
head/databases/mysql57-server/distinfo (contents, props changed)
head/databases/mysql57-server/files/
head/databases/mysql57-server/files/extra-patch-config.h.cmake (contents, props changed)
head/databases/mysql57-server/files/mysql-server.in (contents, props changed)
head/databases/mysql57-server/files/patch-CMakeLists.txt (contents, props changed)
head/databases/mysql57-server/files/patch-client_CMakeLists.txt (contents, props changed)
head/databases/mysql57-server/files/patch-cmake_plugin.cmake (contents, props changed)
head/databases/mysql57-server/files/patch-extra_CMakeLists.txt (contents, props changed)
head/databases/mysql57-server/files/patch-include_CMakeLists.txt (contents, props changed)
head/databases/mysql57-server/files/patch-include_my__compare.h (contents, props changed)
head/databases/mysql57-server/files/patch-include_myisam.h (contents, props changed)
head/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt (contents, props changed)
head/databases/mysql57-server/files/patch-libservices_CMakeLists.txt (contents, props changed)
head/databases/mysql57-server/files/patch-man_CMakeLists.txt (contents, props changed)
head/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc (contents, props changed)
head/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc (contents, props changed)
head/databases/mysql57-server/files/patch-scripts_CMakeLists.txt (contents, props changed)
head/databases/mysql57-server/files/patch-sql_CMakeLists.txt (contents, props changed)
head/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc (contents, props changed)
head/databases/mysql57-server/files/patch-sql_sql__view.cc (contents, props changed)
head/databases/mysql57-server/files/patch-sql_sys__vars.cc (contents, props changed)
head/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c (contents, props changed)
head/databases/mysql57-server/files/patch-support-files_CMakeLists.txt (contents, props changed)
head/databases/mysql57-server/pkg-descr (contents, props changed)
head/databases/mysql57-server/pkg-message (contents, props changed)
head/databases/mysql57-server/pkg-plist (contents, props changed)
Modified:
head/Mk/bsd.database.mk
head/databases/Makefile
Modified: head/Mk/bsd.database.mk
==============================================================================
--- head/Mk/bsd.database.mk Tue Dec 15 19:20:23 2015 (r403799)
+++ head/Mk/bsd.database.mk Tue Dec 15 19:40:21 2015 (r403800)
@@ -106,6 +106,7 @@ MYSQL55m_LIBVER= 18
MYSQL55p_LIBVER= 18
MYSQL56_LIBVER= 18
MYSQL56p_LIBVER= 18
+MYSQL57_LIBVER= 20
MYSQL100m_LIBVER= 18
# Setting/finding MySQL version we want.
Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile Tue Dec 15 19:20:23 2015 (r403799)
+++ head/databases/Makefile Tue Dec 15 19:40:21 2015 (r403800)
@@ -213,6 +213,8 @@
SUBDIR += mysql55-server
SUBDIR += mysql56-client
SUBDIR += mysql56-server
+ SUBDIR += mysql57-client
+ SUBDIR += mysql57-server
SUBDIR += mysqlbackup
SUBDIR += mysqlbigram
SUBDIR += mysqldumper
Added: head/databases/mysql57-client/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/Makefile Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,33 @@
+# Created by: "Mahdi Mokhtari <mokhi64 at gmail.com>"
+# $FreeBSD$
+
+PORTNAME= mysql
+PKGNAMESUFFIX= 57-client
+
+COMMENT= Multithreaded SQL database (client)
+
+LICENSE+= LGPL21
+
+MASTERDIR= ${.CURDIR}/../mysql57-server
+
+PKGMESSAGE= ${.CURDIR}/pkg-message
+PATCHDIR= ${.CURDIR}/files
+PLIST= ${.CURDIR}/pkg-plist
+
+CONFLICTS_BUILD= boost-libs-1.55*
+CONFLICTS_INSTALL= mysql5.[0-57-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-*
+
+CMAKE_ARGS+= -DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
+ -DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \
+ -DWITHOUT_SERVER=1 \
+ -DWITH_SYSTEMD=0
+
+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
+
+.include "${MASTERDIR}/Makefile"
Added: head/databases/mysql57-client/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/files/patch-CMakeLists.txt Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,36 @@
+--- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
++++ CMakeLists.txt
+@@ -569,8 +569,8 @@ ENDIF()
+
+ ADD_SUBDIRECTORY(extra)
+ ADD_SUBDIRECTORY(client)
+-ADD_SUBDIRECTORY(sql/share)
+ ADD_SUBDIRECTORY(libservices)
++ADD_SUBDIRECTORY(support-files)
+
+ IF(UNIX)
+ ADD_SUBDIRECTORY(man)
+@@ -639,14 +639,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}
+@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ PATTERN "sp-imp-spec.txt" EXCLUDE
+ )
+ ENDIF()
++ENDIF()
+
+ INCLUDE(CPack)
+
Added: head/databases/mysql57-client/files/patch-client_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/files/patch-client_CMakeLists.txt Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,54 @@
+--- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
++++ client/CMakeLists.txt
+@@ -121,6 +121,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
+@@ -131,10 +132,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)
++ENDIF()
+
+ ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
+ TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
+@@ -152,8 +156,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(
+@@ -172,8 +178,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
+@@ -196,7 +204,6 @@ IF(WIN32)
+ ENDIF(WIN32)
+
+ SET_TARGET_PROPERTIES (
+- mysql_plugin
+ mysqlcheck
+ mysqldump
+ mysqlimport
Added: head/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,20 @@
+--- cmake/build_configurations/compiler_options.cmake.orig 2015-11-29 19:16:24 UTC
++++ cmake/build_configurations/compiler_options.cmake
+@@ -28,7 +28,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}")
+@@ -37,7 +37,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")
+ # Disable inline optimizations for valgrind testing to avoid false positives
+ IF(WITH_VALGRIND)
+ SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")
Added: head/databases/mysql57-client/files/patch-extra_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/files/patch-extra_CMakeLists.txt Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,33 @@
+--- extra/CMakeLists.txt.orig 2015-11-29 19:16:24 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
Added: head/databases/mysql57-client/files/patch-include_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/files/patch-include_CMakeLists.txt Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,18 @@
+--- include/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
++++ include/CMakeLists.txt
+@@ -37,6 +37,7 @@ SET(HEADERS_ABI
+
+ SET(HEADERS
+ ${HEADERS_ABI}
++ hash.h
+ my_dbug.h
+ m_string.h
+ my_sys.h
+@@ -68,7 +69,6 @@ SET(HEADERS
+ ${HEADERS_GEN_CONFIGURE}
+ )
+
+-INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
+ INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
+ INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development
+ PATTERN "*.h"
Added: head/databases/mysql57-client/files/patch-include_my__compare.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/files/patch-include_my__compare.h Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,11 @@
+--- include/my_compare.h.orig 2015-11-29 19:16:24 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)
Added: head/databases/mysql57-client/files/patch-include_myisam.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/files/patch-include_myisam.h Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,11 @@
+--- include/myisam.h.orig 2015-11-29 19:16:24 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)
Added: head/databases/mysql57-client/files/patch-man_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/files/patch-man_CMakeLists.txt Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,15 @@
+--- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
++++ man/CMakeLists.txt
+@@ -14,11 +14,7 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ # 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)
++FILE(GLOB MAN1_FILES 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)
+ IF(MAN1_FILES)
+ IF(MAN1_EXCLUDE)
+ LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
Added: head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,31 @@
+--- mysys_ssl/my_default.cc.orig 2015-11-29 19:16:24 UTC
++++ mysys_ssl/my_default.cc
+@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
+
+ /* 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;
+
+@@ -1409,7 +1409,10 @@ static const char **init_default_directo
+
+ #if defined(DEFAULT_SYSCONFDIR)
+ if (DEFAULT_SYSCONFDIR[0])
++ {
+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
++ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
++ }
+ #endif /* DEFAULT_SYSCONFDIR */
+
+ #endif
+@@ -1480,7 +1483,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.
Added: head/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/files/patch-scripts_CMakeLists.txt Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,88 @@
+--- scripts/CMakeLists.txt.orig 2015-11-29 19:16:24 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" )
+@@ -152,6 +155,7 @@ IF(UNIX)
+ ENDIF()
+
+ IF(NOT WITHOUT_SERVER)
++IF(FALSE)
+ INSTALL(FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
+ ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
+@@ -282,6 +286,7 @@ SET(HOSTNAME "hostname")
+ SET(MYSQLD_USER "mysql")
+
+ ENDIF(UNIX)
++ENDIF()
+
+ SET(bindir ${prefix}/${INSTALL_BINDIR})
+ SET(sbindir ${prefix}/${INSTALL_SBINDIR})
+@@ -347,6 +352,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()
+@@ -433,14 +440,10 @@ ELSE()
+ IF(WITH_SYSTEMD)
+ SET(BIN_SCRIPTS
+ mysql_config
+- mysqldumpslow
+ )
+ ELSE()
+ SET(BIN_SCRIPTS
+ mysql_config
+- mysqldumpslow
+- mysqld_multi
+- mysqld_safe
+ )
+ ENDIF()
+
+@@ -510,11 +513,13 @@ ELSE()
+ CONFIGURE_FILE(systemd/mysqld.tmpfiles.d.in
+ ${CMAKE_CURRENT_BINARY_DIR}/mysql.conf ESCAPE_QUOTES @ONLY)
+
++IF(FALSE)
+ INSTALL_SCRIPT(
+ ${CMAKE_CURRENT_BINARY_DIR}/mysqld_pre_systemd
+ DESTINATION ${INSTALL_BINDIR}
+ COMPONENT Server
+ )
++ENDIF()
+
+ IF(INSTALL_LAYOUT MATCHES "STANDALONE")
+ SET(SYSTEMD_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
+@@ -532,6 +537,7 @@ ELSE()
+ )
+ ENDIF()
+ ENDIF()
++ENDIF()
+
+ # Install libgcc as mylibgcc.a
+ IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")
Added: head/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,23 @@
+--- storage/myisam/mi_dynrec.c.orig 2015-12-14 07:39:39 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)
+ {
Added: head/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/files/patch-support-files_CMakeLists.txt Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,36 @@
+--- support-files/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
++++ support-files/CMakeLists.txt
+@@ -44,14 +44,17 @@ ELSE()
+ SET(inst_location ${INSTALL_SUPPORTFILESDIR})
+ ENDIF()
+
++IF(FALSE)
+ SET(inifile my-default)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh
+ ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
+ DESTINATION ${inst_location} COMPONENT IniFiles)
++ENDIF()
+
+ IF(UNIX)
+ 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 )
+@@ -68,8 +71,10 @@ 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)
+ CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
+
+ SET(bindir ${prefix}/${INSTALL_BINDIR})
+@@ -84,3 +89,4 @@ IF(UNIX)
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
+ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ ENDIF()
++ENDIF()
Added: head/databases/mysql57-client/pkg-message
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/pkg-message Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,6 @@
+* * * * * * * * * * * * * * * * * * * * * * * *
+
+This is the mysql CLIENT without the server.
+for complete server and client, please install databases/mysql57-server
+
+* * * * * * * * * * * * * * * * * * * * * * * *
Added: head/databases/mysql57-client/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-client/pkg-plist Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,129 @@
+bin/mysql
+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/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_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_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_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_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/libmysqlservices.a
+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
Added: head/databases/mysql57-server/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-server/Makefile Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,132 @@
+# Created by: "Mahdi Mokhtari <mokhi64 at gmail.com>"
+# $FreeBSD$
+
+PORTNAME= mysql
+PORTVERSION= 5.7.10
+CATEGORIES= databases ipv6
+MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
+PKGNAMESUFFIX?= 57-server
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:MySQL boost_1_59_0.tar.gz:boost
+
+MAINTAINER= mokhi64 at gmail.com
+COMMENT= Multithreaded SQL database (server)
+
+LICENSE= GPLv2
+
+SLAVEDIRS= databases/mysql57-client
+USES= cmake:outsource shebangfix
+
+OPTIONS_RADIO= SSL
+OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL
+OPTIONS_DEFAULT+= OPENSSL
+NO_OPTIONS_SORT= yes
+
+BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL
+WITHOUT_SSL_DESC= No SSL/TLS support
+
+CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
+ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \
+ -DINSTALL_INCLUDEDIR="include/mysql" \
+ -DINSTALL_INFODIR="info" \
+ -DINSTALL_LIBDIR="lib/mysql" \
+ -DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
+ -DINSTALL_MANDIR="man" \
+ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \
+ -DINSTALL_MYSQLSHAREDIR="share/mysql" \
+ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
+ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \
+ -DINSTALL_SBINDIR="libexec" \
+ -DINSTALL_SCRIPTDIR="bin" \
+ -DINSTALL_SHAREDIR="share" \
+ -DINSTALL_SUPPORTFILESDIR="share/mysql" \
+ -DLOCAL_BOOST_DIR=${WRKSRC}/../boost_1_59_0 \
+ -DWITH_INNODB_EXTRA_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
+
+BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled
+OPENSSL_USE= OPENSSL=yes
+WITHOUT_SSL_CMAKE_ON= -DWITH_SSL=no
+
+# MySQL-Server part
+.if !defined(CLIENT_ONLY)
+USE_MYSQL= yes
+WANT_MYSQL_VER= 57
+
+USES+= bison:build cpe perl5
+USE_PERL5= run
+
+CONFLICTS_BUILD= boost-libs-1.55*
+CONFLICTS_INSTALL= mariadb[0-9]*-server-* \
+ mysql[0-46-9][0-689]-server-* \
+ percona[0-9]*-server-*
+
+USE_RC_SUBR= mysql-server
+
+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
+
+.else
+USES+= readline
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+CC= clang
+CXX= clang++
+CPP= clang-cpp
+OPENSSL_CMAKE_ON= -DWITH_SSL=system
+.elif ${OSVERSION} >= 1000000
+OPENSSL_CMAKE_ON= -DWITH_SSL=yes
+.endif
+
+USE_CLANG= 3.3+
+
+post-extract:
+ ${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
+
+post-patch:
+ @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
+
+.if ${OPSYS} == DragonFly
+ ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
+ ${WRKSRC}/cmake/os/DragonFly.cmake
+ ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb
+.endif
+
+.include <bsd.port.post.mk>
Added: head/databases/mysql57-server/distinfo
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-server/distinfo Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,4 @@
+SHA256 (mysql-5.7.10.tar.gz) = 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74
+SIZE (mysql-5.7.10.tar.gz) = 48919371
+SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
+SIZE (boost_1_59_0.tar.gz) = 83709983
Added: head/databases/mysql57-server/files/extra-patch-config.h.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-server/files/extra-patch-config.h.cmake Tue Dec 15 19:40:21 2015 (r403800)
@@ -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
Added: head/databases/mysql57-server/files/mysql-server.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-server/files/mysql-server.in Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# 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.
+# mysql_limits (bool): Set to "NO" by default.
+# Set it to yes to run `limits -e -U mysql`
+# just before mysql starts.
+# mysql_dbdir (str): Default to "/var/db/mysql"
+# Base database directory.
+# mysql_optfile (str): Server-specific option file.
+# Default to "${mysql_dbdir}/my.cnf".
+# 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"}
+: ${mysql_limits="NO"}
+: ${mysql_dbdir="/var/db/mysql"}
+: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
+
+mysql_user="mysql"
+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 --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="${name}_prestart"
+start_postcmd="${name}_poststart"
+mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
+mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
+
+mysql_create_auth_tables()
+{
+ eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
+ [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
+}
+
+mysql_prestart()
+{
+ if [ ! -d "${mysql_dbdir}/mysql/." ]; then
+ mysql_create_auth_tables || return 1
+ fi
+ if checkyesno mysql_limits; then
+ eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+ else
+ return 0
+ fi
+}
+
+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"
Added: head/databases/mysql57-server/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-server/files/patch-CMakeLists.txt Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,40 @@
+--- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
++++ CMakeLists.txt
+@@ -577,12 +577,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()
+
+@@ -591,8 +589,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)
+@@ -647,6 +643,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}
+@@ -673,6 +670,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ PATTERN "sp-imp-spec.txt" EXCLUDE
+ )
+ ENDIF()
++ENDIF()
+
+ INCLUDE(CPack)
+
Added: head/databases/mysql57-server/files/patch-client_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-server/files/patch-client_CMakeLists.txt Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,78 @@
+--- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
++++ client/CMakeLists.txt
+@@ -38,8 +38,6 @@ ADD_DEFINITIONS(
+
+ ## 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)
+@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F
+ ENDIF()
+
+ 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
+@@ -139,6 +139,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)
+
+@@ -151,10 +152,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
+@@ -171,6 +174,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)
+@@ -186,9 +190,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)
+@@ -197,11 +203,6 @@ ENDIF(WIN32)
+
+ SET_TARGET_PROPERTIES (
+ mysql_plugin
+- mysqlcheck
+- mysqldump
+- mysqlimport
+- mysqlshow
+- mysqlslap
+ PROPERTIES HAS_CXX TRUE)
+
+ ADD_DEFINITIONS(-DHAVE_DLOPEN)
Added: head/databases/mysql57-server/files/patch-cmake_plugin.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-server/files/patch-cmake_plugin.cmake Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,12 @@
+--- cmake/plugin.cmake.orig 2015-11-29 19:16:24 UTC
++++ cmake/plugin.cmake
+@@ -236,9 +236,6 @@ 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})
+ # 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"
Added: head/databases/mysql57-server/files/patch-extra_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-server/files/patch-extra_CMakeLists.txt Tue Dec 15 19:40:21 2015 (r403800)
@@ -0,0 +1,31 @@
+--- extra/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
++++ extra/CMakeLists.txt
+@@ -73,6 +73,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)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list