Index: head/databases/mariadb103-server/Makefile =================================================================== --- head/databases/mariadb103-server/Makefile (revision 474505) +++ head/databases/mariadb103-server/Makefile (revision 474506) @@ -1,200 +1,202 @@ # Created by: Bernard Spil # $FreeBSD$ PORTNAME?= mariadb PORTVERSION= 10.3.8 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ \ http://ftp.osuosl.org/pub/${SITESDIR}/ PKGNAMESUFFIX?= 103-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN= Segfaults on start, see https://jira.mariadb.org/browse/MDEV-16495 - SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb102-client USES= bison:build cmake:noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh storage/rocksdb/myrocks_hotbackup SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE .if !defined(CLIENT_ONLY) # MySQL-Server options -OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER +OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP OPTIONS_GROUP= COMPRESSION ENGINES GROONGA -OPTIONS_DEFINE= CONNECT_EXTRA +OPTIONS_DEFINE= CONNECT_EXTRA WSREP OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB XTRADB OPTIONS_GROUP_GROONGA= ZMQ MSGPACK OPTIONS_EXCLUDE_i386= TOKUDB CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine COMPRESSION_DESC= Optional page compression ENGINES_DESC= Optional MariaDB storage engines GROONGA_DESC= Optional Mroonga features INNOBASE_DESC= InnoDB default engine MROONGA_DESC= Mroonga Full Text Search engine MSGPACK_DESC= MsgPack support OQGRAPH_DESC= Open Query Graph Computation engine ROCKSDB_DESC= RocksDB LSM engine (Alpha) SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine +WSREP_DESC= Build wsrep clustering XTRADB_DESC= Build XtraDB engine next to InnoDB ZMQ_DESC= ZeroMQ support ZSTD_DESC+= Zstandard compression support (RocksDB only) .endif GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit CMAKE_ARGS+= -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="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \ -DWITH_JEMALLOC="system" \ -DWITH_LIBWRAP=1 \ -DWITH_SSL="${OPENSSLBASE}" \ -DWITH_UNIT_TESTS=0 \ -DWITHOUT_DOCS=1 \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ -DICONV_LIBRARIES="${ICONV_LIB_PATH}" \ -DKRB5_CONFIG="${KRB5CONFIG}" \ -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ -DOPENSSL_ROOT_DIR="${OPENSSLBASE}" \ -DOPENSSL_CRYPTO_LIBRARY="${OPENSSLBASE}/lib/libcrypto.so" \ -DOPENSSL_SSL_LIBRARY="${OPENSSLBASE}/lib/libssl.so" \ -DREMOTEIO_PLUGIN_TYPE="NO" \ -DCOMPILATION_COMMENT="FreeBSD Ports" \ -DCMAKE_PREFIX_PATH=${PREFIX} DATADIR= ${PREFIX}/share/mysql CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 OPTIONS_SUB= yes .if defined(CLIENT_ONLY) # MySQL-Client part USES+= readline GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF .else # MySQL-Server part NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ https://jira.mariadb.org/browse/MDEV-9627 USES+= mysql:103m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_CLIENT=1 .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \ -DWITHOUT_${ENGINE}=1 ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1 CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO -DPLUGIN_AUTH_GSSAPI_CLIENT=NO LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi +WSREP_CMAKE_OFF= -DWITH_WSREP=OFF ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 ZSTD_CMAKE_ON= -DWITH_ROCKSDB_ZSTD=ON ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd post-install: - ${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy + ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy + ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private + ${RM} -r `${FIND} ${STAGEDIR}${DATADIR} -type d -mindepth 1` .endif # defined(CLIENT_ONLY) .if defined(WITH_OPENSSL_PORT) GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .include .if ${OPSYS} == DragonFly CMAKE_ARGS+= -DWITHOUT_TOKUDB .endif post-patch: - ${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c - ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \ + ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif # Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 post-configure-INNOBASE-on: ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \ -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \ -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \ -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \ ${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt .include Index: head/databases/mariadb103-server/distinfo =================================================================== --- head/databases/mariadb103-server/distinfo (revision 474505) +++ head/databases/mariadb103-server/distinfo (revision 474506) @@ -1,3 +1,3 @@ -TIMESTAMP = 1530523784 -SHA256 (mariadb-10.3.8.tar.gz) = 44b409bc22775261b96f373bc01591065a680f46d295617b304cdf9ffb503ccf -SIZE (mariadb-10.3.8.tar.gz) = 72147179 +TIMESTAMP = 1531382110 +SHA256 (mariadb-10.3.8.tar.gz) = 30bec17514d12d811a05757be46bd41724df28002cdec550d5c757b0b3f31ab8 +SIZE (mariadb-10.3.8.tar.gz) = 72152953 Index: head/databases/mariadb103-server/files/patch-include_CMakeLists.txt =================================================================== --- head/databases/mariadb103-server/files/patch-include_CMakeLists.txt (revision 474505) +++ head/databases/mariadb103-server/files/patch-include_CMakeLists.txt (nonexistent) @@ -1,38 +0,0 @@ ---- include/CMakeLists.txt.orig 2017-08-17 10:05:38 UTC -+++ include/CMakeLists.txt -@@ -1,5 +1,5 @@ - # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. --# -+# - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by - # the Free Software Foundation; version 2 of the License. -@@ -68,6 +68,7 @@ SET(HEADERS - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h - DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) - -+IF(FALSE) - INSTALL(FILES ${HEADERS} - DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development) - FOREACH(f ${HEADERS_GEN_CONFIGURE}) -@@ -75,17 +76,20 @@ FOREACH(f ${HEADERS_GEN_CONFIGURE}) - DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development) - ENDFOREACH(f) - INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/server/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h") -+ENDIF() - - STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") - STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") - - MACRO(INSTALL_PRIVATE DIR) -+IF(FALSE) - INSTALL(DIRECTORY ${DIR}/. - DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN CMakeFiles EXCLUDE - PATTERN mysql EXCLUDE - REGEX "\\./(${EXCL_RE}$)" EXCLUDE) -+ENDIF() - ENDMACRO() - - INSTALL_PRIVATE(${CMAKE_CURRENT_BINARY_DIR}) Property changes on: head/databases/mariadb103-server/files/patch-include_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/mariadb103-server/files/patch-sql_sql__trigger.cc =================================================================== --- head/databases/mariadb103-server/files/patch-sql_sql__trigger.cc (revision 474505) +++ head/databases/mariadb103-server/files/patch-sql_sql__trigger.cc (nonexistent) @@ -1,56 +0,0 @@ ---- sql/sql_trigger.cc.orig 2018-02-26 04:27:17.000000000 +0100 -+++ sql/sql_trigger.cc 2018-02-27 20:54:20.250859000 +0100 -@@ -178,37 +178,37 @@ static File_option triggers_file_paramet - { - { - { STRING_WITH_LEN("triggers") }, -- my_offsetof(class Table_triggers_list, definitions_list), -+ static_cast(my_offsetof(class Table_triggers_list, definitions_list)), - FILE_OPTIONS_STRLIST - }, - { - { STRING_WITH_LEN("sql_modes") }, -- my_offsetof(class Table_triggers_list, definition_modes_list), -+ static_cast(my_offsetof(class Table_triggers_list, definition_modes_list)), - FILE_OPTIONS_ULLLIST - }, - { - { STRING_WITH_LEN("definers") }, -- my_offsetof(class Table_triggers_list, definers_list), -+ static_cast(my_offsetof(class Table_triggers_list, definers_list)), - FILE_OPTIONS_STRLIST - }, - { - { STRING_WITH_LEN("client_cs_names") }, -- my_offsetof(class Table_triggers_list, client_cs_names), -+ static_cast(my_offsetof(class Table_triggers_list, client_cs_names)), - FILE_OPTIONS_STRLIST - }, - { - { STRING_WITH_LEN("connection_cl_names") }, -- my_offsetof(class Table_triggers_list, connection_cl_names), -+ static_cast(my_offsetof(class Table_triggers_list, connection_cl_names)), - FILE_OPTIONS_STRLIST - }, - { - { STRING_WITH_LEN("db_cl_names") }, -- my_offsetof(class Table_triggers_list, db_cl_names), -+ static_cast(my_offsetof(class Table_triggers_list, db_cl_names)), - FILE_OPTIONS_STRLIST - }, - { - { STRING_WITH_LEN("created") }, -- my_offsetof(class Table_triggers_list, create_times), -+ static_cast(my_offsetof(class Table_triggers_list, create_times)), - FILE_OPTIONS_ULLLIST - }, - { { 0, 0 }, 0, FILE_OPTIONS_STRING } -@@ -217,7 +217,7 @@ static File_option triggers_file_paramet - File_option sql_modes_parameters= - { - { STRING_WITH_LEN("sql_modes") }, -- my_offsetof(class Table_triggers_list, definition_modes_list), -+ static_cast(my_offsetof(class Table_triggers_list, definition_modes_list)), - FILE_OPTIONS_ULLLIST - }; - Property changes on: head/databases/mariadb103-server/files/patch-sql_sql__trigger.cc ___________________________________________________________________ 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/mariadb103-server/files/patch-sql_sys__vars.cc =================================================================== --- head/databases/mariadb103-server/files/patch-sql_sys__vars.cc (revision 474505) +++ head/databases/mariadb103-server/files/patch-sql_sys__vars.cc (nonexistent) @@ -1,40 +0,0 @@ -Fix clang build error - ---- sql/sys_vars.cc.orig 2017-05-14 23:13:18 UTC -+++ sql/sys_vars.cc -@@ -1067,7 +1067,7 @@ static Sys_var_ulong Sys_interactive_tim - "connection before closing it", - NO_SET_STMT SESSION_VAR(net_interactive_timeout), - CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_ulonglong Sys_join_buffer_size( - "join_buffer_size", -@@ -2242,7 +2242,7 @@ static Sys_var_ulong Sys_net_read_timeou - "Number of seconds to wait for more data from a connection before " - "aborting the read", - SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_read_timeout)); - -@@ -2257,7 +2257,7 @@ static Sys_var_ulong Sys_net_write_timeo - "Number of seconds to wait for a block to be written to a connection " - "before aborting the write", - SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_write_timeout)); - -@@ -3505,7 +3505,7 @@ static Sys_var_ulong Sys_net_wait_timeou - "The number of seconds the server waits for activity on a " - "connection before closing it", - NO_SET_STMT SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), -+ VALID_RANGE(1, INT_MAX32/1000), - DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_plugin Sys_default_storage_engine( Property changes on: head/databases/mariadb103-server/files/patch-sql_sys__vars.cc ___________________________________________________________________ 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/mariadb103-server/files/patch-sql_sql__view.cc =================================================================== --- head/databases/mariadb103-server/files/patch-sql_sql__view.cc (revision 474505) +++ head/databases/mariadb103-server/files/patch-sql_sql__view.cc (nonexistent) @@ -1,67 +0,0 @@ ---- sql/sql_view.cc.orig 2018-02-26 04:27:17.000000000 +0100 -+++ sql/sql_view.cc 2018-02-27 20:56:59.769528000 +0100 -@@ -753,49 +753,49 @@ static const int required_view_parameter - */ - static File_option view_parameters[]= - {{{ STRING_WITH_LEN("query")}, -- my_offsetof(TABLE_LIST, select_stmt), -+ static_cast(my_offsetof(TABLE_LIST, select_stmt)), - FILE_OPTIONS_ESTRING}, - {{ STRING_WITH_LEN("md5")}, -- my_offsetof(TABLE_LIST, md5), -+ static_cast(my_offsetof(TABLE_LIST, md5)), - FILE_OPTIONS_STRING}, - {{ STRING_WITH_LEN("updatable")}, -- my_offsetof(TABLE_LIST, updatable_view), -+ static_cast(my_offsetof(TABLE_LIST, updatable_view)), - FILE_OPTIONS_ULONGLONG}, - {{ STRING_WITH_LEN("algorithm")}, -- my_offsetof(TABLE_LIST, algorithm), -+ static_cast(my_offsetof(TABLE_LIST, algorithm)), - FILE_OPTIONS_VIEW_ALGO}, - {{ STRING_WITH_LEN("definer_user")}, -- my_offsetof(TABLE_LIST, definer.user), -+ static_cast(my_offsetof(TABLE_LIST, definer.user)), - FILE_OPTIONS_STRING}, - {{ STRING_WITH_LEN("definer_host")}, -- my_offsetof(TABLE_LIST, definer.host), -+ static_cast(my_offsetof(TABLE_LIST, definer.host)), - FILE_OPTIONS_STRING}, - {{ STRING_WITH_LEN("suid")}, -- my_offsetof(TABLE_LIST, view_suid), -+ static_cast(my_offsetof(TABLE_LIST, view_suid)), - FILE_OPTIONS_ULONGLONG}, - {{ STRING_WITH_LEN("with_check_option")}, -- my_offsetof(TABLE_LIST, with_check), -+ static_cast(my_offsetof(TABLE_LIST, with_check)), - FILE_OPTIONS_ULONGLONG}, - {{ STRING_WITH_LEN("timestamp")}, -- my_offsetof(TABLE_LIST, timestamp), -+ static_cast(my_offsetof(TABLE_LIST, timestamp)), - FILE_OPTIONS_TIMESTAMP}, - {{ STRING_WITH_LEN("create-version")}, -- my_offsetof(TABLE_LIST, file_version), -+ static_cast(my_offsetof(TABLE_LIST, file_version)), - FILE_OPTIONS_ULONGLONG}, - {{ STRING_WITH_LEN("source")}, -- my_offsetof(TABLE_LIST, source), -+ static_cast(my_offsetof(TABLE_LIST, source)), - FILE_OPTIONS_ESTRING}, - {{(char*) STRING_WITH_LEN("client_cs_name")}, -- my_offsetof(TABLE_LIST, view_client_cs_name), -+ static_cast(my_offsetof(TABLE_LIST, view_client_cs_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("connection_cl_name")}, -- my_offsetof(TABLE_LIST, view_connection_cl_name), -+ static_cast(my_offsetof(TABLE_LIST, view_connection_cl_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("view_body_utf8")}, -- my_offsetof(TABLE_LIST, view_body_utf8), -+ static_cast(my_offsetof(TABLE_LIST, view_body_utf8)), - FILE_OPTIONS_ESTRING}, - {{ STRING_WITH_LEN("mariadb-version")}, -- my_offsetof(TABLE_LIST, mariadb_version), -+ static_cast(my_offsetof(TABLE_LIST, mariadb_version)), - FILE_OPTIONS_ULONGLONG}, - {{NullS, 0}, 0, - FILE_OPTIONS_STRING} Property changes on: head/databases/mariadb103-server/files/patch-sql_sql__view.cc ___________________________________________________________________ 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/mariadb103-server/files/patch-sql_slave.cc =================================================================== --- head/databases/mariadb103-server/files/patch-sql_slave.cc (revision 474505) +++ head/databases/mariadb103-server/files/patch-sql_slave.cc (nonexistent) @@ -1,14 +0,0 @@ ---- sql/slave.cc.orig 2017-05-14 23:13:18 UTC -+++ sql/slave.cc -@@ -14,6 +14,11 @@ - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#define ERR_remove_state(X) -+#elif defined(HAVE_ERR_remove_thread_state) -+#define ERR_remove_state(X) ERR_remove_thread_state(NULL) -+#endif - - /** - @addtogroup Replication Property changes on: head/databases/mariadb103-server/files/patch-sql_slave.cc ___________________________________________________________________ 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/mariadb103-server/files/extra-patch-include_my__compare.h =================================================================== --- head/databases/mariadb103-server/files/extra-patch-include_my__compare.h (revision 474505) +++ head/databases/mariadb103-server/files/extra-patch-include_my__compare.h (nonexistent) @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200 -+++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200 -@@ -40,7 +40,7 @@ - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. - */ - --#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define HA_MAX_KEY_SEG 32 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) Property changes on: head/databases/mariadb103-server/files/extra-patch-include_my__compare.h ___________________________________________________________________ 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/mariadb103-server/files/patch-extra_CMakeLists.txt =================================================================== --- head/databases/mariadb103-server/files/patch-extra_CMakeLists.txt (revision 474505) +++ head/databases/mariadb103-server/files/patch-extra_CMakeLists.txt (revision 474506) @@ -1,16 +1,16 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options --- extra/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC +++ extra/CMakeLists.txt @@ -96,9 +96,11 @@ IF(UNIX) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) TARGET_LINK_LIBRARIES(mysql_waitpid mysys) - +ENDIF() + MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server) TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys) ENDIF() Index: head/databases/mariadb103-server/files/patch-mysys_my__default.c =================================================================== --- head/databases/mariadb103-server/files/patch-mysys_my__default.c (revision 474505) +++ head/databases/mariadb103-server/files/patch-mysys_my__default.c (revision 474506) @@ -1,52 +1,52 @@ --- mysys/my_default.c.orig 2017-05-14 23:13:17 UTC +++ mysys/my_default.c @@ -785,7 +785,7 @@ static int search_default_file_with_ext( { MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(0))) - return 1; + return 0; /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by @@ -803,6 +803,14 @@ static int search_default_file_with_ext( if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) 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", ++ "error: Config file %s in invalid location, please move to or merge with %%PREFIX%%%s\n", + name,name); + goto err; + } + while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) { line++; @@ -1067,7 +1075,8 @@ void my_print_default_files(const char * if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ *end++= '.'; strxmov(end, conf_file, *ext, " ", NullS); - fputs(name, stdout); + if (strstr(name, "/etc") != name) + fputs(name, stdout); } } } @@ -1192,13 +1201,10 @@ static const char **init_default_directo #else -#if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR[0]) - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); -#else errors += add_directory(alloc, "/etc/", dirs); errors += add_directory(alloc, "/etc/mysql/", dirs); -#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); ++ errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs); ++ errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs); #endif Index: head/databases/mariadb103-server/files/patch-scripts_mysql__config.sh =================================================================== --- head/databases/mariadb103-server/files/patch-scripts_mysql__config.sh (revision 474505) +++ head/databases/mariadb103-server/files/patch-scripts_mysql__config.sh (revision 474506) @@ -1,12 +1,12 @@ --- scripts/mysql_config.sh.orig 2017-05-24 09:15:23 UTC +++ scripts/mysql_config.sh @@ -106,7 +106,9 @@ fi # Create options libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" -+libs="$libs -L/usr/local/lib " ++libs="$libs -L%%LOCALBASE%%/lib " embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" -+embedded_libs="$embedded_libs -L/usr/local/lib " ++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " include="-I$pkgincludedir" if [ "$basedir" != "/usr" ]; then Index: head/databases/mariadb103-server/files/patch-sql_semisync__master__ack__receiver.cc =================================================================== --- head/databases/mariadb103-server/files/patch-sql_semisync__master__ack__receiver.cc (nonexistent) +++ head/databases/mariadb103-server/files/patch-sql_semisync__master__ack__receiver.cc (revision 474506) @@ -0,0 +1,13 @@ +diff --git a/sql/semisync_master_ack_receiver.cc b/sql/semisync_master_ack_rece> +index ac17c7de40b..fc36ee35d5d 100644 +--- sql/semisync_master_ack_receiver.cc.orig ++++ sql/semisync_master_ack_receiver.cc +@@ -43,8 +43,7 @@ Ack_receiver::Ack_receiver() + DBUG_ENTER("Ack_receiver::Ack_receiver"); + + m_status= ST_DOWN; +- mysql_mutex_init(key_LOCK_ack_receiver, &m_mutex, +- MY_MUTEX_INIT_FAST); ++ mysql_mutex_init(key_LOCK_ack_receiver, &m_mutex, NULL); + mysql_cond_init(key_COND_ack_receiver, &m_cond, NULL); + m_pid= 0; Property changes on: head/databases/mariadb103-server/files/patch-sql_semisync__master__ack__receiver.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake =================================================================== --- head/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake (nonexistent) +++ head/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake (revision 474506) @@ -0,0 +1,18 @@ +--- storage/rocksdb/build_rocksdb.cmake.orig 2018-06-25 11:13:28 UTC ++++ storage/rocksdb/build_rocksdb.cmake +@@ -69,15 +69,9 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD + SET(CMAKE_REQUIRED_LIBRARIES zstd) + CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID) + UNSET(CMAKE_REQUIRED_LIBRARIES) +- if (WITH_ROCKSDB_ZSTD STREQUAL "ON" AND NOT ZSTD_VALID) +- MESSAGE(FATAL_ERROR +- "WITH_ROCKSDB_ZSTD is ON and ZSTD library was found, but the version needs to be >= 1.1.3") +- endif() +- if (ZSTD_VALID) + add_definitions(-DZSTD) + include_directories(${ZSTD_INCLUDE_DIR}) + list(APPEND THIRDPARTY_LIBS ${ZSTD_LIBRARY}) +- endif() + endif() + + add_definitions(-DZLIB) Property changes on: head/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake ___________________________________________________________________ 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/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake =================================================================== --- head/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (revision 474505) +++ head/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (revision 474506) @@ -1,39 +1,39 @@ Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports --- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2017-05-14 23:13:20 UTC +++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake @@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB) endif () endif () +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + include_directories("/usr/include") + + add_library(lzma SHARED IMPORTED) + set_target_properties(lzma PROPERTIES IMPORTED_LOCATION + "/usr/lib/liblzma.so") +ELSE() ## add lzma with an external project set(xz_configure_opts --with-pic --enable-static) if (APPLE) @@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED) set_target_properties(lzma PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a") add_dependencies(lzma build_lzma) +ENDIF() +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ include_directories("/usr/local/include") ++ include_directories("%%LOCALBASE%%/include") + add_library(snappy SHARED IMPORTED) + set_target_properties(snappy PROPERTIES IMPORTED_LOCATION -+ "/usr/local/lib/libsnappy.so") ++ "%%LOCALBASE%%/lib/libsnappy.so") +ELSE() ## add snappy with an external project set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.") if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt") @@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED) set_target_properties(snappy PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a") add_dependencies(snappy build_snappy) +ENDIF() Index: head/databases/mariadb103-server/pkg-plist =================================================================== --- head/databases/mariadb103-server/pkg-plist (revision 474505) +++ head/databases/mariadb103-server/pkg-plist (revision 474506) @@ -1,180 +1,265 @@ bin/aria_chk bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log bin/innochecksum bin/mariabackup bin/mbstream @comment bin/msql2mysql @comment bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack %%ROCKSDB%%bin/myrocks_hotbackup bin/mysql_client_test bin/mysql_client_test_embedded @comment bin/mysql_config @comment bin/mysql_convert_table_format bin/mysql_embedded @comment bin/mysql_find_rows bin/mysql_fix_extensions bin/mysql_install_db %%ROCKSDB%%bin/mysql_ldb bin/mysql_plugin bin/mysql_secure_installation @comment bin/mysql_setpermission @comment bin/mysql_tzinfo_to_sql @comment bin/mysql_upgrade @comment bin/mysqlaccess bin/mysqld_multi bin/mysqld_safe bin/mysqld_safe_helper bin/mysqldumpslow @comment bin/mysqlhotcopy @comment bin/mysqltest @comment bin/mysqltest_embedded @comment bin/mytop @comment bin/perror @comment bin/replace bin/resolve_stack_dump bin/resolveip %%ROCKSDB%%bin/sst_dump +@comment bin/test-connect-t %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump -bin/wsrep_sst_common -bin/wsrep_sst_mariabackup -bin/wsrep_sst_mysqldump -bin/wsrep_sst_rsync -bin/wsrep_sst_xtrabackup -bin/wsrep_sst_xtrabackup-v2 +%%WSREP%%bin/wsrep_sst_common +%%WSREP%%bin/wsrep_sst_mariabackup +%%WSREP%%bin/wsrep_sst_mysqldump +%%WSREP%%bin/wsrep_sst_rsync +%%WSREP%%bin/wsrep_sst_rsync_wan +%%WSREP%%bin/wsrep_sst_xtrabackup +%%WSREP%%bin/wsrep_sst_xtrabackup-v2 @comment include/mysql/my_config.h @comment include/mysql/my_global.h @comment include/mysql/my_sys.h @comment include/mysql/mysql_com.h @comment include/mysql/mysql_version.h @comment include/mysql/mysqld_error.h -include/mysql/server/private/embedded_priv.h -@comment lib/mysql/libmariadb.so -@comment lib/mysql/libmariadb.so.3 +include/mysql/server/big_endian.h +include/mysql/server/byte_order_generic.h +include/mysql/server/byte_order_generic_x86.h +include/mysql/server/byte_order_generic_x86_64.h +include/mysql/server/decimal.h +include/mysql/server/errmsg.h +include/mysql/server/handler_ername.h +include/mysql/server/handler_state.h +include/mysql/server/json_lib.h +include/mysql/server/keycache.h +include/mysql/server/little_endian.h +include/mysql/server/m_ctype.h +include/mysql/server/m_string.h +include/mysql/server/ma_dyncol.h +include/mysql/server/my_alloc.h +include/mysql/server/my_attribute.h +include/mysql/server/my_byteorder.h +include/mysql/server/my_compiler.h +include/mysql/server/my_config.h +include/mysql/server/my_dbug.h +include/mysql/server/my_decimal_limits.h +include/mysql/server/my_dir.h +include/mysql/server/my_getopt.h +include/mysql/server/my_global.h +include/mysql/server/my_list.h +include/mysql/server/my_net.h +include/mysql/server/my_pthread.h +include/mysql/server/my_sys.h +include/mysql/server/my_valgrind.h +include/mysql/server/my_xml.h +include/mysql/server/mysql.h +include/mysql/server/mysql/auth_dialog_client.h +include/mysql/server/mysql/client_plugin.h +include/mysql/server/mysql/plugin.h +include/mysql/server/mysql/plugin_audit.h +include/mysql/server/mysql/plugin_auth.h +include/mysql/server/mysql/plugin_auth_common.h +include/mysql/server/mysql/plugin_encryption.h +include/mysql/server/mysql/plugin_ftparser.h +include/mysql/server/mysql/plugin_password_validation.h +include/mysql/server/mysql/psi/mysql_file.h +include/mysql/server/mysql/psi/mysql_idle.h +include/mysql/server/mysql/psi/mysql_socket.h +include/mysql/server/mysql/psi/mysql_stage.h +include/mysql/server/mysql/psi/mysql_statement.h +include/mysql/server/mysql/psi/mysql_table.h +include/mysql/server/mysql/psi/mysql_thread.h +include/mysql/server/mysql/psi/psi.h +include/mysql/server/mysql/psi/psi_abi_v0.h +include/mysql/server/mysql/psi/psi_abi_v1.h +include/mysql/server/mysql/psi/psi_abi_v2.h +include/mysql/server/mysql/psi/psi_base.h +include/mysql/server/mysql/psi/psi_memory.h +include/mysql/server/mysql/service_base64.h +include/mysql/server/mysql/service_debug_sync.h +include/mysql/server/mysql/service_encryption.h +include/mysql/server/mysql/service_encryption_scheme.h +include/mysql/server/mysql/service_kill_statement.h +include/mysql/server/mysql/service_logger.h +include/mysql/server/mysql/service_md5.h +include/mysql/server/mysql/service_my_crypt.h +include/mysql/server/mysql/service_my_print_error.h +include/mysql/server/mysql/service_my_snprintf.h +include/mysql/server/mysql/service_progress_report.h +include/mysql/server/mysql/service_sha1.h +include/mysql/server/mysql/service_sha2.h +include/mysql/server/mysql/service_thd_alloc.h +include/mysql/server/mysql/service_thd_autoinc.h +include/mysql/server/mysql/service_thd_error_context.h +include/mysql/server/mysql/service_thd_rnd.h +include/mysql/server/mysql/service_thd_specifics.h +include/mysql/server/mysql/service_thd_timezone.h +include/mysql/server/mysql/service_thd_wait.h +include/mysql/server/mysql/service_wsrep.h +include/mysql/server/mysql/services.h +include/mysql/server/mysql_com.h +include/mysql/server/mysql_com_server.h +include/mysql/server/mysql_embed.h +include/mysql/server/mysql_time.h +include/mysql/server/mysql_version.h +include/mysql/server/mysqld_ername.h +include/mysql/server/mysqld_error.h +include/mysql/server/pack.h +include/mysql/server/sql_common.h +include/mysql/server/sql_state.h +include/mysql/server/sslopt-case.h +include/mysql/server/sslopt-longopts.h +include/mysql/server/sslopt-vars.h +include/mysql/server/typelib.h @comment lib/mysql/libmariadbclient.a lib/mysql/libmariadbd.a lib/mysql/libmariadbd.so lib/mysql/libmariadbd.so.19 @comment lib/mysql/libmysqlclient.a @comment lib/mysql/libmysqlclient.so @comment lib/mysql/libmysqlclient_r.a @comment lib/mysql/libmysqlclient_r.so lib/mysql/libmysqld.a lib/mysql/libmysqld.so lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth_0x0100.so lib/mysql/plugin/auth_ed25519.so %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_socket.so lib/mysql/plugin/auth_test_plugin.so @comment lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/debug_key_management.so @comment lib/mysql/plugin/dialog.so lib/mysql/plugin/dialog_examples.so lib/mysql/plugin/example_key_management.so lib/mysql/plugin/file_key_management.so lib/mysql/plugin/ha_archive.so lib/mysql/plugin/ha_blackhole.so lib/mysql/plugin/ha_connect.so lib/mysql/plugin/ha_federated.so lib/mysql/plugin/ha_federatedx.so %%MROONGA%%lib/mysql/plugin/ha_mroonga.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so %%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so %%SPHINX%%lib/mysql/plugin/ha_sphinx.so %%SPIDER%%lib/mysql/plugin/ha_spider.so %%TOKUDB%%lib/mysql/plugin/ha_tokudb.so lib/mysql/plugin/ha_test_sql_discovery.so lib/mysql/plugin/handlersocket.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/locales.so lib/mysql/plugin/metadata_lock_info.so lib/mysql/plugin/mypluglib.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/query_cache_info.so lib/mysql/plugin/query_response_time.so lib/mysql/plugin/server_audit.so lib/mysql/plugin/simple_password_check.so lib/mysql/plugin/sql_errlog.so lib/mysql/plugin/test_versioning.so -lib/mysql/plugin/wsrep_info.so +%%WSREP%%lib/mysql/plugin/wsrep_info.so libexec/mysqld man/man1/aria_chk.1.gz man/man1/aria_dump_log.1.gz man/man1/aria_ftdump.1.gz man/man1/aria_pack.1.gz man/man1/aria_read_log.1.gz man/man1/galera_new_cluster.1.gz man/man1/galera_recovery.1.gz man/man1/innochecksum.1.gz @comment man/man1/mariadb-service-convert.1.gz @comment 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 @comment man/man1/mysql_convert_table_format.1.gz man/man1/mysql_fix_extensions.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_secure_installation.1.gz @comment man/man1/mysql_setpermission.1.gz @comment man/man1/mysql_tzinfo_to_sql.1.gz @comment man/man1/mysql_upgrade.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqld_safe_helper.1.gz man/man1/mysqldumpslow.1.gz @comment man/man1/mysqlhotcopy.1.gz @comment man/man1/mysqltest.1.gz @comment man/man1/perror.1.gz @comment man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz %%TOKUDB%%man/man1/tokuft_logdump.1.gz %%TOKUDB%%man/man1/tokuftdump.1.gz -man/man1/wsrep_sst_common.1.gz -man/man1/wsrep_sst_mysqldump.1.gz -man/man1/wsrep_sst_rsync.1.gz -man/man1/wsrep_sst_xtrabackup-v2.1.gz -man/man1/wsrep_sst_xtrabackup.1.gz +%%WSREP%%man/man1/wsrep_sst_common.1.gz +%%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz +%%WSREP%%man/man1/wsrep_sst_rsync.1.gz +%%WSREP%%man/man1/wsrep_sst_xtrabackup-v2.1.gz +%%WSREP%%man/man1/wsrep_sst_xtrabackup.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/magic %%SPIDER%%%%DATADIR%%/install_spider.sql %%DATADIR%%/maria_add_gis_sp.sql %%DATADIR%%/maria_add_gis_sp_bootstrap.sql -%%MROONGA%%%%DATADIR%%/mroonga/install.sql -%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql -%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_performance_tables.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysql_test_db.sql %%DATADIR%%/mysql_to_mariadb.sql %%DATADIR%%/mysqld_multi.server -%%DATADIR%%/wsrep.cnf -%%DATADIR%%/wsrep_notify +%%WSREP%%%%DATADIR%%/wsrep.cnf +%%WSREP%%%%DATADIR%%/wsrep_notify @comment %%DOCSDIR%%/COPYING @comment %%DOCSDIR%%/COPYING.thirdparty @comment share/groonga-normalizer-mysql/lgpl-2.0.txt @comment share/groonga/COPYING @comment storage/groonga/COPYING @comment share/mysql/mroonga/COPYING %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga/README.md @comment share/pkgconfig/mariadb.pc