Date: Wed, 22 Feb 2017 17:31:39 +0000 (UTC) From: Nikolai Lifanov <lifanov@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434624 - in head: Mk Mk/Uses databases databases/mysqlwsrep56-server databases/mysqlwsrep56-server/files Message-ID: <201702221731.v1MHVdIu080977@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lifanov Date: Wed Feb 22 17:31:39 2017 New Revision: 434624 URL: https://svnweb.freebsd.org/changeset/ports/434624 Log: add databases/mysqlwsrep56-server - MySQL version enabled for Galera Replication PR: 214807 Submitted by: Philip Stoev <philip.stoev@galeracluster.com> Reviewed by: matthew, mat, mmokhi Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D9427 Added: head/databases/mysqlwsrep56-server/ - copied from r433551, head/databases/mysql56-server/ head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h - copied unchanged from r433551, head/databases/mysql56-server/files/patch-include_my_compare.h head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc - copied unchanged from r433551, head/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc - copied unchanged from r433551, head/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc head/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh - copied unchanged from r433551, head/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh head/databases/mysqlwsrep56-server/files/patch-sql_sql__trigger.cc - copied unchanged from r433551, head/databases/mysql56-server/files/patch-sql_sql_trigger.cc head/databases/mysqlwsrep56-server/files/patch-sql_sql__view.cc - copied unchanged from r433551, head/databases/mysql56-server/files/patch-sql_sql_view.cc head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc - copied unchanged from r433551, head/databases/mysql56-server/files/patch-sql_sys_vars.cc Deleted: head/databases/mysqlwsrep56-server/files/patch-include_my_compare.h head/databases/mysqlwsrep56-server/files/patch-mysys_ssl_my_default.cc head/databases/mysqlwsrep56-server/files/patch-plugin_password_validation_validate_password.cc head/databases/mysqlwsrep56-server/files/patch-scripts_mysqld_safe.sh head/databases/mysqlwsrep56-server/files/patch-sql_sql_trigger.cc head/databases/mysqlwsrep56-server/files/patch-sql_sql_view.cc head/databases/mysqlwsrep56-server/files/patch-sql_sys_vars.cc Modified: head/Mk/Uses/mysql.mk head/Mk/bsd.default-versions.mk head/databases/Makefile head/databases/mysqlwsrep56-server/Makefile head/databases/mysqlwsrep56-server/distinfo head/databases/mysqlwsrep56-server/files/mysql-server.in head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake head/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-include_myisam.h head/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt head/databases/mysqlwsrep56-server/pkg-descr head/databases/mysqlwsrep56-server/pkg-message head/databases/mysqlwsrep56-server/pkg-plist Modified: head/Mk/Uses/mysql.mk ============================================================================== --- head/Mk/Uses/mysql.mk Wed Feb 22 17:25:22 2017 (r434623) +++ head/Mk/Uses/mysql.mk Wed Feb 22 17:31:39 2017 (r434624) @@ -63,6 +63,7 @@ MYSQL55m_LIBVER= 18 MYSQL55p_LIBVER= 18 MYSQL56_LIBVER= 18 MYSQL56p_LIBVER= 18 +MYSQL56w_LIBVER= 18 MYSQL57_LIBVER= 20 MYSQL57p_LIBVER= 20 MYSQL80_LIBVER= 21 @@ -106,15 +107,21 @@ IGNORE= cannot install: MySQL versions .endif .if (${MYSQL_VER:C/[0-9]*//} == "m") -_MYSQL_FLAVOUR= mariadb +_MYSQL_SERVER_FLAVOUR= mariadb +_MYSQL_CLIENT_FLAVOUR= mariadb .elif (${MYSQL_VER:C/[0-9]*//} == "p") -_MYSQL_FLAVOUR= percona +_MYSQL_SERVER_FLAVOUR= percona +_MYSQL_CLIENT_FLAVOUR= percona +.elif (${MYSQL_VER:C/[0-9]*//} == "w") +_MYSQL_SERVER_FLAVOUR= mysqlwsrep +_MYSQL_CLIENT_FLAVOUR= mysql .else -_MYSQL_FLAVOUR= mysql +_MYSQL_SERVER_FLAVOUR= mysql +_MYSQL_CLIENT_FLAVOUR= mysql .endif -_MYSQL_CLIENT= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-client -_MYSQL_SERVER= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-server +_MYSQL_CLIENT= databases/${_MYSQL_CLIENT_FLAVOUR}${MYSQL_VER:C/[mp]//}-client +_MYSQL_SERVER= databases/${_MYSQL_SERVER_FLAVOUR}${MYSQL_VER:C/[mp]//}-server # And now we are checking if we can use it .if defined(MYSQL${MYSQL_VER}_LIBVER) Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Wed Feb 22 17:25:22 2017 (r434623) +++ head/Mk/bsd.default-versions.mk Wed Feb 22 17:31:39 2017 (r434624) @@ -54,7 +54,7 @@ WARNING+= "OVERRIDE_LINUX_BASE_PORT is .endif # Possible values: 5.1, 5.2, 5.3 LUA_DEFAULT?= 5.2 -# Possible values: 5.1, 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p, 5.7p +# Possible values: 5.1, 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p, 5.7p, 5.6w MYSQL_DEFAULT?= 5.6 # Possible values: 5.20, 5.22, 5.24, devel .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Wed Feb 22 17:25:22 2017 (r434623) +++ head/databases/Makefile Wed Feb 22 17:31:39 2017 (r434624) @@ -226,6 +226,7 @@ SUBDIR += mysql57-server SUBDIR += mysql80-client SUBDIR += mysql80-server + SUBDIR += mysqlwsrep56-server SUBDIR += mysqlbackup SUBDIR += mysqlbigram SUBDIR += mysqldump-secure Modified: head/databases/mysqlwsrep56-server/Makefile ============================================================================== --- head/databases/mysql56-server/Makefile Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/Makefile Wed Feb 22 17:31:39 2017 (r434624) @@ -1,96 +1,65 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> +# Created by: Philip Stoev <philip.stoev@galeracluster.com> # $FreeBSD$ -PORTNAME?= mysql +PORTNAME= mysqlwsrep PORTVERSION= 5.6.35 -PORTREVISION?= 4 CATEGORIES= databases ipv6 -MASTER_SITES= MYSQL/MySQL-5.6 -PKGNAMESUFFIX?= 56-server +MASTER_SITES= http://releases.galeracluster.com/source/ +PKGNAMESUFFIX= 56-server +DISTNAME= mysql-wsrep-5.6.35-25.19 -MAINTAINER= mokhi64@gmail.com -COMMENT?= Multithreaded SQL database (server) +MAINTAINER= info@galeracluster.com +COMMENT= MySQL database enhanced with Galera replication (server package) LICENSE= GPLv2 -SLAVEDIRS= databases/mysql56-client -USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib \ - cpe libedit localbase perl5 shebangfix ssl +BUILD_DEPENDS= bison:devel/bison +RUN_DEPENDS= socat:net/socat lsof:sysutils/lsof netcat:net/netcat rsync:net/rsync -USE_PERL5= run +DATADIR= ${PREFIX}/share/mysql -MY_DBDIR= /var/db/mysql -MY_SECDIR= /var/db/mysql_secure -MY_TMPDIR= /var/db/mysql_tmpdir +BROKEN_powerpc64= Does not build -LIB_DEPENDS+= libevent.so:devel/libevent2 \ - liblz4.so:archivers/liblz4 +USES= cmake:outsource libedit shebangfix perl5 +USE_PERL5= run +USE_LDCONFIG= yes -CMAKE_BUILD_TYPE= Release +MY_DBDIR= /var/db/mysql -CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ - -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ - -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ - -DINSTALL_DOCDIR="share/doc/mysql" \ +CMAKE_ARGS+= -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_SQLBENCHDIR="share/mysql" \ -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_SSL=${OPENSSLBASE} \ - -DCRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \ - -DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \ - -DINSTALL_MYSQLTESTDIR=0 + -DWITH_LIBWRAP=1 \ + -DWITH_WSREP=1 -SHEBANG_FILES= scripts/*.pl* scripts/*.sh +SHEBANG_FILES= scripts/*.pl* scripts/*.sh scripts/wsrep_sst_* .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} - -# MySQL-Server part -.if !defined(CLIENT_ONLY) -USES+= mysql:56 - -CONFLICTS_INSTALL= mysql5[0-57-9]-server-* \ - mysql[0-46-9][0-9]-server-* \ - mariadb[0-9][0-9]-server-* \ - percona[0-9][0-9]-server-* +CONFLICTS_INSTALL= mysql5[0-9]-server-* \ + mariadb*-server-* \ + percona*-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 \ @@ -98,52 +67,10 @@ MMAN1= my_print_defaults.1 myisam_ftdum 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 -OPTIONS_SUB= YES -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 -OPTIONS_GROUP_FEATURES= PERFSCHM -FEATURES_DESC= Default features knobs -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" -.endif - -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt -.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.pre.mk> .if ${ARCH} == "armv6" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake Modified: head/databases/mysqlwsrep56-server/distinfo ============================================================================== --- head/databases/mysql56-server/distinfo Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/distinfo Wed Feb 22 17:31:39 2017 (r434624) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484753208 -SHA256 (mysql-5.6.35.tar.gz) = dddcba169b98844d7c65346cbd791c853edf942d78440381685087b84aa35020 -SIZE (mysql-5.6.35.tar.gz) = 32167628 +TIMESTAMP = 1486024045 +SHA256 (mysql-wsrep-5.6.35-25.19.tar.gz) = f7bf200c5d5379cf616d901fcf701c8bad11658e06b1d8e25cb50d7164ee229c +SIZE (mysql-wsrep-5.6.35-25.19.tar.gz) = 33180905 Modified: head/databases/mysqlwsrep56-server/files/mysql-server.in ============================================================================== --- head/databases/mysql56-server/files/mysql-server.in Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/mysql-server.in Wed Feb 22 17:31:39 2017 (r434624) @@ -47,6 +47,20 @@ 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" +service_startup_timeout=900 +startup_sleep=1 +sst_progress_file=${mysql_dbdir}/sst_in_progress +extra_commands="bootstrap" +bootstrap_cmd="mysql_bootstrap" + +mysql_bootstrap() +{ + # Bootstrap the cluster, start the first node that initiate the cluster + check_startmsgs && echo "Bootstrapping cluster" + shift + command_args="$command_args --wsrep-new-cluster" + run_rc_command ${_rc_prefix}start +} mysql_create_auth_tables() { @@ -68,12 +82,16 @@ mysql_prestart() mysql_poststart() { - local timeout=15 - while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do - timeout=$(( timeout - 1 )) - sleep 1 - done - return 0 + local timeout=${service_startup_timeout} + while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do + if test -e $sst_progress_file && [ $startup_sleep -ne 100 ]; then + check_startmsgs && echo "SST in progress, setting sleep higher" + startup_sleep=100 + fi + timeout=$(( timeout - 1 )) + sleep $startup_sleep + done + return 0 } run_rc_command "$1" Modified: head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-CMakeLists.txt Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt Wed Feb 22 17:31:39 2017 (r434624) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 -+++ CMakeLists.txt 2014-08-04 14:18:38.795491147 +0000 -@@ -500,12 +500,10 @@ +--- CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ CMakeLists.txt +@@ -499,12 +499,10 @@ IF(UNIX) ENDIF() IF(NOT WITHOUT_SERVER) @@ -13,7 +13,7 @@ ENDIF(WITH_EMBEDDED_SERVER) ENDIF() -@@ -514,10 +512,7 @@ +@@ -513,10 +511,7 @@ ENDIF() ADD_SUBDIRECTORY(scripts) IF(NOT WITHOUT_SERVER) @@ -24,7 +24,7 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF() -@@ -572,6 +567,7 @@ +@@ -574,6 +569,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # @@ -32,10 +32,11 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -597,5 +593,6 @@ +@@ -597,6 +593,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) + Modified: head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-client_CMakeLists.txt Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt Wed Feb 22 17:31:39 2017 (r434624) @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2013-05-21 17:18:39.000000000 +0200 -+++ client/CMakeLists.txt 2013-06-10 15:43:33.000000000 +0200 -@@ -31,17 +31,20 @@ +--- client/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ client/CMakeLists.txt +@@ -31,17 +31,20 @@ INCLUDE_DIRECTORIES( COPY_OPENSSL_DLLS(copy_openssl_client) ADD_DEFINITIONS(${SSL_DEFINES}) @@ -21,9 +21,9 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -50,17 +53,21 @@ - +@@ -51,17 +54,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +ENDIF() @@ -43,7 +43,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -73,6 +80,7 @@ +@@ -74,6 +81,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) @@ -51,7 +51,7 @@ # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -82,11 +90,6 @@ +@@ -83,11 +91,6 @@ ENDIF(WIN32) SET_TARGET_PROPERTIES ( mysql_plugin mysql_upgrade Modified: head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake ============================================================================== --- head/databases/mysql56-server/files/patch-cmake_plugin.cmake Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake Wed Feb 22 17:31:39 2017 (r434624) @@ -1,6 +1,6 @@ ---- cmake/plugin.cmake.orig 2011-09-09 17:56:39.000000000 +0200 -+++ cmake/plugin.cmake 2011-10-07 10:56:37.000000000 +0200 -@@ -195,7 +195,6 @@ +--- cmake/plugin.cmake.orig 2017-01-25 07:58:07 UTC ++++ cmake/plugin.cmake +@@ -205,7 +205,6 @@ MACRO(MYSQL_ADD_PLUGIN) OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}") # Install dynamic library MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server) Modified: head/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake ============================================================================== --- head/databases/mysql56-server/files/patch-cmake_ssl.cmake Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake Wed Feb 22 17:31:39 2017 (r434624) @@ -1,4 +1,4 @@ ---- cmake/ssl.cmake.orig 2016-11-28 13:36:22 UTC +--- cmake/ssl.cmake.orig 2017-01-25 07:58:07 UTC +++ cmake/ssl.cmake @@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL) IF(OPENSSL_INCLUDE_DIR AND Modified: head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-extra_CMakeLists.txt Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt Wed Feb 22 17:31:39 2017 (r434624) @@ -1,8 +1,8 @@ ---- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ extra/CMakeLists.txt 2013-02-13 14:35:11.000000000 +0100 -@@ -102,8 +102,10 @@ +--- extra/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ extra/CMakeLists.txt +@@ -101,8 +101,10 @@ IF(UNIX) + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) - SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) Modified: head/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-include_CMakeLists.txt Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt Wed Feb 22 17:31:39 2017 (r434624) @@ -1,6 +1,6 @@ ---- include/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 -+++ include/CMakeLists.txt 2013-02-13 14:53:40.000000000 +0100 -@@ -65,10 +65,12 @@ +--- include/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ include/CMakeLists.txt +@@ -65,10 +65,12 @@ SET(HEADERS ${HEADERS_GEN_CONFIGURE} ) Copied: head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h (from r433551, head/databases/mysql56-server/files/patch-include_my_compare.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h Wed Feb 22 17:31:39 2017 (r434624, copy of r433551, head/databases/mysql56-server/files/patch-include_my_compare.h) @@ -0,0 +1,11 @@ +--- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200 ++++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200 +@@ -39,7 +39,7 @@ + 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) Modified: head/databases/mysqlwsrep56-server/files/patch-include_myisam.h ============================================================================== --- head/databases/mysql56-server/files/patch-include_myisam.h Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-include_myisam.h Wed Feb 22 17:31:39 2017 (r434624) @@ -1,6 +1,6 @@ ---- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100 -+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100 -@@ -48,7 +48,7 @@ +--- include/myisam.h.orig 2017-01-25 07:58:07 UTC ++++ include/myisam.h +@@ -49,7 +49,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. */ Modified: head/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt Wed Feb 22 17:31:39 2017 (r434624) @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2013-07-10 18:17:29.000000000 +0200 -+++ libmysql/CMakeLists.txt 2013-08-12 08:59:49.000000000 +0200 -@@ -173,7 +173,7 @@ +--- libmysql/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ libmysql/CMakeLists.txt +@@ -180,7 +180,7 @@ IF(WIN32) ENDIF() # Merge several convenience libraries into one big mysqlclient @@ -9,7 +9,7 @@ # Visual Studio users need debug static library for debug projects IF(MSVC) -@@ -200,19 +200,22 @@ +@@ -208,19 +208,22 @@ IF(UNIX) ENDMACRO() ENDIF() @@ -33,7 +33,7 @@ IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -271,4 +274,5 @@ +@@ -289,4 +292,5 @@ IF(NOT DISABLE_SHARED) ${INSTALL_LIBDIR} SharedLibraries) ENDFOREACH() ENDIF() Modified: head/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-libservices_CMakeLists.txt Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt Wed Feb 22 17:31:39 2017 (r434624) @@ -1,7 +1,7 @@ ---- libservices/CMakeLists.txt.orig 2010-12-23 17:13:03.000000000 +0100 -+++ libservices/CMakeLists.txt 2010-12-23 17:13:17.000000000 +0100 -@@ -22,4 +22,6 @@ - my_thread_scheduler_service.c) +--- libservices/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ libservices/CMakeLists.txt +@@ -24,4 +24,6 @@ SET(MYSQLSERVICES_SOURCES + mysql_string_service.c) ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) +IF(FALSE) Modified: head/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-man_CMakeLists.txt Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt Wed Feb 22 17:31:39 2017 (r434624) @@ -1,11 +1,13 @@ ---- man/CMakeLists.txt.orig 2011-10-22 14:36:06.000000000 +0200 -+++ man/CMakeLists.txt 2011-10-22 14:36:23.000000000 +0200 -@@ -15,8 +15,6 @@ +--- man/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ man/CMakeLists.txt +@@ -14,9 +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_FILES *.1) -FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) -FILE(GLOB MAN1_NDB ndb*.1) ++FILE(GLOB MAN1_FILES 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) FILE(GLOB MAN8_FILES *.8) FILE(GLOB MAN8_NDB ndb*.8) IF(MAN1_FILES) Copied: head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc (from r433551, head/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc Wed Feb 22 17:31:39 2017 (r434624, copy of r433551, head/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc) @@ -0,0 +1,61 @@ +--- mysys_ssl/my_default.cc.orig 2016-11-28 13:36:22 UTC ++++ mysys_ssl/my_default.cc +@@ -110,7 +110,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; + +@@ -903,6 +903,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++; +@@ -1241,7 +1249,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); + } + } + } +@@ -1400,13 +1409,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 + +@@ -1477,7 +1481,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. Copied: head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc (from r433551, head/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc Wed Feb 22 17:31:39 2017 (r434624, copy of r433551, head/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc) @@ -0,0 +1,11 @@ +--- plugin/password_validation/validate_password.cc.orig 2013-09-10 07:38:25.000000000 +0000 ++++ plugin/password_validation/validate_password.cc 2013-10-05 15:40:20.790380179 +0000 +@@ -16,6 +16,8 @@ + #include <my_sys.h> + #include <string> + #include <mysql/plugin_validate_password.h> ++/* solve clash between libc++ bitset::test() and test macro from my_global.h */ ++#undef test + #include <set> + #include <iostream> + #include <fstream> Modified: head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-scripts_CMakeLists.txt Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt Wed Feb 22 17:31:39 2017 (r434624) @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 -+++ scripts/CMakeLists.txt 2013-02-13 14:39:57.000000000 +0100 -@@ -264,6 +264,8 @@ +--- scripts/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ scripts/CMakeLists.txt +@@ -298,6 +298,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} " ) @@ -9,7 +9,7 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -314,15 +316,10 @@ +@@ -360,15 +362,10 @@ ELSE() # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) SET(BIN_SCRIPTS @@ -25,7 +25,7 @@ mysqlhotcopy mysqldumpslow mysqld_multi -@@ -331,7 +328,7 @@ +@@ -378,7 +375,7 @@ ELSE() FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh Copied: head/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh (from r433551, head/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh Wed Feb 22 17:31:39 2017 (r434624, copy of r433551, head/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh) @@ -0,0 +1,24 @@ +--- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200 ++++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200 +@@ -242,10 +242,10 @@ + + if test -z "$MYSQL_HOME" + then +- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" ++ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" + then + log_error "WARNING: Found two instances of my.cnf - +-$MY_BASEDIR_VERSION/my.cnf and ++$MY_BASEDIR_VERSION/etc/my.cnf and + $DATADIR/my.cnf + IGNORING $DATADIR/my.cnf" + +@@ -254,7 +254,7 @@ + then + log_error "WARNING: Found $DATADIR/my.cnf + The data directory is a deprecated location for my.cnf, please move it to +-$MY_BASEDIR_VERSION/my.cnf" ++$MY_BASEDIR_VERSION/etc/my.cnf" + MYSQL_HOME=$DATADIR + else + MYSQL_HOME=$MY_BASEDIR_VERSION Modified: head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-sql_CMakeLists.txt Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt Wed Feb 22 17:31:39 2017 (r434624) @@ -1,6 +1,6 @@ ---- sql/CMakeLists.txt.orig 2013-04-05 14:27:18.000000000 +0200 -+++ sql/CMakeLists.txt 2013-04-19 15:08:12.000000000 +0200 -@@ -423,6 +423,7 @@ +--- sql/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ sql/CMakeLists.txt +@@ -472,6 +472,7 @@ ADD_CUSTOM_TARGET(distclean IF(INSTALL_LAYOUT STREQUAL "STANDALONE") @@ -8,7 +8,7 @@ # Copy db.opt into data/test/ SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles) -@@ -467,6 +468,7 @@ +@@ -516,6 +517,7 @@ ELSE() INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) ENDIF() ENDIF() Copied: head/databases/mysqlwsrep56-server/files/patch-sql_sql__trigger.cc (from r433551, head/databases/mysql56-server/files/patch-sql_sql_trigger.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep56-server/files/patch-sql_sql__trigger.cc Wed Feb 22 17:31:39 2017 (r434624, copy of r433551, head/databases/mysql56-server/files/patch-sql_sql_trigger.cc) @@ -0,0 +1,50 @@ +--- sql/sql_trigger.cc.orig 2012-08-02 00:01:13.000000000 +0200 ++++ sql/sql_trigger.cc 2012-09-11 17:01:13.000000000 +0200 +@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]= + { + { + { C_STRING_WITH_LEN("triggers") }, +- my_offsetof(class Table_triggers_list, definitions_list), ++ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("sql_modes") }, +- my_offsetof(class Table_triggers_list, definition_modes_list), ++ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), + FILE_OPTIONS_ULLLIST + }, + { + { C_STRING_WITH_LEN("definers") }, +- my_offsetof(class Table_triggers_list, definers_list), ++ static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("client_cs_names") }, +- my_offsetof(class Table_triggers_list, client_cs_names), ++ static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("connection_cl_names") }, +- my_offsetof(class Table_triggers_list, connection_cl_names), ++ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("db_cl_names") }, +- my_offsetof(class Table_triggers_list, db_cl_names), ++ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)), + FILE_OPTIONS_STRLIST + }, + { { 0, 0 }, 0, FILE_OPTIONS_STRING } +@@ -226,7 +226,7 @@ static File_option triggers_file_parameters[]= + File_option sql_modes_parameters= + { + { C_STRING_WITH_LEN("sql_modes") }, +- my_offsetof(class Table_triggers_list, definition_modes_list), ++ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), + FILE_OPTIONS_ULLLIST + }; + Copied: head/databases/mysqlwsrep56-server/files/patch-sql_sql__view.cc (from r433551, head/databases/mysql56-server/files/patch-sql_sql_view.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep56-server/files/patch-sql_sql__view.cc Wed Feb 22 17:31:39 2017 (r434624, copy of r433551, head/databases/mysql56-server/files/patch-sql_sql_view.cc) @@ -0,0 +1,63 @@ +--- sql/sql_view.cc.orig 2012-08-02 00:01:13.000000000 +0200 ++++ sql/sql_view.cc 2012-09-11 17:01:13.000000000 +0200 +@@ -730,46 +730,46 @@ static const int required_view_parameters= 14; + */ + static File_option view_parameters[]= + {{{ C_STRING_WITH_LEN("query")}, +- my_offsetof(TABLE_LIST, select_stmt), ++ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)), + FILE_OPTIONS_ESTRING}, + {{ C_STRING_WITH_LEN("md5")}, +- my_offsetof(TABLE_LIST, md5), ++ static_cast<int>(my_offsetof(TABLE_LIST, md5)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("updatable")}, +- my_offsetof(TABLE_LIST, updatable_view), ++ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("algorithm")}, +- my_offsetof(TABLE_LIST, algorithm), ++ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("definer_user")}, +- my_offsetof(TABLE_LIST, definer.user), ++ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("definer_host")}, +- my_offsetof(TABLE_LIST, definer.host), ++ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("suid")}, +- my_offsetof(TABLE_LIST, view_suid), ++ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("with_check_option")}, +- my_offsetof(TABLE_LIST, with_check), ++ static_cast<int>(my_offsetof(TABLE_LIST, with_check)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("timestamp")}, +- my_offsetof(TABLE_LIST, timestamp), ++ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)), + FILE_OPTIONS_TIMESTAMP}, + {{ C_STRING_WITH_LEN("create-version")}, +- my_offsetof(TABLE_LIST, file_version), ++ static_cast<int>(my_offsetof(TABLE_LIST, file_version)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("source")}, +- my_offsetof(TABLE_LIST, source), ++ static_cast<int>(my_offsetof(TABLE_LIST, source)), + FILE_OPTIONS_ESTRING}, + {{(char*) STRING_WITH_LEN("client_cs_name")}, +- my_offsetof(TABLE_LIST, view_client_cs_name), ++ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)), + FILE_OPTIONS_STRING}, + {{(char*) STRING_WITH_LEN("connection_cl_name")}, +- my_offsetof(TABLE_LIST, view_connection_cl_name), ++ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)), + FILE_OPTIONS_STRING}, + {{(char*) STRING_WITH_LEN("view_body_utf8")}, +- my_offsetof(TABLE_LIST, view_body_utf8), ++ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)), + FILE_OPTIONS_ESTRING}, + {{NullS, 0}, 0, + FILE_OPTIONS_STRING} Copied: head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc (from r433551, head/databases/mysql56-server/files/patch-sql_sys_vars.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc Wed Feb 22 17:31:39 2017 (r434624, copy of r433551, head/databases/mysql56-server/files/patch-sql_sys_vars.cc) @@ -0,0 +1,38 @@ +--- sql/sys_vars.cc.orig 2012-06-15 17:03:32.000000000 +0200 ++++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200 +@@ -900,7 +900,7 @@ + "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", +@@ -1401,7 +1401,7 @@ + "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)); + +@@ -1416,7 +1416,7 @@ + "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)); + +@@ -2257,7 +2257,7 @@ + "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)); + + /** propagates changes to the relevant flag of @@optimizer_switch */ Modified: head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-support-files_CMakeLists.txt Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt Wed Feb 22 17:31:39 2017 (r434624) @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2010-12-23 17:38:19.000000000 +0100 -+++ support-files/CMakeLists.txt 2010-12-23 17:41:11.000000000 +0100 -@@ -74,7 +74,9 @@ +--- support-files/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ support-files/CMakeLists.txt +@@ -69,7 +69,9 @@ IF(UNIX) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() @@ -9,4 +9,4 @@ +ENDIF() CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) - CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY) + Modified: head/databases/mysqlwsrep56-server/pkg-descr ============================================================================== --- head/databases/mysql56-server/pkg-descr Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/pkg-descr Wed Feb 22 17:31:39 2017 (r434624) @@ -1,4 +1,3 @@ -MySQL is a very fast, multi-threaded, multi-user and robust SQL -(Structured Query Language) database server. +MySQL built with WSREP patch to support replication using the Galera library. -WWW: http://www.mysql.com/ +WWW: http://www.galeracluster.com/ Modified: head/databases/mysqlwsrep56-server/pkg-message ============================================================================== --- head/databases/mysql56-server/pkg-message Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/pkg-message Wed Feb 22 17:31:39 2017 (r434624) @@ -1,19 +1,6 @@ -***************************************************************************** +************************************************************************ 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 - -***************************************************************************** - -***************************************************************************** - -Please keep in mind that the default location for my.cnf will be changed -from "/var/db/mysql/my.cnf" to "/usr/local/etc/mysql/my.cnf" in the near -future. If you do not want to move your my.cnf to the new location then -you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf". - -***************************************************************************** +************************************************************************ Modified: head/databases/mysqlwsrep56-server/pkg-plist ============================================================================== --- head/databases/mysql56-server/pkg-plist Tue Feb 7 13:48:09 2017 (r433551) +++ head/databases/mysqlwsrep56-server/pkg-plist Wed Feb 22 17:31:39 2017 (r434624) @@ -23,14 +23,17 @@ bin/perror bin/replace bin/resolve_stack_dump bin/resolveip -lib/mysql/libmysqld.a +bin/wsrep_sst_common +bin/wsrep_sst_mysqldump +bin/wsrep_sst_rsync +bin/wsrep_sst_xtrabackup +bin/wsrep_sst_xtrabackup-v2 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/libdaemon_example.so -%%EXAMPLE%%lib/mysql/plugin/ha_example.so lib/mysql/plugin/mypluglib.so lib/mysql/plugin/mysql_no_login.so lib/mysql/plugin/qa_auth_client.so @@ -40,6 +43,8 @@ lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/test_udf_services.so lib/mysql/plugin/validate_password.so +lib/mysql/plugin/innodb_engine.so +lib/mysql/plugin/libmemcached.so libexec/mysqld man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz @@ -132,7 +137,4 @@ man/man8/mysqld.8.gz %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys -%%ETCDIR%%/my.cnf.sample -@dir(mysql,mysql,0750) %%ETCDIR%%/keyring -@dir(mysql,mysql,0750) %%MY_SECDIR%% -@dir(mysql,mysql,0750) %%MY_TMPDIR%% +%%DATADIR%%/wsrep_notify
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702221731.v1MHVdIu080977>