Date: Wed, 3 Feb 2016 23:11:17 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408005 - in head/databases: mysql57-client mysql57-client/files mysql57-server mysql57-server/files Message-ID: <201602032311.u13NBHtI029580@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Wed Feb 3 23:11:17 2016 New Revision: 408005 URL: https://svnweb.freebsd.org/changeset/ports/408005 Log: - 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 PR: 205956 206065 Submitted by: smh Reviewed by: mokhi64@gmail.com (maintainer) Approved by: mokhi64@gmail.com (maintainer) MFH: 2016Q1 Modified: head/databases/mysql57-client/files/patch-include_CMakeLists.txt head/databases/mysql57-client/pkg-plist head/databases/mysql57-server/Makefile head/databases/mysql57-server/files/mysql-server.in head/databases/mysql57-server/files/patch-include_CMakeLists.txt head/databases/mysql57-server/pkg-message head/databases/mysql57-server/pkg-plist Modified: head/databases/mysql57-client/files/patch-include_CMakeLists.txt ============================================================================== --- head/databases/mysql57-client/files/patch-include_CMakeLists.txt Wed Feb 3 22:45:23 2016 (r408004) +++ head/databases/mysql57-client/files/patch-include_CMakeLists.txt Wed Feb 3 23:11:17 2016 (r408005) @@ -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: head/databases/mysql57-client/pkg-plist ============================================================================== --- head/databases/mysql57-client/pkg-plist Wed Feb 3 22:45:23 2016 (r408004) +++ head/databases/mysql57-client/pkg-plist Wed Feb 3 23:11:17 2016 (r408005) @@ -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: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Wed Feb 3 22:45:23 2016 (r408004) +++ head/databases/mysql57-server/Makefile Wed Feb 3 23:11:17 2016 (r408005) @@ -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 @@ -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 @@ -117,7 +118,7 @@ OPENSSL_CMAKE_ON= -DWITH_SSL=yes .endif 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: head/databases/mysql57-server/files/mysql-server.in ============================================================================== --- head/databases/mysql57-server/files/mysql-server.in Wed Feb 3 22:45:23 2016 (r408004) +++ head/databases/mysql57-server/files/mysql-server.in Wed Feb 3 23:11:17 2016 (r408005) @@ -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: head/databases/mysql57-server/files/patch-include_CMakeLists.txt ============================================================================== --- head/databases/mysql57-server/files/patch-include_CMakeLists.txt Wed Feb 3 22:45:23 2016 (r408004) +++ head/databases/mysql57-server/files/patch-include_CMakeLists.txt Wed Feb 3 23:11:17 2016 (r408005) @@ -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: head/databases/mysql57-server/pkg-message ============================================================================== --- head/databases/mysql57-server/pkg-message Wed Feb 3 22:45:23 2016 (r408004) +++ head/databases/mysql57-server/pkg-message Wed Feb 3 23:11:17 2016 (r408005) @@ -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: head/databases/mysql57-server/pkg-plist ============================================================================== --- head/databases/mysql57-server/pkg-plist Wed Feb 3 22:45:23 2016 (r408004) +++ head/databases/mysql57-server/pkg-plist Wed Feb 3 23:11:17 2016 (r408005) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602032311.u13NBHtI029580>