From owner-svn-ports-head@freebsd.org Sat Jan 7 20:34:50 2017 Return-Path: Delivered-To: svn-ports-head@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 62343CA332B; Sat, 7 Jan 2017 20:34:50 +0000 (UTC) (envelope-from lifanov@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 265061812; Sat, 7 Jan 2017 20:34:50 +0000 (UTC) (envelope-from lifanov@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v07KYnaH080007; Sat, 7 Jan 2017 20:34:49 GMT (envelope-from lifanov@FreeBSD.org) Received: (from lifanov@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v07KYlUs079981; Sat, 7 Jan 2017 20:34:47 GMT (envelope-from lifanov@FreeBSD.org) Message-Id: <201701072034.v07KYlUs079981@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lifanov set sender to lifanov@FreeBSD.org using -f From: Nikolai Lifanov Date: Sat, 7 Jan 2017 20:34:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430827 - in head: Mk Mk/Uses databases databases/mysql80-client databases/mysql80-client/files databases/mysql80-server databases/mysql80-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2017 20:34:50 -0000 Author: lifanov Date: Sat Jan 7 20:34:46 2017 New Revision: 430827 URL: https://svnweb.freebsd.org/changeset/ports/430827 Log: add databases/mysql80-server and databases/mysql80-client This is a development snapshot of upcoming MySQL 8.0. PR: 215738 Submitted by: Mahdi Mokhtari Reviewed by: matthew, feld Approved by: matthew (mentor), feld Differential Revision: https://reviews.freebsd.org/D9031 Added: head/databases/mysql80-client/ - copied from r430810, head/databases/mysql57-client/ head/databases/mysql80-server/ - copied from r430810, head/databases/mysql57-server/ head/databases/mysql80-server/files/patch-sql_histograms_histogram.h (contents, props changed) head/databases/mysql80-server/files/patch-sql_histograms_singleton.cc (contents, props changed) head/databases/mysql80-server/files/patch-sql_histograms_singleton.h (contents, props changed) head/databases/mysql80-server/files/patch-sql_json__dom.h (contents, props changed) head/databases/mysql80-server/files/patch-storage_innobase_buf_buf0buf.cc (contents, props changed) head/databases/mysql80-server/files/patch-storage_innobase_dict_dict0stats.cc (contents, props changed) head/databases/mysql80-server/files/patch-storage_innobase_sync_sync0debug.cc (contents, props changed) head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0purge.cc (contents, props changed) head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0trx.cc (contents, props changed) Deleted: head/databases/mysql80-client/files/patch-cmake_build__configurations_compiler__options.cmake head/databases/mysql80-server/files/patch-sql_sql__view.cc Modified: head/Mk/Uses/mysql.mk head/Mk/bsd.default-versions.mk head/databases/Makefile head/databases/mysql80-client/Makefile head/databases/mysql80-client/files/patch-client_CMakeLists.txt head/databases/mysql80-client/pkg-message head/databases/mysql80-client/pkg-plist head/databases/mysql80-server/Makefile head/databases/mysql80-server/distinfo head/databases/mysql80-server/files/patch-client_CMakeLists.txt head/databases/mysql80-server/pkg-descr head/databases/mysql80-server/pkg-message head/databases/mysql80-server/pkg-plist Modified: head/Mk/Uses/mysql.mk ============================================================================== --- head/Mk/Uses/mysql.mk Sat Jan 7 19:23:00 2017 (r430826) +++ head/Mk/Uses/mysql.mk Sat Jan 7 20:34:46 2017 (r430827) @@ -65,6 +65,7 @@ MYSQL55p_LIBVER= 18 MYSQL56_LIBVER= 18 MYSQL56p_LIBVER= 18 MYSQL57_LIBVER= 20 +MYSQL80_LIBVER= 21 MYSQL100m_LIBVER= 18 MYSQL101m_LIBVER= 18 Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Sat Jan 7 19:23:00 2017 (r430826) +++ head/Mk/bsd.default-versions.mk Sat Jan 7 20:34:46 2017 (r430827) @@ -49,7 +49,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, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p +# Possible values: 5.1, 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p MYSQL_DEFAULT?= 5.6 # Possible values: 5.20, 5.22, devel .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Sat Jan 7 19:23:00 2017 (r430826) +++ head/databases/Makefile Sat Jan 7 20:34:46 2017 (r430827) @@ -223,6 +223,8 @@ SUBDIR += mysql56-server SUBDIR += mysql57-client SUBDIR += mysql57-server + SUBDIR += mysql80-client + SUBDIR += mysql80-server SUBDIR += mysqlbackup SUBDIR += mysqlbigram SUBDIR += mysqldump-secure Modified: head/databases/mysql80-client/Makefile ============================================================================== --- head/databases/mysql57-client/Makefile Sat Jan 7 15:51:41 2017 (r430810) +++ head/databases/mysql80-client/Makefile Sat Jan 7 20:34:46 2017 (r430827) @@ -3,7 +3,7 @@ PORTNAME= mysql PORTREVISION?= 0 -PKGNAMESUFFIX= 57-client +PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) @@ -12,14 +12,14 @@ LICENSE+= LGPL21 BROKEN_powerpc64= Does not build BROKEN_sparc64= Does not build: reports unsupported compiler -MASTERDIR= ${.CURDIR}/../mysql57-server +MASTERDIR= ${.CURDIR}/../mysql80-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CONFLICTS_INSTALL= mysql5[0-68-9]-client-* \ - mysql[0-46-9][0-9]-client-* \ +CONFLICTS_INSTALL= mysql8[1-9]-client-* \ + mysql[0-79][0-9]-client-* \ mariadb[0-9][0-9]-client-* \ percona[0-9][0-9]-client-* @@ -37,6 +37,6 @@ CLIENT_ONLY= yes post-install: @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a @${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so - @${LN} -s libmysqlclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20 + @${LN} -s libmysqlclient.so.21 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.21 .include "${MASTERDIR}/Makefile" Modified: head/databases/mysql80-client/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/mysql57-client/files/patch-client_CMakeLists.txt Sat Jan 7 15:51:41 2017 (r430810) +++ head/databases/mysql80-client/files/patch-client_CMakeLists.txt Sat Jan 7 20:34:46 2017 (r430827) @@ -1,4 +1,4 @@ ---- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- client/CMakeLists.txt.orig 2016-08-25 12:32:09 UTC +++ client/CMakeLists.txt @@ -47,6 +47,7 @@ IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) @@ -8,7 +8,7 @@ IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc -@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS( +@@ -57,11 +58,14 @@ ADD_COMPILE_FLAGS( TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema) ENDIF() @@ -18,22 +18,12 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) + ADD_DEPENDENCIES(mysqltest GenError GenClientError) +ENDIF() ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) -@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - ADD_COMPILE_FLAGS( -@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli +@@ -113,8 +117,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) @@ -42,13 +32,5 @@ TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) +ENDIF() - IF(UNIX AND NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_install_db -@@ -122,7 +130,6 @@ IF(WIN32) - ENDIF(WIN32) - - SET_TARGET_PROPERTIES ( -- mysql_plugin - mysqlcheck - mysqldump - mysqlimport + 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) Modified: head/databases/mysql80-client/pkg-message ============================================================================== --- head/databases/mysql57-client/pkg-message Sat Jan 7 15:51:41 2017 (r430810) +++ head/databases/mysql80-client/pkg-message Sat Jan 7 20:34:46 2017 (r430827) @@ -1,6 +1,12 @@ * * * * * * * * * * * * * * * * * * * * * * * * This is the mysql CLIENT without the server. -for complete server and client, please install databases/mysql57-server +for complete server and client, please install databases/mysql80-server + +* * * * * * * * * * * * * * * * * * * * * * * * + +* * * * * * * * * * * * * * * * * * * * * * * * + +WARNING: THIS IS STILL-IN-DEV PROJECT! USE WITH CAUTION ON PRODUCTION ENVS! * * * * * * * * * * * * * * * * * * * * * * * * Modified: head/databases/mysql80-client/pkg-plist ============================================================================== --- head/databases/mysql57-client/pkg-plist Sat Jan 7 15:51:41 2017 (r430810) +++ head/databases/mysql80-client/pkg-plist Sat Jan 7 20:34:46 2017 (r430827) @@ -55,8 +55,34 @@ include/mysql/mysql/plugin_ftparser.h.pp include/mysql/mysql/plugin_group_replication.h include/mysql/mysql/plugin_keyring.h include/mysql/mysql/plugin_keyring.h.pp +include/mysql/mysql/plugin_query_rewrite.h include/mysql/mysql/plugin_trace.h include/mysql/mysql/plugin_validate_password.h +include/mysql/mysql/components/component_implementation.h +include/mysql/mysql/components/my_service.h +include/mysql/mysql/components/service.h +include/mysql/mysql/components/service_implementation.h +include/mysql/mysql/components/services/dynamic_loader.h +include/mysql/mysql/components/services/dynamic_loader_scheme_file.h +include/mysql/mysql/components/services/persistent_dynamic_loader.h +include/mysql/mysql/components/services/registry.h +include/mysql/mysql/psi/mysql_cond.h +include/mysql/mysql/psi/mysql_error.h +include/mysql/mysql/psi/mysql_mutex.h +include/mysql/mysql/psi/mysql_rwlock.h +include/mysql/mysql/psi/psi_cond.h +include/mysql/mysql/psi/psi_error.h +include/mysql/mysql/psi/psi_file.h +include/mysql/mysql/psi/psi_idle.h +include/mysql/mysql/psi/psi_mdl.h +include/mysql/mysql/psi/psi_mutex.h +include/mysql/mysql/psi/psi_rwlock.h +include/mysql/mysql/psi/psi_socket.h +include/mysql/mysql/psi/psi_stage.h +include/mysql/mysql/psi/psi_statement.h +include/mysql/mysql/psi/psi_table.h +include/mysql/mysql/psi/psi_thread.h +include/mysql/mysql/psi/psi_transaction.h include/mysql/mysql/psi/mysql_file.h include/mysql/mysql/psi/mysql_idle.h include/mysql/mysql/psi/mysql_mdl.h @@ -69,7 +95,6 @@ include/mysql/mysql/psi/mysql_statement. 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 @@ -98,7 +123,6 @@ 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 @@ -110,7 +134,6 @@ include/mysql/plugin_group_replication.h include/mysql/plugin_keyring.h include/mysql/plugin_validate_password.h include/mysql/sql_common.h -include/mysql/sql_state.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h @@ -120,11 +143,11 @@ include/mysql/thr_rwlock.h include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.20 +lib/mysql/libmysqlclient.so.21 lib/mysql/libmysqlservices.a lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.20 +lib/mysql/libmysqlclient_r.so.21 libdata/pkgconfig/mysqlclient.pc man/man1/comp_err.1.gz man/man1/mysql.1.gz Modified: head/databases/mysql80-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Sat Jan 7 15:51:41 2017 (r430810) +++ head/databases/mysql80-server/Makefile Sat Jan 7 20:34:46 2017 (r430827) @@ -1,22 +1,23 @@ # Created by: Mahdi Mokhtari # $FreeBSD$ -PORTNAME?= mysql -PORTVERSION= 5.7.17 -PORTREVISION?= 0 -CATEGORIES= databases ipv6 -MASTER_SITES= MYSQL/MySQL-5.7 -PKGNAMESUFFIX?= 57-server -DISTNAME= ${PORTNAME}-boost-${PORTVERSION} +PORTNAME?= mysql +PORTVERSION= 8.0.0 +DISTVERSIONSUFFIX?= -dmr +PORTREVISION?= 0 +CATEGORIES= databases ipv6 +MASTER_SITES= MYSQL/MySQL-8.0 +PKGNAMESUFFIX?= 80-server +DISTNAME= ${PORTNAME}-boost-${PORTVERSION}${DISTVERSIONSUFFIX} -MAINTAINER= mokhi64@gmail.com -COMMENT?= Multithreaded SQL database (server) +MAINTAINER= mokhi64@gmail.com +COMMENT?= Multithreaded SQL database (server) -LICENSE= GPLv2 +LICENSE= GPLv2 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} -SLAVEDIRS= databases/mysql57-client +SLAVEDIRS= databases/mysql80-client USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 shebangfix ssl @@ -70,14 +71,15 @@ SUB_LIST= MY_DBDIR=${MY_DBDIR} \ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ - MY_TMPDIR=${MY_TMPDIR} + MY_TMPDIR=${MY_TMPDIR} \ + MYSQL80_LIBVER=${MYSQL80_LIBVER} # MySQL-Server part .if !defined(CLIENT_ONLY) -USES+= mysql:57 +USES+= mysql:80 -CONFLICTS_INSTALL= mysql5[0-68-9]-server-* \ - mysql[0-46-9][0-9]-server-* \ +CONFLICTS_INSTALL= mysql8[1-9]-server-* \ + mysql[0-79][0-9]-server-* \ mariadb[0-9][0-9]-server-* \ percona[0-9][0-9]-server-* @@ -141,6 +143,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugi .include .if ${SSL_DEFAULT} == base +BROKEN_FreeBSD_9= FreeBSD 9.x requires SSL from ports CMAKE_ARGS+= -DWITH_SSL=system .else CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} @@ -156,7 +159,6 @@ post-patch: 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} Modified: head/databases/mysql80-server/distinfo ============================================================================== --- head/databases/mysql57-server/distinfo Sat Jan 7 15:51:41 2017 (r430810) +++ head/databases/mysql80-server/distinfo Sat Jan 7 20:34:46 2017 (r430827) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483356681 -SHA256 (mysql-boost-5.7.17.tar.gz) = b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903 -SIZE (mysql-boost-5.7.17.tar.gz) = 61480982 +TIMESTAMP = 1483372244 +SHA256 (mysql-boost-8.0.0-dmr.tar.gz) = e5b7b77e532c906dc30f12b821950426b8205a64b5a77c26681e2109a3b6a5fc +SIZE (mysql-boost-8.0.0-dmr.tar.gz) = 65567795 Modified: head/databases/mysql80-server/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/mysql57-server/files/patch-client_CMakeLists.txt Sat Jan 7 15:51:41 2017 (r430810) +++ head/databases/mysql80-server/files/patch-client_CMakeLists.txt Sat Jan 7 20:34:46 2017 (r430827) @@ -1,4 +1,4 @@ ---- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- client/CMakeLists.txt.orig 2016-08-25 12:32:09 UTC +++ client/CMakeLists.txt @@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil @@ -23,7 +23,7 @@ IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli +@@ -66,6 +66,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) @@ -31,20 +31,17 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) -@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc +@@ -78,7 +79,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) + MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +ENDIF() - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) - +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - ADD_COMPILE_FLAGS( - mysqlbinlog.cc -@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli + SET(MYSQLBINLOG_LIB_SOURCES + ${CMAKE_SOURCE_DIR}/strings/decimal.cc +@@ -112,13 +115,16 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) @@ -52,9 +49,6 @@ MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) -@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) - ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema) - ENDIF() +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) @@ -64,15 +58,3 @@ # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -123,11 +129,6 @@ ENDIF(WIN32) - - SET_TARGET_PROPERTIES ( - mysql_plugin -- mysqlcheck -- mysqldump -- mysqlimport -- mysqlshow -- mysqlslap - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) Added: head/databases/mysql80-server/files/patch-sql_histograms_histogram.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql80-server/files/patch-sql_histograms_histogram.h Sat Jan 7 20:34:46 2017 (r430827) @@ -0,0 +1,11 @@ +--- sql/histograms/histogram.h.orig 2017-01-05 16:18:44 UTC ++++ sql/histograms/histogram.h +@@ -111,7 +111,7 @@ public: + + // Typedefs. + template +-using value_map_allocator = Memroot_allocator >; ++using value_map_allocator = Memroot_allocator >; + + template + using value_map_type = std::map::histogram_to_json(Jso + + + template +-bool Singleton::create_json_bucket(const std::pair &bucket, ++bool Singleton::create_json_bucket(const std::pair &bucket, + Json_array *json_bucket) + { + // Value Added: head/databases/mysql80-server/files/patch-sql_histograms_singleton.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql80-server/files/patch-sql_histograms_singleton.h Sat Jan 7 20:34:46 2017 (r430827) @@ -0,0 +1,20 @@ +--- sql/histograms/singleton.h.orig 2017-01-05 16:21:18 UTC ++++ sql/histograms/singleton.h +@@ -89,7 +89,7 @@ private: + + /// The buckets for this histogram [key, cumulative frequency]. + std::map > > m_buckets; ++ Memroot_allocator > > m_buckets; + public: + /** + Singleton constructor. +@@ -162,7 +162,7 @@ private: + + @return true on error, false otherwise + */ +- static bool create_json_bucket(const std::pair &bucket, ++ static bool create_json_bucket(const std::pair &bucket, + Json_array *json_bucket); + }; + Added: head/databases/mysql80-server/files/patch-sql_json__dom.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql80-server/files/patch-sql_json__dom.h Sat Jan 7 20:34:46 2017 (r430827) @@ -0,0 +1,11 @@ +--- sql/json_dom.h.orig 2017-01-05 16:09:35 UTC ++++ sql/json_dom.h +@@ -337,7 +337,7 @@ struct Json_key_comparator + Json_object class. + */ + typedef std::map > > Json_object_map; ++ Malloc_allocator > > Json_object_map; + + /** + Represents a JSON container value of type "object" (ECMA), type Added: head/databases/mysql80-server/files/patch-storage_innobase_buf_buf0buf.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql80-server/files/patch-storage_innobase_buf_buf0buf.cc Sat Jan 7 20:34:46 2017 (r430827) @@ -0,0 +1,11 @@ +--- storage/innobase/buf/buf0buf.cc.orig 2016-03-28 18:06:12 UTC ++++ storage/innobase/buf/buf0buf.cc +@@ -338,7 +338,7 @@ typedef std::map< + const byte*, + buf_chunk_t*, + std::less, +- ut_allocator > > ++ ut_allocator > > + buf_pool_chunk_map_t; + + static buf_pool_chunk_map_t* buf_chunk_map_reg; Added: head/databases/mysql80-server/files/patch-storage_innobase_dict_dict0stats.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql80-server/files/patch-storage_innobase_dict_dict0stats.cc Sat Jan 7 20:34:46 2017 (r430827) @@ -0,0 +1,11 @@ +--- storage/innobase/dict/dict0stats.cc.orig 2016-03-28 18:06:12 UTC ++++ storage/innobase/dict/dict0stats.cc +@@ -139,7 +139,7 @@ then we would store 5,7,10,11,12 in the + typedef std::vector > boundaries_t; + + /** Allocator type used for index_map_t. */ +-typedef ut_allocator > ++typedef ut_allocator > + index_map_t_allocator; + + /** Auxiliary map used for sorting indexes by name in dict_stats_save(). */ Added: head/databases/mysql80-server/files/patch-storage_innobase_sync_sync0debug.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql80-server/files/patch-storage_innobase_sync_sync0debug.cc Sat Jan 7 20:34:46 2017 (r430827) @@ -0,0 +1,11 @@ +--- storage/innobase/sync/sync0debug.cc.orig 2016-03-28 18:06:12 UTC ++++ storage/innobase/sync/sync0debug.cc +@@ -1702,7 +1702,7 @@ private: + const void*, + File, + std::less, +- ut_allocator > > ++ ut_allocator > > + Files; + + typedef OSMutex Mutex; Added: head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0purge.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0purge.cc Sat Jan 7 20:34:46 2017 (r430827) @@ -0,0 +1,11 @@ +--- storage/innobase/trx/trx0purge.cc.orig 2017-01-05 13:57:29 UTC ++++ storage/innobase/trx/trx0purge.cc +@@ -1668,7 +1668,7 @@ trx_purge_attach_undo_recs( + using GroupBy = std::map< + table_id_t, purge_node_t::Recs*, + std::less, +- mem_heap_allocator>>; ++ mem_heap_allocator>>; + + GroupBy group_by{ + GroupBy::key_compare{}, Added: head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0trx.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0trx.cc Sat Jan 7 20:34:46 2017 (r430827) @@ -0,0 +1,11 @@ +--- storage/innobase/trx/trx0trx.cc.orig 2017-01-05 15:43:29 UTC ++++ storage/innobase/trx/trx0trx.cc +@@ -63,7 +63,7 @@ typedef std::set< + typedef std::map< + trx_t*, table_id_set, + std::less, +- ut_allocator > trx_table_map; ++ ut_allocator> > trx_table_map; + + /** Map of resurrected transactions to affected table_id */ + static trx_table_map resurrected_trx_tables; Modified: head/databases/mysql80-server/pkg-descr ============================================================================== --- head/databases/mysql57-server/pkg-descr Sat Jan 7 15:51:41 2017 (r430810) +++ head/databases/mysql80-server/pkg-descr Sat Jan 7 20:34:46 2017 (r430827) @@ -1,4 +1,15 @@ MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. +The new features in MySQL 8.0. In addition to Data Dictionnary and CTEs are: + Move to utf8(mb4) as MySQL's default character set + Language specific case insensitive collation for 21 languages (utf8) + Invisible index + Descending indexes + Improve usability of UUID and IPV6 manipulations + SQL roles - SET PERSIST for global variable values + Performance Schema, instrumenting data locks + Performance Schema, instrumenting error messages + Improved cost model with histograms + WWW: http://www.mysql.com/ Modified: head/databases/mysql80-server/pkg-message ============================================================================== --- head/databases/mysql57-server/pkg-message Sat Jan 7 15:51:41 2017 (r430810) +++ head/databases/mysql80-server/pkg-message Sat Jan 7 20:34:46 2017 (r430827) @@ -11,10 +11,6 @@ in /root/.mysql_secret ***************************************************************************** -The default location for my.cnf has changed from "/var/db/mysql/my.cnf" to -"/usr/local/etc/mysql/my.cnf". Existing my.cnf files must be merged manually -with the new default and moved to the new location. To continue using the -my.cnf file at the old location, set "mysql_optfile" in /etc/rc.conf to -point to the location of the existing my.cnf file. +WARNING: THIS IS STILL-IN-DEV PROJECT! USE WITH CAUTION ON PRODUCTION ENVS! ***************************************************************************** Modified: head/databases/mysql80-server/pkg-plist ============================================================================== --- head/databases/mysql57-server/pkg-plist Sat Jan 7 15:51:41 2017 (r430810) +++ head/databases/mysql80-server/pkg-plist Sat Jan 7 20:34:46 2017 (r430827) @@ -1,12 +1,10 @@ +bin/ibd2sdi bin/innochecksum -bin/lz4_decompress bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack -bin/mysql_install_db -bin/mysql_plugin bin/mysql_secure_installation bin/mysql_tzinfo_to_sql bin/mysql_upgrade @@ -19,14 +17,14 @@ bin/perror bin/replace bin/resolve_stack_dump bin/resolveip -bin/zlib_decompress lib/mysql/libmysqld.a lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.so -lib/mysql/plugin/connection_control.so +lib/mysql/plugin/component_example_component1.so +lib/mysql/plugin/component_example_component2.so +lib/mysql/plugin/component_example_component3.so lib/mysql/plugin/daemon_example.ini -lib/mysql/plugin/group_replication.so %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so lib/mysql/plugin/keyring_file.so lib/mysql/plugin/libdaemon_example.so @@ -76,8 +74,6 @@ man/man1/myisamchk.1.gz man/man1/myisamlog.1.gz man/man1/myisampack.1.gz man/man1/mysql.server.1.gz -man/man1/mysql_install_db.1.gz -man/man1/mysql_plugin.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz @@ -157,6 +153,7 @@ man/man8/mysqld.8.gz %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys %%DATADIR%%/uninstall_rewriter.sql +@dir lib/mysql/plugin/debug @sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample @dir(mysql,mysql,0750) %%ETCDIR%%/keyring @dir(mysql,mysql,0750) %%MY_SECDIR%%