Index: head/databases/mysql80-client/Makefile =================================================================== --- head/databases/mysql80-client/Makefile (revision 451388) +++ head/databases/mysql80-client/Makefile (revision 451389) @@ -1,42 +1,41 @@ # Created by: "Mahdi Mokhtari " # $FreeBSD$ PORTNAME= mysql -PORTREVISION?= 3 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 +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-extra_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-extra_CMakeLists.txt (revision 451388) +++ head/databases/mysql80-client/files/patch-extra_CMakeLists.txt (nonexistent) @@ -1,33 +0,0 @@ ---- extra/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ extra/CMakeLists.txt -@@ -45,6 +45,7 @@ ENDIF() - - ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h - ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys -+ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/ - COMMAND comp_err - --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets - --out-dir=${PROJECT_BINARY_DIR}/sql/share/ -@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY - ENDIF() - - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) - TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) - SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -@@ -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 Property changes on: head/databases/mysql80-client/files/patch-extra_CMakeLists.txt ___________________________________________________________________ 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-client/files/patch-CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-CMakeLists.txt (revision 451388) +++ head/databases/mysql80-client/files/patch-CMakeLists.txt (revision 451389) @@ -1,36 +1,44 @@ ---- CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +++ CMakeLists.txt -@@ -606,8 +606,8 @@ ENDIF() +@@ -700,9 +700,6 @@ 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() - ADD_SUBDIRECTORY(extra) - ADD_SUBDIRECTORY(client) --ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(libservices) + ADD_SUBDIRECTORY(include) +@@ -715,6 +712,7 @@ ADD_SUBDIRECTORY(extra/regex) + ADD_SUBDIRECTORY(libmysql) + ADD_SUBDIRECTORY(libbinlogevents) + ADD_SUBDIRECTORY(libbinlogstandalone) +ADD_SUBDIRECTORY(support-files) - IF(UNIX) - ADD_SUBDIRECTORY(man) -@@ -676,14 +676,13 @@ ELSE() + IF(NOT WITHOUT_SERVER) + SET (MYSQLD_STATIC_COMPONENT_LIBS "" CACHE INTERNAL "") +@@ -811,14 +809,13 @@ ELSE() SET(CPACK_GENERATOR "TGZ") 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 COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -706,6 +705,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") +@@ -841,6 +838,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) Index: head/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h =================================================================== --- head/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h (revision 451388) +++ head/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h (revision 451389) @@ -1,11 +1,11 @@ ---- cmd-line-utils/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC -+++ cmd-line-utils/libedit/chartype.h +--- extra/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC ++++ extra/libedit/chartype.h @@ -49,7 +49,7 @@ TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ #if !defined(__NetBSD__) && !defined(__sun) \ && !(defined(__APPLE__) && defined(__MACH__)) \ - && !defined(__FreeBSD__) && !defined(_AIX) + && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__) #ifndef __STDC_ISO_10646__ /* In many places it is assumed that the first 127 code points are ASCII * compatible, so ensure wchar_t indeed does ISO 10646 and not some other Index: head/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c =================================================================== --- head/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c (revision 451388) +++ head/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c (revision 451389) @@ -1,20 +1,20 @@ ---- cmd-line-utils/libedit/vi.c.orig 2016-03-28 18:06:12 UTC -+++ cmd-line-utils/libedit/vi.c +--- extra/libedit/vi.c.orig 2016-03-28 18:06:12 UTC ++++ extra/libedit/vi.c @@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#if defined(__weak_reference) && !defined(__FreeBSD__) +#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) __weakref_visible char *my_get_alias_text(const char *) __weak_reference(get_alias_text); #endif @@ -928,7 +928,7 @@ protected el_action_t vi_alias(EditLine *el __attribute__((__unused__)), Int c __attribute__((__unused__))) { -#if defined(__weak_reference) && !defined(__FreeBSD__) +#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) char alias_name[3]; char *alias_text; Index: head/databases/mysql80-client/files/patch-include_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-include_CMakeLists.txt (revision 451388) +++ head/databases/mysql80-client/files/patch-include_CMakeLists.txt (revision 451389) @@ -1,102 +1,182 @@ ---- include/CMakeLists.txt.orig 2016-08-25 12:32:09 UTC +--- include/CMakeLists.txt.orig 2017-09-21 15:51:58 UTC +++ include/CMakeLists.txt -@@ -37,6 +37,7 @@ SET(HEADERS_ABI - - SET(HEADERS - ${HEADERS_ABI} -+ hash.h - my_dbug.h - m_string.h - my_sys.h -@@ -64,6 +65,81 @@ SET(HEADERS - thr_cond.h - thr_mutex.h - thr_rwlock.h +@@ -30,11 +30,179 @@ SET(HEADERS + ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h + ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h + ../libbinlogevents/export/binary_log_types.h + base64.h ++ big_endian.h ++ byte_order_generic.h ++ byte_order_generic_x86.h + c_string_less.h + crypt_genhash_impl.h ++ decimal.h + depth_first_search.h + dur_prop.h ++ errmsg.h + ft_global.h ++ hash.h + heap.h -+ i_callable.h -+ instance_callback.h ++ keycache.h ++ lex_string.h + lf.h ++ little_endian.h ++ m_ctype.h ++ m_string.h ++ map_helpers.h ++ mem_root_fwd.h ++ mf_wcomp.h + mutex_lock.h + my_aes.h ++ my_alloc.h + my_atomic.h + my_base.h + my_bit.h + my_bitmap.h ++ my_byteorder.h + my_check_opt.h ++ my_command.h + my_compare.h + my_compare.h.orig ++ my_compiler.h ++ my_dbug.h + my_default.h ++ my_dir.h ++ my_double2ulonglong.h ++ my_getopt.h ++ my_hash_combine.h + my_icp.h ++ my_inttypes.h ++ my_io.h ++ my_list.h ++ my_loglevel.h ++ my_macros.h + my_md5.h + my_md5_size.h + my_murmur3.h ++ my_pointer_arithmetic.h ++ my_psi_config.h ++ my_rapidjson_size_t.h + my_rdtsc.h + my_rnd.h ++ my_sharedlib.h ++ my_shm_defaults.h + my_sqlcommand.h + my_stacktrace.h ++ my_sys.h ++ my_systime.h ++ my_table_map.h ++ my_thread.h ++ my_thread_local.h + my_thread_os_id.h + my_time.h + my_timer.h + my_tree.h + my_uctype.h + my_user.h ++ my_xml.h + myisam.h -+ myisam.h.orig + myisammrg.h + myisampack.h ++ mysql.h + mysql.h.pp ++ mysql_com.h ++ mysql_com_server.h ++ mysql_time.h + mysql_version.h.in + mysys_err.h + nullable.h + password.h + pfs_cond_provider.h + pfs_error_provider.h + pfs_file_provider.h + pfs_idle_provider.h + pfs_memory_provider.h + pfs_metadata_provider.h + pfs_mutex_provider.h + pfs_rwlock_provider.h + pfs_socket_provider.h + pfs_stage_provider.h + pfs_statement_provider.h + pfs_table_provider.h + pfs_thread_provider.h + pfs_transaction_provider.h + prealloced_array.h ++ print_version.h + priority_queue.h -+ probes_mysql.d.base -+ probes_mysql.h -+ probes_mysql_nodtrace.h -+ queues.h + rwlock_scoped_lock.h + scope_guard.h + service_versions.h + sha1.h + sha2.h + sql_chars.h ++ sql_common.h + sql_string.h ++ sslopt-case.h ++ sslopt-longopts.h ++ sslopt-vars.h + str_uca_type.h + template_utils.h ++ thr_cond.h + thr_lock.h ++ thr_mutex.h ++ thr_rwlock.h ++ typelib.h ++ varlen_sort.h + violite.h + welcome_copyright_notice.h - ${HEADERS_GEN_CONFIGURE} ) - -@@ -76,5 +152,9 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I - PATTERN "*.h" - PATTERN "psi_abi*" EXCLUDE + SET(HEADERS_MYSQL_DIR + mysql/client_plugin.h + mysql/plugin_auth_common.h + mysql/udf_registration_types.h ++ mysql/client_authentication.h ++ mysql/client_plugin.h.pp ++ mysql/com_data.h ++ mysql/get_password.h ++ mysql/group_replication_priv.h ++ mysql/innodb_priv.h ++ mysql/mysql_lex_string.h ++ mysql/plugin.h ++ mysql/plugin_audit.h ++ mysql/plugin_audit.h.pp ++ mysql/plugin_auth.h ++ mysql/plugin_auth.h.pp ++ mysql/plugin_auth_common.h ++ mysql/plugin_ftparser.h ++ mysql/plugin_ftparser.h.pp ++ mysql/plugin_group_replication.h ++ mysql/plugin_keyring.h ++ mysql/plugin_keyring.h.pp ++ mysql/plugin_query_rewrite.h ++ mysql/plugin_trace.h ++ mysql/plugin_validate_password.h ++ mysql/service_command.h ++ mysql/service_locking.h ++ mysql/service_my_plugin_log.h ++ mysql/service_my_snprintf.h ++ mysql/service_mysql_alloc.h ++ mysql/service_mysql_keyring.h ++ mysql/service_mysql_password_policy.h ++ mysql/service_mysql_string.h ++ mysql/service_parser.h ++ mysql/service_plugin_registry.h ++ mysql/service_rpl_transaction_ctx.h ++ mysql/service_rpl_transaction_write_set.h ++ mysql/service_rules_table.h ++ mysql/service_security_context.h ++ mysql/service_srv_session.h ++ mysql/service_srv_session_info.h ++ mysql/service_ssl_wrapper.h ++ mysql/service_thd_alloc.h ++ mysql/service_thd_engine_lock.h ++ mysql/service_thd_wait.h ++ mysql/service_thread_scheduler.h ++ mysql/services.h ++ mysql/services.h.pp ++ mysql/thread_pool_priv.h ++ mysql/thread_type.h ++ mysql/udf_registration_types.h ) -+INSTALL(DIRECTORY atomic/ DESTINATION ${INSTALL_INCLUDEDIR}/atomic COMPONENT Development -+ PATTERN "*.h" -+ PATTERN "psi_abi*" EXCLUDE -+) - + INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) Index: head/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt (revision 451388) +++ head/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt (revision 451389) @@ -1,11 +1,23 @@ ---- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- libmysql/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +++ libmysql/CMakeLists.txt -@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED) +@@ -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) SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") ELSE() SET(OS_SHARED_LIB_VERSION Index: head/databases/mysql80-client/files/patch-sql_share_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-sql_share_CMakeLists.txt (nonexistent) +++ head/databases/mysql80-client/files/patch-sql_share_CMakeLists.txt (revision 451389) @@ -0,0 +1,27 @@ +--- sql/share/CMakeLists.txt.orig 2017-10-03 10:54:31 UTC ++++ sql/share/CMakeLists.txt +@@ -45,6 +45,7 @@ SET(files + dictionary.txt + ) + ++IF (FALSE) + FOREACH (dir ${dirs}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir} + DESTINATION ${INSTALL_MYSQLSHAREDIR} +@@ -57,13 +58,16 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE + COMPONENT Server + PATTERN "languages.html" EXCLUDE + ) ++ENDIF() + + # Don't copy if we're building in-source. + IF (NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) + CONFIGURE_FILE(dictionary.txt ${CMAKE_BINARY_DIR}/sql/share/dictionary.txt) + ENDIF() + ++IF (FALSE) + INSTALL(FILES ${files} + DESTINATION ${INSTALL_MYSQLSHAREDIR} + COMPONENT Server + ) ++ENDIF() Property changes on: head/databases/mysql80-client/files/patch-sql_share_CMakeLists.txt ___________________________________________________________________ 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: head/databases/mysql80-client/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-support-files_CMakeLists.txt (revision 451388) +++ head/databases/mysql80-client/files/patch-support-files_CMakeLists.txt (revision 451389) @@ -1,37 +1,23 @@ ---- support-files/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- support-files/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +++ support-files/CMakeLists.txt -@@ -44,14 +44,17 @@ ELSE() - SET(inst_location ${INSTALL_SUPPORTFILESDIR}) - ENDIF() - -+IF(FALSE) - SET(inifile my-default) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} - DESTINATION ${inst_location} COMPONENT IniFiles) -+ENDIF() - - IF(UNIX) +@@ -46,6 +46,7 @@ IF(UNIX) + ELSE() + SET (PIDOF "pgrep -d' ' -f") + ENDIF() ++IF (FALSE) SET(prefix ${CMAKE_INSTALL_PREFIX}) -+IF(FALSE) FOREACH(script mysqld_multi.server mysql-log-rotate) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -68,9 +71,11 @@ IF(UNIX) +@@ -59,9 +60,12 @@ IF(UNIX) IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() +ENDIF() ++ENDIF() INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+IF(FALSE) ++IF (FALSE) SET(bindir ${prefix}/${INSTALL_BINDIR}) SET(sbindir ${prefix}/${INSTALL_SBINDIR}) - SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR}) -@@ -83,3 +88,4 @@ IF(UNIX) - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - ENDIF() -+ENDIF() + SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) Index: head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt (nonexistent) +++ head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt (revision 451389) @@ -0,0 +1,33 @@ +--- 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}/sql/share/english/errmsg.sys ++ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/ + COMMAND comp_err + --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets + --out-dir=${PROJECT_BINARY_DIR}/sql/share/ +@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY + ENDIF() + + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) + TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) + SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) +@@ -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 Property changes on: head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt ___________________________________________________________________ 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: head/databases/mysql80-client/pkg-plist =================================================================== --- head/databases/mysql80-client/pkg-plist (revision 451388) +++ head/databases/mysql80-client/pkg-plist (revision 451389) @@ -1,240 +1,203 @@ bin/mysql bin/mysql_config bin/mysql_config_editor bin/mysql_ssl_rsa_setup bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport bin/mysqlpump bin/mysqlshow bin/mysqlslap -include/mysql/atomic/gcc_atomic.h -include/mysql/atomic/gcc_sync.h -include/mysql/atomic/generic-msvc.h -include/mysql/atomic/solaris.h include/mysql/base64.h include/mysql/big_endian.h include/mysql/binary_log_types.h include/mysql/byte_order_generic.h include/mysql/byte_order_generic_x86.h include/mysql/c_string_less.h include/mysql/crypt_genhash_impl.h include/mysql/decimal.h include/mysql/depth_first_search.h include/mysql/dur_prop.h include/mysql/errmsg.h include/mysql/ft_global.h include/mysql/hash.h include/mysql/heap.h -include/mysql/i_callable.h -include/mysql/instance_callback.h include/mysql/keycache.h +include/mysql/lex_string.h include/mysql/lf.h include/mysql/little_endian.h include/mysql/m_ctype.h include/mysql/m_string.h +include/mysql/map_helpers.h +include/mysql/mem_root_fwd.h +include/mysql/mf_wcomp.h include/mysql/mutex_lock.h include/mysql/my_aes.h include/mysql/my_alloc.h include/mysql/my_atomic.h include/mysql/my_base.h include/mysql/my_bit.h include/mysql/my_bitmap.h include/mysql/my_byteorder.h include/mysql/my_check_opt.h include/mysql/my_command.h include/mysql/my_compare.h include/mysql/my_compiler.h -include/mysql/my_config.h include/mysql/my_dbug.h include/mysql/my_default.h include/mysql/my_dir.h +include/mysql/my_double2ulonglong.h include/mysql/my_getopt.h -include/mysql/my_global.h +include/mysql/my_hash_combine.h include/mysql/my_icp.h +include/mysql/my_inttypes.h +include/mysql/my_io.h include/mysql/my_list.h +include/mysql/my_loglevel.h +include/mysql/my_macros.h include/mysql/my_md5.h include/mysql/my_md5_size.h include/mysql/my_murmur3.h +include/mysql/my_pointer_arithmetic.h +include/mysql/my_psi_config.h +include/mysql/my_rapidjson_size_t.h include/mysql/my_rdtsc.h include/mysql/my_rnd.h +include/mysql/my_sharedlib.h +include/mysql/my_shm_defaults.h include/mysql/my_sqlcommand.h include/mysql/my_stacktrace.h include/mysql/my_sys.h +include/mysql/my_systime.h +include/mysql/my_table_map.h include/mysql/my_thread.h include/mysql/my_thread_local.h include/mysql/my_thread_os_id.h include/mysql/my_time.h include/mysql/my_timer.h include/mysql/my_tree.h include/mysql/my_uctype.h include/mysql/my_user.h include/mysql/my_xml.h include/mysql/myisam.h include/mysql/myisammrg.h include/mysql/myisampack.h include/mysql/mysql.h include/mysql/mysql.h.pp include/mysql/mysql/client_authentication.h include/mysql/mysql/client_plugin.h include/mysql/mysql/client_plugin.h.pp include/mysql/mysql/com_data.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/get_password.h include/mysql/mysql/group_replication_priv.h include/mysql/mysql/innodb_priv.h include/mysql/mysql/mysql_lex_string.h include/mysql/mysql/plugin.h include/mysql/mysql/plugin_audit.h include/mysql/mysql/plugin_audit.h.pp include/mysql/mysql/plugin_auth.h include/mysql/mysql/plugin_auth.h.pp include/mysql/mysql/plugin_auth_common.h include/mysql/mysql/plugin_ftparser.h 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/psi/mysql_cond.h -include/mysql/mysql/psi/mysql_error.h -include/mysql/mysql/psi/mysql_file.h -include/mysql/mysql/psi/mysql_idle.h -include/mysql/mysql/psi/mysql_mdl.h -include/mysql/mysql/psi/mysql_memory.h -include/mysql/mysql/psi/mysql_mutex.h -include/mysql/mysql/psi/mysql_ps.h -include/mysql/mysql/psi/mysql_rwlock.h -include/mysql/mysql/psi/mysql_socket.h -include/mysql/mysql/psi/mysql_sp.h -include/mysql/mysql/psi/mysql_stage.h -include/mysql/mysql/psi/mysql_statement.h -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_base.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_memory.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/service_command.h include/mysql/mysql/service_locking.h include/mysql/mysql/service_my_plugin_log.h include/mysql/mysql/service_my_snprintf.h include/mysql/mysql/service_mysql_alloc.h include/mysql/mysql/service_mysql_keyring.h include/mysql/mysql/service_mysql_password_policy.h include/mysql/mysql/service_mysql_string.h include/mysql/mysql/service_parser.h +include/mysql/mysql/service_plugin_registry.h include/mysql/mysql/service_rpl_transaction_ctx.h include/mysql/mysql/service_rpl_transaction_write_set.h include/mysql/mysql/service_rules_table.h include/mysql/mysql/service_security_context.h include/mysql/mysql/service_srv_session.h include/mysql/mysql/service_srv_session_info.h include/mysql/mysql/service_ssl_wrapper.h include/mysql/mysql/service_thd_alloc.h include/mysql/mysql/service_thd_engine_lock.h include/mysql/mysql/service_thd_wait.h include/mysql/mysql/service_thread_scheduler.h include/mysql/mysql/services.h include/mysql/mysql/services.h.pp include/mysql/mysql/thread_pool_priv.h include/mysql/mysql/thread_type.h +include/mysql/mysql/udf_registration_types.h include/mysql/mysql_com.h include/mysql/mysql_com_server.h include/mysql/mysql_time.h include/mysql/mysql_version.h include/mysql/mysql_version.h.in -include/mysql/mysqld_ername.h include/mysql/mysqld_error.h include/mysql/mysys_err.h include/mysql/nullable.h include/mysql/password.h include/mysql/pfs_cond_provider.h include/mysql/pfs_error_provider.h include/mysql/pfs_file_provider.h include/mysql/pfs_idle_provider.h include/mysql/pfs_memory_provider.h include/mysql/pfs_metadata_provider.h include/mysql/pfs_mutex_provider.h include/mysql/pfs_rwlock_provider.h include/mysql/pfs_socket_provider.h include/mysql/pfs_stage_provider.h include/mysql/pfs_statement_provider.h include/mysql/pfs_table_provider.h include/mysql/pfs_thread_provider.h include/mysql/pfs_transaction_provider.h -include/mysql/plugin.h -include/mysql/plugin_audit.h -include/mysql/plugin_ftparser.h -include/mysql/plugin_group_replication.h -include/mysql/plugin_keyring.h -include/mysql/plugin_validate_password.h include/mysql/prealloced_array.h +include/mysql/print_version.h include/mysql/priority_queue.h -include/mysql/probes_mysql.d.base -include/mysql/probes_mysql.h -include/mysql/probes_mysql_nodtrace.h -include/mysql/queues.h include/mysql/rwlock_scoped_lock.h include/mysql/scope_guard.h include/mysql/service_versions.h include/mysql/sha1.h include/mysql/sha2.h include/mysql/sql_chars.h include/mysql/sql_common.h include/mysql/sql_string.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h include/mysql/str_uca_type.h include/mysql/template_utils.h include/mysql/thr_cond.h include/mysql/thr_lock.h include/mysql/thr_mutex.h include/mysql/thr_rwlock.h include/mysql/typelib.h +include/mysql/varlen_sort.h include/mysql/violite.h include/mysql/welcome_copyright_notice.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.21 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.21 lib/mysql/libmysqlservices.a libdata/pkgconfig/mysqlclient.pc man/man1/comp_err.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz man/man1/mysql_config_editor.1.gz man/man1/mysqladmin.1.gz man/man1/mysqlbinlog.1.gz man/man1/mysqlcheck.1.gz man/man1/mysqldump.1.gz man/man1/mysqlimport.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz share/aclocal/mysql.m4 Index: head/databases/mysql80-server/Makefile =================================================================== --- head/databases/mysql80-server/Makefile (revision 451388) +++ head/databases/mysql80-server/Makefile (revision 451389) @@ -1,160 +1,161 @@ # Created by: Mahdi Mokhtari # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 8.0.0 +PORTVERSION= 8.0.2 DISTVERSIONSUFFIX?= -dmr -PORTREVISION?= 5 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 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 \ liblz4.so:archivers/liblz4 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 \ -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 +IGNORE_FreeBSD_10= "FreeBSD 10.0 doesn't have _cxa_thread_atexit() implemeneted in libc, it has been implemented since 11 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 ${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 451388) +++ head/databases/mysql80-server/distinfo (revision 451389) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483372244 -SHA256 (mysql-boost-8.0.0-dmr.tar.gz) = e5b7b77e532c906dc30f12b821950426b8205a64b5a77c26681e2109a3b6a5fc -SIZE (mysql-boost-8.0.0-dmr.tar.gz) = 65567795 +TIMESTAMP = 1505989679 +SHA256 (mysql-boost-8.0.2-dmr.tar.gz) = a93f63e8ac72046bc5b0dc8515c60dd72faaaff352652aa46375f3a484ac3872 +SIZE (mysql-boost-8.0.2-dmr.tar.gz) = 60697707 Index: head/databases/mysql80-server/files/patch-storage_innobase_buf_buf0buf.cc =================================================================== --- head/databases/mysql80-server/files/patch-storage_innobase_buf_buf0buf.cc (revision 451388) +++ head/databases/mysql80-server/files/patch-storage_innobase_buf_buf0buf.cc (nonexistent) @@ -1,11 +0,0 @@ ---- 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; Property changes on: head/databases/mysql80-server/files/patch-storage_innobase_buf_buf0buf.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0purge.cc =================================================================== --- head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0purge.cc (revision 451388) +++ head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0purge.cc (nonexistent) @@ -1,11 +0,0 @@ ---- 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{}, Property changes on: head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0purge.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/mysql80-server/files/patch-sql_json__dom.h =================================================================== --- head/databases/mysql80-server/files/patch-sql_json__dom.h (revision 451388) +++ head/databases/mysql80-server/files/patch-sql_json__dom.h (nonexistent) @@ -1,11 +0,0 @@ ---- 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 Property changes on: head/databases/mysql80-server/files/patch-sql_json__dom.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0trx.cc =================================================================== --- head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0trx.cc (revision 451388) +++ head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0trx.cc (nonexistent) @@ -1,11 +0,0 @@ ---- 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; Property changes on: head/databases/mysql80-server/files/patch-storage_innobase_trx_trx0trx.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/mysql80-server/files/patch-storage_innobase_sync_sync0debug.cc =================================================================== --- head/databases/mysql80-server/files/patch-storage_innobase_sync_sync0debug.cc (revision 451388) +++ head/databases/mysql80-server/files/patch-storage_innobase_sync_sync0debug.cc (nonexistent) @@ -1,11 +0,0 @@ ---- 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; Property changes on: head/databases/mysql80-server/files/patch-storage_innobase_sync_sync0debug.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/mysql80-server/files/patch-sql_histograms_singleton.h =================================================================== --- head/databases/mysql80-server/files/patch-sql_histograms_singleton.h (revision 451388) +++ head/databases/mysql80-server/files/patch-sql_histograms_singleton.h (nonexistent) @@ -1,20 +0,0 @@ ---- 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); - }; - Property changes on: head/databases/mysql80-server/files/patch-sql_histograms_singleton.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/mysql80-server/files/patch-sql_histograms_histogram.h =================================================================== --- head/databases/mysql80-server/files/patch-sql_histograms_histogram.h (revision 451388) +++ head/databases/mysql80-server/files/patch-sql_histograms_histogram.h (nonexistent) @@ -1,11 +0,0 @@ ---- 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 Property changes on: head/databases/mysql80-server/files/patch-sql_histograms_singleton.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/mysql80-server/files/patch-storage_innobase_dict_dict0stats.cc =================================================================== --- head/databases/mysql80-server/files/patch-storage_innobase_dict_dict0stats.cc (revision 451388) +++ head/databases/mysql80-server/files/patch-storage_innobase_dict_dict0stats.cc (nonexistent) @@ -1,11 +0,0 @@ ---- 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(). */ Property changes on: head/databases/mysql80-server/files/patch-storage_innobase_dict_dict0stats.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/mysql80-server/files/patch-CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-CMakeLists.txt (revision 451388) +++ head/databases/mysql80-server/files/patch-CMakeLists.txt (revision 451389) @@ -1,40 +1,35 @@ ---- CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +++ CMakeLists.txt -@@ -614,12 +614,10 @@ IF(UNIX) +@@ -750,7 +750,6 @@ IF(UNIX) ENDIF() IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(testclients) ADD_SUBDIRECTORY(sql) - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) - IF(WITH_EMBEDDED_SERVER) - ADD_SUBDIRECTORY(libmysqld) -- ADD_SUBDIRECTORY(libmysqld/examples) - ENDIF(WITH_EMBEDDED_SERVER) ENDIF() -@@ -628,8 +626,6 @@ ENDIF() +@@ -759,8 +758,6 @@ ENDIF() ADD_SUBDIRECTORY(scripts) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(mysql-test) - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) ADD_SUBDIRECTORY(support-files) IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) -@@ -684,6 +680,7 @@ ENDIF() +@@ -819,6 +816,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -706,6 +703,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") +@@ -841,6 +839,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) Index: head/databases/mysql80-server/files/patch-cmake_plugin.cmake =================================================================== --- head/databases/mysql80-server/files/patch-cmake_plugin.cmake (revision 451388) +++ head/databases/mysql80-server/files/patch-cmake_plugin.cmake (revision 451389) @@ -1,12 +1,12 @@ ---- cmake/plugin.cmake.orig 2016-03-28 18:06:12 UTC +--- cmake/plugin.cmake.orig 2017-06-27 11:44:29 UTC +++ cmake/plugin.cmake -@@ -237,9 +237,6 @@ MACRO(MYSQL_ADD_PLUGIN) - MYSQL_INSTALL_TARGETS(${target} - DESTINATION ${INSTALL_PLUGINDIR} - COMPONENT ${INSTALL_COMPONENT}) -- INSTALL_DEBUG_TARGET(${target} -- DESTINATION ${INSTALL_PLUGINDIR}/debug -- COMPONENT ${INSTALL_COMPONENT}) - # Add installed files to list for RPMs - FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files - "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" +@@ -207,9 +207,6 @@ MACRO(MYSQL_ADD_PLUGIN) + MYSQL_INSTALL_TARGETS(${target} + DESTINATION ${INSTALL_PLUGINDIR} + COMPONENT ${INSTALL_COMPONENT}) +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT ${INSTALL_COMPONENT}) + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin}) Index: head/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h =================================================================== --- head/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h (revision 451388) +++ head/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h (revision 451389) @@ -1,11 +1,11 @@ ---- cmd-line-utils/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC -+++ cmd-line-utils/libedit/chartype.h +--- extra/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC ++++ extra/libedit/chartype.h @@ -49,7 +49,7 @@ TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ #if !defined(__NetBSD__) && !defined(__sun) \ && !(defined(__APPLE__) && defined(__MACH__)) \ - && !defined(__FreeBSD__) && !defined(_AIX) + && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__) #ifndef __STDC_ISO_10646__ /* In many places it is assumed that the first 127 code points are ASCII * compatible, so ensure wchar_t indeed does ISO 10646 and not some other Index: head/databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c =================================================================== --- head/databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c (revision 451388) +++ head/databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c (revision 451389) @@ -1,20 +1,20 @@ ---- cmd-line-utils/libedit/vi.c.orig 2016-03-28 18:06:12 UTC -+++ cmd-line-utils/libedit/vi.c +--- extra/libedit/vi.c.orig 2016-03-28 18:06:12 UTC ++++ extra/libedit/vi.c @@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#if defined(__weak_reference) && !defined(__FreeBSD__) +#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) __weakref_visible char *my_get_alias_text(const char *) __weak_reference(get_alias_text); #endif @@ -928,7 +928,7 @@ protected el_action_t vi_alias(EditLine *el __attribute__((__unused__)), Int c __attribute__((__unused__))) { -#if defined(__weak_reference) && !defined(__FreeBSD__) +#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) char alias_name[3]; char *alias_text; Index: head/databases/mysql80-server/files/patch-include_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-include_CMakeLists.txt (revision 451388) +++ head/databases/mysql80-server/files/patch-include_CMakeLists.txt (revision 451389) @@ -1,19 +1,10 @@ ---- include/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- include/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +++ include/CMakeLists.txt -@@ -69,14 +69,13 @@ SET(HEADERS - ${HEADERS_GEN_CONFIGURE} +@@ -37,5 +37,7 @@ SET(HEADERS_MYSQL_DIR + mysql/udf_registration_types.h ) +IF(FALSE) - INSTALL(FILES - ../libbinlogevents/export/binary_log_types.h - DESTINATION ${INSTALL_INCLUDEDIR} -- COMPONENT Development) --INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) --INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development - PATTERN "*.h" - PATTERN "psi_abi*" EXCLUDE - ) + INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) + INSTALL(FILES ${HEADERS_MYSQL_DIR} DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development) +ENDIF() - - Index: head/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc =================================================================== --- head/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc (revision 451388) +++ head/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc (revision 451389) @@ -1,11 +1,11 @@ ---- plugin/password_validation/validate_password.cc.orig 2016-03-28 18:06:12 UTC +--- plugin/password_validation/validate_password.cc.orig 2017-06-27 11:44:29 UTC +++ plugin/password_validation/validate_password.cc -@@ -18,6 +18,8 @@ +@@ -17,6 +17,8 @@ #include #include #include +/* solve clash between libc++ bitset::test() and test macro from my_global.h */ +#undef test - #include - #include - #include + #include + #include + #include Index: head/databases/mysql80-server/files/patch-rapid_plugin_x_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-rapid_plugin_x_CMakeLists.txt (revision 451388) +++ head/databases/mysql80-server/files/patch-rapid_plugin_x_CMakeLists.txt (revision 451389) @@ -1,20 +1,19 @@ ---- rapid/plugin/x/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- rapid/plugin/x/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +++ rapid/plugin/x/CMakeLists.txt -@@ -91,14 +91,14 @@ ELSE() +@@ -70,13 +70,14 @@ ELSE() ${CMAKE_CURRENT_SOURCE_DIR}/ngs/include ${CMAKE_SOURCE_DIR}/include #temporary - ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql + ${CMAKE_CURRENT_BINARY_DIR}/generated - ${SSL_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} + ${BOOST_INCLUDE_DIR} ) INCLUDE_DIRECTORIES(SYSTEM -- ${BOOST_INCLUDE_DIR} ${PROTOBUF_INCLUDE_DIRS} ${LIBEVENT_INCLUDE_DIR} + ${SSL_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIR} ) IF(XPLUGIN_NO_LITE_PROTOBUF) Index: head/databases/mysql80-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt (revision 451388) +++ head/databases/mysql80-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt (revision 451389) @@ -1,18 +1,10 @@ ---- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig 2017-09-21 12:20:03 UTC +++ rapid/unittest/gunit/xplugin/CMakeLists.txt -@@ -65,7 +65,6 @@ ENDIF() - ADD_DEFINITIONS(${GMOCK_CFLAGS} -DBOOST_ALL_NO_LIB -DBOOST_NO_AUTO_PTR -DUSE_MYSQLX_FULL_PROTO) - - INCLUDE_DIRECTORIES(SYSTEM -- ${BOOST_INCLUDE_DIR} - ${PROTOBUF_INCLUDE_DIRS} - ${SSL_INCLUDE_DIRS} - ${LIBEVENT_INCLUDE_DIR} -@@ -75,6 +74,7 @@ INCLUDE_DIRECTORIES(SYSTEM +@@ -63,6 +63,7 @@ INCLUDE_DIRECTORIES( + ${PROJECT_SOURCE_DIR}/include/mysql + ${ZLIB_INCLUDE_DIR} + ${CMAKE_BINARY_DIR}/rapid/plugin/x/generated/ ++ ${BOOST_INCLUDE_DIR} ) - INCLUDE_DIRECTORIES( -+ ${BOOST_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/testing/include - ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include - ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs + FILE( Index: head/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc =================================================================== --- head/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc (revision 451388) +++ head/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc (revision 451389) @@ -1,30 +1,33 @@ ---- sql/conn_handler/socket_connection.cc.orig 2016-03-28 18:06:12 UTC +--- sql/conn_handler/socket_connection.cc.orig 2017-06-27 11:44:29 UTC +++ sql/conn_handler/socket_connection.cc -@@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li +@@ -903,22 +903,26 @@ Channel_info* Mysqld_socket_listener::li signal(SIGCHLD, SIG_DFL); request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE, mysql_socket_getfd(connect_sock), NULL); - fromhost(&req); + void (*my_fromhost) (void *) = (void (*)(void *)) fromhost; + my_fromhost(&req); - if (!hosts_access(&req)) + int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access; + if (!my_hosts_access(&req)) { /* This may be stupid but refuse() includes an exit(0) which we surely don't want... clean_exit() - same stupid thing ... */ + char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client; syslog(LOG_AUTH | m_deny_severity, - "refused connect from %s", eval_client(&req)); + "refused connect from %s", my_eval_client(&req)); + #ifdef HAVE_LIBWRAP_PROTOTYPES + // Some distros have patched tcpd.h to have proper prototypes if (req.sink) - (req.sink)(req.fd); + ((void (*)(int)) (req.sink))(req.fd); - - mysql_socket_shutdown(listen_sock, SHUT_RDWR); - mysql_socket_close(listen_sock); ++ + #else + // Some distros have not patched tcpd.h + if (req.sink) Index: head/databases/mysql80-server/pkg-plist =================================================================== --- head/databases/mysql80-server/pkg-plist (revision 451388) +++ head/databases/mysql80-server/pkg-plist (revision 451389) @@ -1,160 +1,179 @@ 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/replace bin/resolve_stack_dump bin/resolveip -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/component_example_component1.so lib/mysql/plugin/component_example_component2.so lib/mysql/plugin/component_example_component3.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_pfs_example_component_population.so +lib/mysql/plugin/component_test_pfs_notification.so +lib/mysql/plugin/component_test_pfs_resource_group.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_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/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_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/mysqlx.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/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/mysqltest.1.gz man/man1/perror.1.gz -man/man1/replace.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%%/my-default.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server -%%DATADIR%%/mysql_security_commands.sql %%DATADIR%%/mysql_sys_schema.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.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%%