Index: branches/2018Q3/databases/mysql80-client/Makefile
===================================================================
--- branches/2018Q3/databases/mysql80-client/Makefile	(revision 477158)
+++ branches/2018Q3/databases/mysql80-client/Makefile	(revision 477159)
@@ -1,42 +1,42 @@
 # Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)
 
 LICENSE+=	LGPL21
 
 BROKEN_powerpc64=	does not build: reports unsupported compiler
 BROKEN_sparc64=		does not build: reports unsupported compiler
 
 MASTERDIR=	${.CURDIR}/../mysql80-server
 
 PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
 CONFLICTS_INSTALL=	mysql8[1-9]-client-* \
 			mysql[0-79][0-9]-client-* \
 			mariadb[0-9][0-9]-client-* \
 			percona[0-9][0-9]-client-*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=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
 
 # issue 166367: adding symlinks for back-compatibility with ${lib}_r
 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.21 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.21
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2018Q3/databases/mysql80-client/files/patch-CMakeLists.txt
===================================================================
--- branches/2018Q3/databases/mysql80-client/files/patch-CMakeLists.txt	(revision 477158)
+++ branches/2018Q3/databases/mysql80-client/files/patch-CMakeLists.txt	(revision 477159)
@@ -1,40 +1,32 @@
 --- CMakeLists.txt.orig	2018-05-03 10:27:45 UTC
 +++ CMakeLists.txt
-@@ -835,14 +835,12 @@ ADD_SUBDIRECTORY(extra/regex)
+@@ -835,6 +835,7 @@ ADD_SUBDIRECTORY(extra/regex)
  ADD_SUBDIRECTORY(libmysql)
  ADD_SUBDIRECTORY(libbinlogevents)
  ADD_SUBDIRECTORY(libbinlogstandalone)
 +ADD_SUBDIRECTORY(support-files)
  
  IF(NOT WITHOUT_SERVER)
    SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
-   # Add storage engines and plugins.
-   CONFIGURE_PLUGINS()
--ELSE()
--  # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1
--  ADD_SUBDIRECTORY(storage/ndb)
- ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
 @@ -966,12 +964,10 @@ 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 README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
    INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
 @@ -990,6 +986,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "README.build" EXCLUDE
    )
  ENDIF()
 +ENDIF()
  
  IF(UNIX)
    EXECUTE_PROCESS(
Index: branches/2018Q3/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
===================================================================
--- branches/2018Q3/databases/mysql80-client/files/patch-scripts_CMakeLists.txt	(revision 477158)
+++ branches/2018Q3/databases/mysql80-client/files/patch-scripts_CMakeLists.txt	(revision 477159)
@@ -1,64 +1,64 @@
 --- scripts/CMakeLists.txt.orig	2016-03-28 18:06:12 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" )
 @@ -150,6 +153,7 @@ IF(UNIX)
    COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
  )
  ENDIF()
 +ENDIF()
  
  IF(NOT WITHOUT_SERVER)
    INSTALL(FILES
 @@ -347,6 +351,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} " ) 
+           SET(${var} "${${var}}-l${lib} " )
 +        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
++          SET(${var} "${${var}}-pthread " )
          ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
+           SET(${var} "${${var}}-l${lib} " )
          ENDIF()
 @@ -430,19 +436,7 @@ ELSE()
    # On Unix, most of the files end up in the bin directory
    SET(mysql_config_COMPONENT COMPONENT Development)
  
 -  IF(WITH_SYSTEMD)
 -    SET(BIN_SCRIPTS
 -      mysql_config
 -      mysqldumpslow
 -      )
 -  ELSE()
 -    SET(BIN_SCRIPTS
 -      mysql_config
 -      mysqldumpslow
 -      mysqld_multi
 -      mysqld_safe
 -      )
 -  ENDIF()
 +  SET(BIN_SCRIPTS mysql_config)
  
    SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
    STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
Index: branches/2018Q3/databases/mysql80-client/files/patch-sql-common_client.cc
===================================================================
--- branches/2018Q3/databases/mysql80-client/files/patch-sql-common_client.cc	(revision 477158)
+++ branches/2018Q3/databases/mysql80-client/files/patch-sql-common_client.cc	(revision 477159)
@@ -1,27 +1,11 @@
 --- sql-common/client.cc.orig	2018-04-08 06:44:49 UTC
 +++ sql-common/client.cc
-@@ -2649,11 +2649,11 @@ static int ssl_verify_server_cert(Vio *v
-     goto error;
-   }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--  cn = (char *)ASN1_STRING_data(cn_asn1);
--#else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   cn = (char *)ASN1_STRING_get0_data(cn_asn1);
--#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+#else  /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-+  cn = (char *)ASN1_STRING_data(cn_asn1);
-+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
- 
-   // There should not be any NULL embedded in the CN
-   if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) {
 @@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql, 
  #endif
        break;
      case MYSQL_OPT_SSL_FIPS_MODE: {
 -#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL)
 +#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
        char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
        ENSURE_EXTENSIONS_PRESENT(&mysql->options);
        mysql->options.extension->ssl_fips_mode = *(uint *)arg;
Index: branches/2018Q3/databases/mysql80-client/files/patch-utilities_CMakeLists.txt
===================================================================
--- branches/2018Q3/databases/mysql80-client/files/patch-utilities_CMakeLists.txt	(revision 477158)
+++ branches/2018Q3/databases/mysql80-client/files/patch-utilities_CMakeLists.txt	(revision 477159)
@@ -1,31 +1,31 @@
 --- utilities/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ utilities/CMakeLists.txt
 @@ -45,6 +45,7 @@ ENDIF()
  
  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h
                     ${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/english/errmsg.sys
 +                   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/share/
                     COMMAND comp_err
                      --charset=${PROJECT_SOURCE_DIR}/share/charsets
                      --out-dir=${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/
 @@ -73,4 +74,5 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
  ENDIF()
  
 +IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc)
  TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
 @@ -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
Index: branches/2018Q3/databases/mysql80-server/Makefile
===================================================================
--- branches/2018Q3/databases/mysql80-server/Makefile	(revision 477158)
+++ branches/2018Q3/databases/mysql80-server/Makefile	(revision 477159)
@@ -1,174 +1,174 @@
 # Created by: Mahdi Mokhtari <mokhi64@gmail.com>
 # $FreeBSD$
 
 PORTNAME?=		mysql
-PORTVERSION=		8.0.11
-PORTREVISION?=		1
+PORTVERSION=		8.0.12
+PORTREVISION?=		0
 CATEGORIES=		databases ipv6
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
 DISTNAME=		${PORTNAME}-boost-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=		mmokhi@FreeBSD.org
 COMMENT?=		Multithreaded SQL database (server)
 
 LICENSE=		GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 SLAVEDIRS=	databases/mysql80-client
-USES=		bison:build cmake:outsource,noninja compiler:c11 compiler:c++11-lib \
-		cpe libedit localbase perl5 shebangfix ssl
+USES=		bison:build cmake:outsource,noninja compiler:c++14-lang \
+		compiler:c++14-lib cpe libedit localbase perl5 shebangfix ssl
 
 USE_PERL5=	run
 
 MY_DBDIR=	/var/db/mysql
 MY_SECDIR=	/var/db/mysql_secure
 MY_TMPDIR=	/var/db/mysql_tmpdir
 
 LIB_DEPENDS+=	libevent.so:devel/libevent \
 		libicutu.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libre2.so:devel/re2 \
 		libprotobuf.so:devel/protobuf
 
 CMAKE_BUILD_TYPE=	Release
 CFLAGS+=		-fPIC
 
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
 		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
 		-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_SUPPORTFILESDIR="share/mysql" \
 		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
 		-DWITH_BOOST="${WRKSRC}/boost" \
 		-DWITH_EDITLINE=system \
 		-DWITH_LIBEVENT=system \
 		-DWITH_LZ4=system \
 		-DWITH_ZLIB=system \
 		-DWITH_ICU=system \
 		-DWITH_RE2=system \
 		-DWITH_PROTOBUF=system \
 		-DINSTALL_MYSQLTESTDIR=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
 
 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} \
 		MYSQL80_LIBVER=${MYSQL80_LIBVER}
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:80
 
 CONFLICTS_INSTALL=	mysql8[1-9]-server-* \
 			mysql[0-79][0-9]-server-* \
 			mysqlwsrep* \
 			mariadb[0-9][0-9]-server-* \
 			percona[0-9][0-9]-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 \
 		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
 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"
 FEDERATED_SUB_LIST+=		FEDER="--federated"
 FEDERATED_SUB_LIST_OFF+=	FEDER=""
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
 SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
 .else
 SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
 CMAKE_ARGS+=		-DWITH_SSL=system
 .else
 CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
 .endif
 
 post-extract:
 	@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
 
 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.post.mk>
Index: branches/2018Q3/databases/mysql80-server/distinfo
===================================================================
--- branches/2018Q3/databases/mysql80-server/distinfo	(revision 477158)
+++ branches/2018Q3/databases/mysql80-server/distinfo	(revision 477159)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524414416
-SHA256 (mysql-boost-8.0.11.tar.gz) = f40711a9bd91ab2ccea331484a6d281f806b0fdecf78f4c9e9d8a4c91208f309
-SIZE (mysql-boost-8.0.11.tar.gz) = 77647598
+TIMESTAMP = 1534018331
+SHA256 (mysql-boost-8.0.12.tar.gz) = 99abae6660b53a462cff7c9fefb56d17f52823e9a964831aee1ae5633d9a2982
+SIZE (mysql-boost-8.0.12.tar.gz) = 83152486
Index: branches/2018Q3/databases/mysql80-server/files/patch-client_CMakeLists.txt
===================================================================
--- branches/2018Q3/databases/mysql80-server/files/patch-client_CMakeLists.txt	(revision 477158)
+++ branches/2018Q3/databases/mysql80-server/files/patch-client_CMakeLists.txt	(revision 477159)
@@ -1,60 +1,60 @@
 --- client/CMakeLists.txt.orig	2016-08-25 12:32:09 UTC
 +++ client/CMakeLists.txt
 @@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
  
  ## 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)
 @@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
+ 
  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
  
- ADD_DEFINITIONS(${SSL_DEFINES})
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.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
 @@ -66,6 +66,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC
  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)
  
 @@ -78,7 +79,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
  
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
 +ENDIF()
  
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  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)
 +ENDIF()
  
  MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
  TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
  
 +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)
Index: branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
===================================================================
--- branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt	(revision 477158)
+++ branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt	(revision 477159)
@@ -1,17 +1,18 @@
 --- plugin/x/CMakeLists.txt.orig	2018-04-08 06:44:49 UTC
 +++ plugin/x/CMakeLists.txt
-@@ -82,11 +82,14 @@ INCLUDE_DIRECTORIES(
+@@ -82,12 +82,15 @@ INCLUDE_DIRECTORIES(
+   ${MYSQLX_GENERATE_DIR}
    ${MYSQLX_PROTOCOL_INCLUDE_DIR}
-   ${MYSQLX_PROJECT_DIR}/client/
-   ${CMAKE_SOURCE_DIR}/extra/regex
+   ${MYSQLX_CLIENT_INCLUDE_DIR}
 +  ${BOOST_INCLUDE_DIR}
  )
  
  INCLUDE_DIRECTORIES(SYSTEM
    ${PROTOBUF_INCLUDE_DIRS}
    ${LIBEVENT_INCLUDE_DIR}
+   ${ICU_INCLUDE_DIRS}
 +  ${SSL_INCLUDE_DIRS}
 +  ${ZLIB_INCLUDE_DIR}
  )
  
  SET(MYSQLX_PROTBUF_AND_PROTOCOL_LIB
Index: branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_src_xpl__regex.cc
===================================================================
--- branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_src_xpl__regex.cc	(nonexistent)
+++ branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_src_xpl__regex.cc	(revision 477159)
@@ -0,0 +1,11 @@
+--- plugin/x/src/xpl_regex.cc.orig	2018-08-11 18:13:47 UTC
++++ plugin/x/src/xpl_regex.cc
+@@ -53,7 +53,7 @@ bool xpl::Regex::match(const char *value
+    * and parse the text patter each time that xpl::Regex::match
+    * is called.
+    */
+-  UnicodeString value_as_utf8{icu::UnicodeString::fromUTF8(value)};
++  icu::UnicodeString value_as_utf8{icu::UnicodeString::fromUTF8(value)};
+   std::unique_ptr<icu::RegexMatcher> regexp{
+       m_pattern->matcher(value_as_utf8, match_status)};
+ 

Property changes on: branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_src_xpl__regex.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q3/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
===================================================================
--- branches/2018Q3/databases/mysql80-server/files/patch-scripts_CMakeLists.txt	(revision 477158)
+++ branches/2018Q3/databases/mysql80-server/files/patch-scripts_CMakeLists.txt	(revision 477159)
@@ -1,36 +1,36 @@
 --- scripts/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ scripts/CMakeLists.txt
 @@ -347,6 +347,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} " ) 
+           SET(${var} "${${var}}-l${lib} " )
 +        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
++          SET(${var} "${${var}}-pthread " )
          ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
+           SET(${var} "${${var}}-l${lib} " )
          ENDIF()
 @@ -430,14 +432,13 @@ ELSE()
    # On Unix, most of the files end up in the bin directory
    SET(mysql_config_COMPONENT COMPONENT Development)
  
 +
    IF(WITH_SYSTEMD)
      SET(BIN_SCRIPTS
 -      mysql_config
        mysqldumpslow
        )
    ELSE()
      SET(BIN_SCRIPTS
 -      mysql_config
        mysqldumpslow
        mysqld_multi
        mysqld_safe
 @@ -471,7 +472,7 @@ ELSE()
    FOREACH(file ${BIN_SCRIPTS})
      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
 -        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
 +        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
      ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
           ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
Index: branches/2018Q3/databases/mysql80-server/files/patch-sql-common_client.cc
===================================================================
--- branches/2018Q3/databases/mysql80-server/files/patch-sql-common_client.cc	(revision 477158)
+++ branches/2018Q3/databases/mysql80-server/files/patch-sql-common_client.cc	(revision 477159)
@@ -1,27 +1,11 @@
 --- sql-common/client.cc.orig	2018-04-08 06:44:49 UTC
 +++ sql-common/client.cc
-@@ -2649,11 +2649,11 @@ static int ssl_verify_server_cert(Vio *v
-     goto error;
-   }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--  cn = (char *)ASN1_STRING_data(cn_asn1);
--#else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   cn = (char *)ASN1_STRING_get0_data(cn_asn1);
--#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+#else  /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-+  cn = (char *)ASN1_STRING_data(cn_asn1);
-+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
- 
-   // There should not be any NULL embedded in the CN
-   if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) {
 @@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql, 
  #endif
        break;
      case MYSQL_OPT_SSL_FIPS_MODE: {
 -#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL)
 +#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
        char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
        ENSURE_EXTENSIONS_PRESENT(&mysql->options);
        mysql->options.extension->ssl_fips_mode = *(uint *)arg;
Index: branches/2018Q3/databases/mysql80-server/pkg-plist
===================================================================
--- branches/2018Q3/databases/mysql80-server/pkg-plist	(revision 477158)
+++ branches/2018Q3/databases/mysql80-server/pkg-plist	(revision 477159)
@@ -1,195 +1,196 @@
 bin/ibd2sdi
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
 bin/mysql_secure_installation
 bin/mysql_tzinfo_to_sql
 bin/mysql_upgrade
 bin/mysqld_multi
 bin/mysqld_safe
 bin/mysqldumpslow
 bin/mysqltest
 bin/mysqlxtest
 bin/perror
 bin/resolve_stack_dump
 bin/resolveip
 bin/zlib_decompress
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_test_plugin.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/component_log_filter_dragnet.so
 lib/mysql/plugin/component_log_sink_json.so
 lib/mysql/plugin/component_log_sink_syseventlog.so
 lib/mysql/plugin/component_log_sink_test.so
 lib/mysql/plugin/component_mysqlx_global_reset.so
 lib/mysql/plugin/component_pfs_example.so
 lib/mysql/plugin/component_pfs_example_component_population.so
 lib/mysql/plugin/component_test_backup_lock_service.so
 lib/mysql/plugin/component_test_pfs_notification.so
 lib/mysql/plugin/component_test_pfs_resource_group.so
 lib/mysql/plugin/component_test_status_var_service.so
 lib/mysql/plugin/component_test_status_var_service_int.so
 lib/mysql/plugin/component_test_status_var_service_reg_only.so
 lib/mysql/plugin/component_test_status_var_service_str.so
 lib/mysql/plugin/component_test_status_var_service_unreg_only.so
 lib/mysql/plugin/component_test_string_service.so
 lib/mysql/plugin/component_test_string_service_charset.so
 lib/mysql/plugin/component_test_string_service_long.so
 lib/mysql/plugin/component_test_sys_var_service.so
 lib/mysql/plugin/component_test_sys_var_service_int.so
 lib/mysql/plugin/component_test_sys_var_service_same.so
 lib/mysql/plugin/component_test_sys_var_service_str.so
 lib/mysql/plugin/component_test_system_variable_source.so
 lib/mysql/plugin/component_test_udf_registration.so
 lib/mysql/plugin/component_udf_reg_3_func.so
 lib/mysql/plugin/component_udf_reg_avg_func.so
 lib/mysql/plugin/component_udf_reg_int_func.so
 lib/mysql/plugin/component_udf_reg_int_same_func.so
 lib/mysql/plugin/component_udf_reg_only_3_func.so
 lib/mysql/plugin/component_udf_reg_real_func.so
 lib/mysql/plugin/component_udf_unreg_3_func.so
 lib/mysql/plugin/component_udf_unreg_int_func.so
 lib/mysql/plugin/component_udf_unreg_real_func.so
 lib/mysql/plugin/component_validate_password.so
 lib/mysql/plugin/connection_control.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
 lib/mysql/plugin/libtest_framework.so
 lib/mysql/plugin/libtest_services.so
 lib/mysql/plugin/libtest_services_threaded.so
 lib/mysql/plugin/libtest_session_attach.so
 lib/mysql/plugin/libtest_session_detach.so
 lib/mysql/plugin/libtest_session_in_thd.so
 lib/mysql/plugin/libtest_session_info.so
 lib/mysql/plugin/libtest_sql_2_sessions.so
 lib/mysql/plugin/libtest_sql_all_col_types.so
 lib/mysql/plugin/libtest_sql_cmds_1.so
 lib/mysql/plugin/libtest_sql_commit.so
 lib/mysql/plugin/libtest_sql_complex.so
 lib/mysql/plugin/libtest_sql_errors.so
 lib/mysql/plugin/libtest_sql_lock.so
 lib/mysql/plugin/libtest_sql_processlist.so
 lib/mysql/plugin/libtest_sql_replication.so
 lib/mysql/plugin/libtest_sql_shutdown.so
 lib/mysql/plugin/libtest_sql_sqlmode.so
 lib/mysql/plugin/libtest_sql_stmt.so
 lib/mysql/plugin/libtest_sql_stored_procedures_functions.so
 lib/mysql/plugin/libtest_sql_views_triggers.so
 lib/mysql/plugin/libtest_x_sessions_deinit.so
 lib/mysql/plugin/libtest_x_sessions_init.so
 lib/mysql/plugin/locking_service.so
 lib/mysql/plugin/mypluglib.so
 lib/mysql/plugin/mysql_no_login.so
 lib/mysql/plugin/pfs_example_plugin_employee.so
 lib/mysql/plugin/qa_auth_client.so
 lib/mysql/plugin/qa_auth_interface.so
 lib/mysql/plugin/qa_auth_server.so
 lib/mysql/plugin/replication_observers_example_plugin.so
 lib/mysql/plugin/rewrite_example.so
 lib/mysql/plugin/rewriter.so
 lib/mysql/plugin/semisync_master.so
 lib/mysql/plugin/semisync_slave.so
 lib/mysql/plugin/test_security_context.so
 lib/mysql/plugin/test_services_plugin_registry.so
 lib/mysql/plugin/udf_example.so
 lib/mysql/plugin/keyring_udf.so
 lib/mysql/plugin/test_udf_services.so
 lib/mysql/plugin/validate_password.so
 lib/mysql/plugin/version_token.so
 libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc
 libexec/mysqld
 man/man1/my_print_defaults.1.gz
 man/man1/myisam_ftdump.1.gz
 man/man1/myisamchk.1.gz
 man/man1/myisamlog.1.gz
 man/man1/myisampack.1.gz
 man/man1/mysql.server.1.gz
 man/man1/mysql_secure_installation.1.gz
 man/man1/mysql_tzinfo_to_sql.1.gz
 man/man1/mysql_upgrade.1.gz
 man/man1/mysqld_multi.1.gz
 man/man1/mysqld_safe.1.gz
 man/man1/mysqldumpslow.1.gz
 man/man1/mysqlman.1.gz
 man/man1/perror.1.gz
 man/man1/resolve_stack_dump.1.gz
 man/man1/resolveip.1.gz
 man/man8/mysqld.8.gz
 %%DATADIR%%/bulgarian/errmsg.sys
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README
 %%DATADIR%%/charsets/armscii8.xml
 %%DATADIR%%/charsets/ascii.xml
 %%DATADIR%%/charsets/cp1250.xml
 %%DATADIR%%/charsets/cp1251.xml
 %%DATADIR%%/charsets/cp1256.xml
 %%DATADIR%%/charsets/cp1257.xml
 %%DATADIR%%/charsets/cp850.xml
 %%DATADIR%%/charsets/cp852.xml
 %%DATADIR%%/charsets/cp866.xml
 %%DATADIR%%/charsets/dec8.xml
 %%DATADIR%%/charsets/geostd8.xml
 %%DATADIR%%/charsets/greek.xml
 %%DATADIR%%/charsets/hebrew.xml
 %%DATADIR%%/charsets/hp8.xml
 %%DATADIR%%/charsets/keybcs2.xml
 %%DATADIR%%/charsets/koi8r.xml
 %%DATADIR%%/charsets/koi8u.xml
 %%DATADIR%%/charsets/latin1.xml
 %%DATADIR%%/charsets/latin2.xml
 %%DATADIR%%/charsets/latin5.xml
 %%DATADIR%%/charsets/latin7.xml
 %%DATADIR%%/charsets/macce.xml
 %%DATADIR%%/charsets/macroman.xml
 %%DATADIR%%/charsets/swe7.xml
 %%DATADIR%%/czech/errmsg.sys
 %%DATADIR%%/danish/errmsg.sys
 %%DATADIR%%/dictionary.txt
 %%DATADIR%%/dutch/errmsg.sys
 %%DATADIR%%/english/errmsg.sys
 %%DATADIR%%/errmsg-utf8.txt
 %%DATADIR%%/estonian/errmsg.sys
 %%DATADIR%%/fill_help_tables.sql
 %%DATADIR%%/french/errmsg.sys
 %%DATADIR%%/german/errmsg.sys
 %%DATADIR%%/greek/errmsg.sys
 %%DATADIR%%/hungarian/errmsg.sys
 %%DATADIR%%/innodb_memcached_config.sql
 %%DATADIR%%/install_rewriter.sql
 %%DATADIR%%/italian/errmsg.sys
 %%DATADIR%%/japanese/errmsg.sys
 %%DATADIR%%/korean/errmsg.sys
 %%DATADIR%%/magic
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
 %%DATADIR%%/mysql_sys_schema.sql
 %%DATADIR%%/mysql_system_tables.sql
 %%DATADIR%%/mysql_system_tables_data.sql
+%%DATADIR%%/mysql_system_users.sql
 %%DATADIR%%/mysql_test_data_timezone.sql
 %%DATADIR%%/mysqld_multi.server
 %%DATADIR%%/norwegian-ny/errmsg.sys
 %%DATADIR%%/norwegian/errmsg.sys
 %%DATADIR%%/polish/errmsg.sys
 %%DATADIR%%/portuguese/errmsg.sys
 %%DATADIR%%/romanian/errmsg.sys
 %%DATADIR%%/russian/errmsg.sys
 %%DATADIR%%/serbian/errmsg.sys
 %%DATADIR%%/slovak/errmsg.sys
 %%DATADIR%%/spanish/errmsg.sys
 %%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%%
 @dir(mysql,mysql,0750) %%MY_TMPDIR%%
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 477158)
+++ branches/2018Q3	(revision 477159)

Property changes on: branches/2018Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r476016,476944,477036,477063,477105