From owner-svn-ports-branches@freebsd.org Thu Feb 4 06:16:31 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3FF3EA9BD96; Thu, 4 Feb 2016 06:16:31 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D2E01BE6; Thu, 4 Feb 2016 06:16:31 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u146GUio055078; Thu, 4 Feb 2016 06:16:30 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u146GTSx055070; Thu, 4 Feb 2016 06:16:29 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201602040616.u146GTSx055070@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Thu, 4 Feb 2016 06:16:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r408012 - in branches/2016Q1/databases: mysql57-client mysql57-client/files mysql57-server mysql57-server/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2016 06:16:31 -0000 Author: riggs Date: Thu Feb 4 06:16:29 2016 New Revision: 408012 URL: https://svnweb.freebsd.org/changeset/ports/408012 Log: MFH: r408005 - Fix plist - binary_log_types.h is now installed only by client, not server - lib/mysql/plugin/ha_example.so is only installed if EXAMPLES OPTION is turned off - Bump PORTREVISION - Allow slave port to override PORTREVISION if necessary - Deactivate performance_schema feature to conserve memory - Add notes to pkg-message: - root password - performance_schema feature is deactivated by default to reduce memory footprint - Allow port to build while boost-libs-1.55 is installed PR: 205956 206065 206612 206879 Submitted by: smh Reviewed by: mokhi64@gmail.com (maintainer) Approved by: ports-secteam (feld), mokhi64@gmail.com (maintainer) Modified: branches/2016Q1/databases/mysql57-client/Makefile branches/2016Q1/databases/mysql57-client/files/patch-include_CMakeLists.txt branches/2016Q1/databases/mysql57-client/pkg-plist branches/2016Q1/databases/mysql57-server/Makefile branches/2016Q1/databases/mysql57-server/files/mysql-server.in branches/2016Q1/databases/mysql57-server/files/patch-include_CMakeLists.txt branches/2016Q1/databases/mysql57-server/pkg-message branches/2016Q1/databases/mysql57-server/pkg-plist Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/databases/mysql57-client/Makefile ============================================================================== --- branches/2016Q1/databases/mysql57-client/Makefile Thu Feb 4 03:29:49 2016 (r408011) +++ branches/2016Q1/databases/mysql57-client/Makefile Thu Feb 4 06:16:29 2016 (r408012) @@ -14,7 +14,6 @@ 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 \ Modified: branches/2016Q1/databases/mysql57-client/files/patch-include_CMakeLists.txt ============================================================================== --- branches/2016Q1/databases/mysql57-client/files/patch-include_CMakeLists.txt Thu Feb 4 03:29:49 2016 (r408011) +++ branches/2016Q1/databases/mysql57-client/files/patch-include_CMakeLists.txt Thu Feb 4 06:16:29 2016 (r408012) @@ -8,11 +8,4 @@ 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" + Modified: branches/2016Q1/databases/mysql57-client/pkg-plist ============================================================================== --- branches/2016Q1/databases/mysql57-client/pkg-plist Thu Feb 4 03:29:49 2016 (r408011) +++ branches/2016Q1/databases/mysql57-client/pkg-plist Thu Feb 4 06:16:29 2016 (r408012) @@ -10,6 +10,7 @@ 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 Modified: branches/2016Q1/databases/mysql57-server/Makefile ============================================================================== --- branches/2016Q1/databases/mysql57-server/Makefile Thu Feb 4 03:29:49 2016 (r408011) +++ branches/2016Q1/databases/mysql57-server/Makefile Thu Feb 4 06:16:29 2016 (r408012) @@ -3,7 +3,7 @@ PORTNAME= mysql PORTVERSION= 5.7.10 -PORTREVISION= 1 +PORTREVISION?= 2 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost PKGNAMESUFFIX?= 57-server @@ -40,7 +40,8 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DLOCAL_BOOST_DIR=${WRKSRC}/../boost_1_59_0 \ + -DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \ + -DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \ -DWITH_INNODB_EXTRA_DEBUG=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -61,7 +62,6 @@ 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-* @@ -84,6 +84,7 @@ 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 @@ -116,10 +117,8 @@ OPENSSL_CMAKE_ON= -DWITH_SSL=system 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 + @${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 Modified: branches/2016Q1/databases/mysql57-server/files/mysql-server.in ============================================================================== --- branches/2016Q1/databases/mysql57-server/files/mysql-server.in Thu Feb 4 03:29:49 2016 (r408011) +++ branches/2016Q1/databases/mysql57-server/files/mysql-server.in Thu Feb 4 06:16:29 2016 (r408012) @@ -41,7 +41,7 @@ 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}" +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} --skip-performance-schema" procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" Modified: branches/2016Q1/databases/mysql57-server/files/patch-include_CMakeLists.txt ============================================================================== --- branches/2016Q1/databases/mysql57-server/files/patch-include_CMakeLists.txt Thu Feb 4 03:29:49 2016 (r408011) +++ branches/2016Q1/databases/mysql57-server/files/patch-include_CMakeLists.txt Thu Feb 4 06:16:29 2016 (r408012) @@ -2,9 +2,9 @@ +++ include/CMakeLists.txt @@ -69,10 +69,12 @@ SET(HEADERS ) - + ++IF(FALSE) INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR}) -+IF(FALSE) INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development PATTERN "*.h" Modified: branches/2016Q1/databases/mysql57-server/pkg-message ============================================================================== --- branches/2016Q1/databases/mysql57-server/pkg-message Thu Feb 4 03:29:49 2016 (r408011) +++ branches/2016Q1/databases/mysql57-server/pkg-message Thu Feb 4 06:16:29 2016 (r408012) @@ -1,6 +1,13 @@ -************************************************************************ +***************************************************************************** Remember to run mysql_upgrade the first time you start the MySQL server after an upgrade from an earlier version. -************************************************************************ +Init. 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 + +performance_schema feature is set off by default, because of using high RAM. +if you need it enable it yourself :) + +***************************************************************************** Modified: branches/2016Q1/databases/mysql57-server/pkg-plist ============================================================================== --- branches/2016Q1/databases/mysql57-server/pkg-plist Thu Feb 4 03:29:49 2016 (r408011) +++ branches/2016Q1/databases/mysql57-server/pkg-plist Thu Feb 4 06:16:29 2016 (r408012) @@ -19,13 +19,12 @@ bin/replace bin/resolve_stack_dump bin/resolveip bin/zlib_decompress -include/mysql/binary_log_types.h 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/daemon_example.ini -lib/mysql/plugin/ha_example.so +%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/libtest_framework.so lib/mysql/plugin/libtest_services.so