Index: head/databases/mysql80-client/Makefile =================================================================== --- head/databases/mysql80-client/Makefile (revision 512333) +++ head/databases/mysql80-client/Makefile (revision 512334) @@ -1,39 +1,39 @@ # Created by: "Mahdi Mokhtari " # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 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: head/databases/mysql80-client/files/patch-client_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-client_CMakeLists.txt (revision 512333) +++ head/databases/mysql80-client/files/patch-client_CMakeLists.txt (revision 512334) @@ -1,38 +1,39 @@ --- client/CMakeLists.txt.orig 2019-04-13 13:46:31.000000000 +0200 +++ client/CMakeLists.txt 2019-04-30 00:27:10.627236000 +0200 @@ -35,10 +35,12 @@ TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +IF(FALSE) IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc) TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base) ENDIF() +ENDIF() SET(MYSQLTEST_SRC mysqltest/error_names.cc -@@ -48,9 +50,11 @@ +@@ -49,10 +51,12 @@ mysqltest/utils.cc ) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc ${MYSQLTEST_SRC} COMPONENT Test) + SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) TARGET_LINK_LIBRARIES(mysqltest mysqlclient) ADD_DEPENDENCIES(mysqltest GenError GenClientError) +ENDIF() - ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) + ADD_LIBRARY(mysqlcheck_core STATIC check/mysqlcheck_core.cc) TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) @@ -108,8 +112,10 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) +ENDIF() 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) Index: head/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake =================================================================== --- head/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake (revision 512333) +++ head/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake (revision 512334) @@ -1,32 +1,25 @@ ---- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC +--- cmake/os/FreeBSD.cmake.orig 2019-06-25 10:23:30 UTC +++ cmake/os/FreeBSD.cmake -@@ -30,12 +30,26 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) - IF(NOT HAVE_SUPPORTED_CLANG_VERSION) - MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") +@@ -45,8 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) + MESSAGE(FATAL_ERROR + "GCC 5.3 or newer is required (-dumpversion says ${GCC_VERSION})") ENDIF() - ELSE() - MESSAGE(FATAL_ERROR "Unsupported compiler!") + CHECK_C_SOURCE_RUNS(" + int main() + { + return (__clang_major__ >= 4); + }" I386_ATOMIC_BUILTINS) + IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS)) + SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") + ENDIF() + ELSEIF(CMAKE_COMPILER_IS_GNUCC) + EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion + OUTPUT_VARIABLE GCC_VERSION) + IF(GCC_VERSION VERSION_LESS 4.4) + MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") + ENDIF() ENDIF() ENDIF() - - # Should not be needed any more, but kept for easy resurrection if needed - # #Legacy option, maybe not needed anymore , taken as is from autotools build - # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000) -- -+# For GCC maybe it's also good idea to use -+# ADD_DEFINITIONS(-D_GNU_SOURCE) -+ + Index: head/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt (revision 512333) +++ head/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt (revision 512334) @@ -1,23 +1,23 @@ --- libmysql/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +++ libmysql/CMakeLists.txt @@ -181,6 +181,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C) ) ENDIF() +INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + ADD_COMPILE_FLAGS(${CLIENT_SOURCES} COMPILE_FLAGS "-fPIC") +ENDIF() + # # Include protocol tracing infrastructure and the test # trace plugin if enabled by build options. @@ -254,7 +258,7 @@ IF(NOT DISABLE_SHARED) COMPONENT SharedLibraries) IF(UNIX) # libtool compatability -- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -+ IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly" OR APPLE) +- IF(FREEBSD OR APPLE) ++ IF(FREEBSD OR APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly") SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") ELSE() SET(OS_SHARED_LIB_VERSION Index: head/databases/mysql80-client/files/patch-man_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-man_CMakeLists.txt (revision 512333) +++ head/databases/mysql80-client/files/patch-man_CMakeLists.txt (revision 512334) @@ -1,12 +1,13 @@ ---- man/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC +--- man/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC +++ man/CMakeLists.txt -@@ -22,9 +22,6 @@ +@@ -22,10 +22,6 @@ # Copy man pages FILE(GLOB MAN1 *.1) -FILE(GLOB MAN1_NDB ndb*.1) +-FILE(GLOB MAN1_ROUTER mysqlrouter*.1) -FILE(GLOB MAN8 *.8) -FILE(GLOB MAN8_NDB ndb*.8) IF(MAN1_NDB AND NOT WITH_NDBCLUSTER) LIST(REMOVE_ITEM MAN1 ${MAN1_NDB}) ENDIF() Index: head/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc =================================================================== --- head/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc (revision 512333) +++ head/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc (revision 512334) @@ -1,60 +1,60 @@ ---- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC -+++ mysys_ssl/my_default.cc +--- mysys/my_default.cc.orig 2016-08-25 11:52:06 UTC ++++ mysys/my_default.cc @@ -114,7 +114,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; @@ -914,6 +914,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++; /* Ignore comment and empty lines */ @@ -1252,7 +1260,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); } } } @@ -1411,13 +1420,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 @@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f MY_STAT stat_info; - if (!my_stat(file_name, &stat_info, MYF(0))) return 1; + if (!my_stat(file_name, &stat_info, MYF(0))) return 0; /* Ignore .mylogin.cnf file if not exclusively readable/writable by current user. Index: head/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc =================================================================== --- head/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc (revision 512333) +++ head/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc (revision 512334) @@ -1,11 +1,11 @@ ---- mysys_ssl/my_md5.cc.orig 2018-04-08 06:44:49 UTC -+++ mysys_ssl/my_md5.cc +--- mysys/my_md5.cc.orig 2018-04-08 06:44:49 UTC ++++ mysys/my_md5.cc @@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *d int compute_md5_hash(char *digest, const char *buf, int len) { int retval = 0; int fips_mode = 0; -#if !defined(HAVE_WOLFSSL) +#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) fips_mode = FIPS_mode(); #endif /* HAVE_WOLFSSL */ /* If fips mode is ON/STRICT restricted method calls will result into abort, Index: head/databases/mysql80-client/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-support-files_CMakeLists.txt (revision 512333) +++ head/databases/mysql80-client/files/patch-support-files_CMakeLists.txt (revision 512334) @@ -1,23 +1,27 @@ --- support-files/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +++ support-files/CMakeLists.txt -@@ -46,6 +46,7 @@ IF(UNIX) - ELSE() - SET (PIDOF "pgrep -d' ' -f") - ENDIF() -+IF (FALSE) - SET(prefix ${CMAKE_INSTALL_PREFIX}) - FOREACH(script mysqld_multi.server mysql-log-rotate) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh -@@ -63,9 +64,12 @@ - DESTINATION ${inst_location} COMPONENT ${comp} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - ENDFOREACH() +@@ -29,9 +29,11 @@ + + SET(localstatedir "${MYSQL_DATADIR}") + ++IF(FALSE) + SET(prefix "${CMAKE_INSTALL_PREFIX}") + SET(bindir ${prefix}/${INSTALL_BINDIR}) + SET(sbindir ${prefix}/${INSTALL_SBINDIR}) +ENDIF() -+ENDIF() - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) - -+IF (FALSE) - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) - SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) + IF(LINUX) + SET (PIDOF "pidof") +@@ -39,6 +41,7 @@ + SET (PIDOF "pgrep -d' ' -f") + ENDIF() + ++IF(FALSE) + FOREACH(script + mysql.server + mysqld_multi.server +@@ -54,3 +57,4 @@ + GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) + ENDFOREACH() ++ENDIF() Index: head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt (revision 512333) +++ head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt (revision 512334) @@ -1,26 +1,24 @@ --- utilities/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC +++ utilities/CMakeLists.txt @@ -59,6 +59,7 @@ FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR 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}/ @@ -92,6 +93,7 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_ ADD_DEPENDENCIES(comp_err copy_openssl_dlls) ENDIF() +IF(FALSE) MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc) TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -@@ -169,6 +171,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) +@@ -168,4 +170,5 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) + mysys innodb_zipdecompress ${LZ4_LIBRARY}) ADD_DEPENDENCIES(ibd2sdi GenError) - 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 + ENDIF() Index: head/databases/mysql80-server/Makefile =================================================================== --- head/databases/mysql80-server/Makefile (revision 512333) +++ head/databases/mysql80-server/Makefile (revision 512334) @@ -1,175 +1,180 @@ # Created by: Mahdi Mokhtari # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 8.0.16 -PORTREVISION?= 4 +PORTVERSION= 8.0.17 +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:noninja compiler:c++14-lang cpe \ - libedit localbase perl5 shebangfix ssl + libedit localbase perl5 pkgconfig 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 + libprotobuf.so:devel/protobuf \ + libunwind.so:devel/libunwind +BUILD_DEPENDS= liblz4>0:archivers/liblz4 \ + libunwind>0:devel/libunwind + 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_PATH}" \ -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_SYSTEM_LIBS=1 \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ - -DWITH_ZLIB=system \ -DWITH_ICU=system \ -DWITH_RE2=system \ -DWITH_PROTOBUF=system \ -DBUILD_BUNDLED_ZLIB=0 \ + -DBUILD_BUNDLED_LZ4=0 \ -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 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include .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 Index: head/databases/mysql80-server/distinfo =================================================================== --- head/databases/mysql80-server/distinfo (revision 512333) +++ head/databases/mysql80-server/distinfo (revision 512334) @@ -1,3 +1,3 @@ -TIMESTAMP = 1556566256 -SHA256 (mysql-boost-8.0.16.tar.gz) = 7c936aa7bc9f4c462b24bade2e9abe1b3a6869ea19c46e78ec0a9b2a87a3d17f -SIZE (mysql-boost-8.0.16.tar.gz) = 145939027 +TIMESTAMP = 1565048626 +SHA256 (mysql-boost-8.0.17.tar.gz) = d44231316ce30a1d1189125ceed86d3388409778e17d0e3b9a060f532463e29a +SIZE (mysql-boost-8.0.17.tar.gz) = 189322239 Index: head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake =================================================================== --- head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake (revision 512333) +++ head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake (nonexistent) @@ -1,31 +0,0 @@ ---- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC -+++ cmake/os/FreeBSD.cmake -@@ -30,6 +30,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) - IF(NOT HAVE_SUPPORTED_CLANG_VERSION) - MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") - ENDIF() -+ CHECK_C_SOURCE_RUNS(" -+ int main() -+ { -+ return (__clang_major__ >= 4); -+ }" I386_ATOMIC_BUILTINS) -+ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS)) -+ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") -+ ENDIF() -+ ELSEIF(CMAKE_COMPILER_IS_GNUCC) -+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion -+ OUTPUT_VARIABLE GCC_VERSION) -+ IF(GCC_VERSION VERSION_LESS 4.4) -+ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") -+ ENDIF() - ELSE() - MESSAGE(FATAL_ERROR "Unsupported compiler!") - ENDIF() -@@ -38,4 +52,6 @@ ENDIF() - # Should not be needed any more, but kept for easy resurrection if needed - # #Legacy option, maybe not needed anymore , taken as is from autotools build - # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000) -- -+# For GCC maybe it's also good idea to use -+# ADD_DEFINITIONS(-D_GNU_SOURCE) -+ Property changes on: head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mysql80-server/files/patch-client_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-client_CMakeLists.txt (revision 512333) +++ head/databases/mysql80-server/files/patch-client_CMakeLists.txt (revision 512334) @@ -1,53 +1,53 @@ --- client/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC +++ client/CMakeLists.txt @@ -26,14 +26,14 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) -## Subdirectory for mysqlpump code. -ADD_SUBDIRECTORY(dump) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc ${CMAKE_SOURCE_DIR}/sql/net_ns.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 upgrade/program.cc) @@ -56,6 +56,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) @@ -68,7 +69,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 @@ -107,12 +110,15 @@ 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) + TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys) +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) Index: head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt (revision 512333) +++ head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt (revision 512334) @@ -1,31 +1,31 @@ --- libmysql/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC +++ libmysql/CMakeLists.txt @@ -239,7 +239,7 @@ MESSAGE(STATUS "Creating LDAP authentica ADD_SUBDIRECTORY(authentication_ldap) # Merge several convenience libraries into one big mysqlclient -MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) +MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK}) # Visual Studio users need debug static library for debug projects @@ -280,9 +280,10 @@ IF(NOT DISABLE_SHARED) # and link them together into shared library. MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} - EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ${CLIENT_API_NONBLOCKING_FUNCTIONS} - COMPONENT SharedLibraries) + COMPONENT SharedLibraries SKIP_INSTALL) TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK}) +IF(FALSE) IF(WIN32) # So that libmysql_api_test below can find the .dll ADD_CUSTOM_COMMAND(TARGET libmysql POST_BUILD @@ -338,6 +339,7 @@ ENDIF() # to initialize api_calls[] array in api_test.c # SET(CLIENT_API_FUNCTION_LIST "") + ENDIF() FOREACH(api ${CLIENT_API_FUNCTIONS}) SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},") ENDFOREACH() Index: head/databases/mysql80-server/files/patch-libservices_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-libservices_CMakeLists.txt (revision 512333) +++ head/databases/mysql80-server/files/patch-libservices_CMakeLists.txt (revision 512334) @@ -1,9 +1,13 @@ ---- libservices/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- libservices/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC +++ libservices/CMakeLists.txt -@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES - mysql_keyring_service.c) +@@ -45,7 +45,9 @@ SET(MYSQLSERVICES_SOURCES + plugin_registry_service.c) - ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) + ADD_LIBRARY(mysqlservices STATIC ${MYSQLSERVICES_SOURCES}) +IF(FALSE) - INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) + IF(INSTALL_STATIC_LIBRARIES) + INSTALL(TARGETS mysqlservices + DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) +ENDIF() + ENDIF() + Index: head/databases/mysql80-server/files/patch-man_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-man_CMakeLists.txt (revision 512333) +++ head/databases/mysql80-server/files/patch-man_CMakeLists.txt (revision 512334) @@ -1,10 +1,14 @@ ---- man/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC +--- man/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC +++ man/CMakeLists.txt -@@ -22,7 +22,6 @@ +@@ -21,9 +21,8 @@ + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Copy man pages - FILE(GLOB MAN1 *.1) +-FILE(GLOB MAN1 *.1) -FILE(GLOB MAN1_NDB ndb*.1) +-FILE(GLOB MAN1_ROUTER mysqlrouter*.1) ++FILE(GLOB MAN1 *.1) ++FILE(GLOB MAN1_ROUTER mysqlroutermy_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 *.8) FILE(GLOB MAN8_NDB ndb*.8) IF(MAN1_NDB AND NOT WITH_NDBCLUSTER) Index: head/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc =================================================================== --- head/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc (revision 512333) +++ head/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc (revision 512334) @@ -1,60 +1,60 @@ ---- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC -+++ mysys_ssl/my_default.cc +--- mysys/my_default.cc.orig 2016-08-25 11:52:06 UTC ++++ mysys/my_default.cc @@ -114,7 +114,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; @@ -914,6 +914,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++; /* Ignore comment and empty lines */ @@ -1252,7 +1260,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); } } } @@ -1411,13 +1420,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 @@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f MY_STAT stat_info; - if (!my_stat(file_name, &stat_info, MYF(0))) return 1; + if (!my_stat(file_name, &stat_info, MYF(0))) return 0; /* Ignore .mylogin.cnf file if not exclusively readable/writable by current user. Index: head/databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc =================================================================== --- head/databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc (revision 512333) +++ head/databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc (revision 512334) @@ -1,11 +1,11 @@ ---- mysys_ssl/my_md5.cc.orig 2018-04-08 06:44:49 UTC -+++ mysys_ssl/my_md5.cc +--- mysys/my_md5.cc.orig 2018-04-08 06:44:49 UTC ++++ mysys/my_md5.cc @@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *d int compute_md5_hash(char *digest, const char *buf, int len) { int retval = 0; int fips_mode = 0; -#if !defined(HAVE_WOLFSSL) +#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) fips_mode = FIPS_mode(); #endif /* HAVE_WOLFSSL */ /* If fips mode is ON/STRICT restricted method calls will result into abort, Index: head/databases/mysql80-server/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-support-files_CMakeLists.txt (revision 512333) +++ head/databases/mysql80-server/files/patch-support-files_CMakeLists.txt (revision 512334) @@ -1,12 +1,13 @@ ---- support-files/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- support-files/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC +++ support-files/CMakeLists.txt -@@ -69,7 +69,9 @@ IF(UNIX) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ENDIF() +@@ -24,8 +24,10 @@ IF(NOT UNIX) + RETURN() + ENDIF() +IF(FALSE) - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) + INSTALL(FILES mysql.m4 + DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) +ENDIF() - - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) + + SET(localstatedir "${MYSQL_DATADIR}") + Index: head/databases/mysql80-server/pkg-plist =================================================================== --- head/databases/mysql80-server/pkg-plist (revision 512333) +++ head/databases/mysql80-server/pkg-plist (revision 512334) @@ -1,212 +1,218 @@ LICENSE.router README.router 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/mysqlrouter bin/mysqlrouter_passwd bin/mysqlrouter_plugin_info bin/mysqltest bin/mysqlxtest bin/perror bin/zlib_decompress lib/mysql/libmysqlharness.a lib/mysql/libmysqlharness.so lib/mysql/libmysqlharness.so.1 lib/mysql/libmysqlrouter.so lib/mysql/libmysqlrouter.so.1 lib/mysql/libmysqlrouter_http.so lib/mysql/libmysqlrouter_http.so.1 lib/mysql/mysqlrouter/http_auth_backend.so lib/mysql/mysqlrouter/http_auth_realm.so lib/mysql/mysqlrouter/http_server.so lib/mysql/mysqlrouter/keepalive.so lib/mysql/mysqlrouter/metadata_cache.so lib/mysql/mysqlrouter/mysql_protocol.so +lib/mysql/mysqlrouter/rest_api.so +lib/mysql/mysqlrouter/rest_metadata_cache.so +lib/mysql/mysqlrouter/rest_router.so +lib/mysql/mysqlrouter/rest_routing.so lib/mysql/mysqlrouter/routing.so lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/component_audit_api_message_emit.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_audit_api_message.so lib/mysql/plugin/component_test_backup_lock_service.so lib/mysql/plugin/component_test_host_application_signal.so +lib/mysql/plugin/component_test_mysql_current_thread_reader.so lib/mysql/plugin/component_test_mysql_runtime_error.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/ddl_rewriter.so lib/mysql/plugin/group_replication.so %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so lib/mysql/plugin/ha_mock.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_reset_connection.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_clone.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_host_application_signal.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/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%%/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%%/mysql-log-rotate %%DATADIR%%/mysql.server %%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%%