Index: head/databases/mariadb103-client/Makefile =================================================================== --- head/databases/mariadb103-client/Makefile (revision 482973) +++ head/databases/mariadb103-client/Makefile (revision 482974) @@ -1,39 +1,37 @@ # Created by: Bernard Spil # $FreeBSD$ PORTNAME= mariadb PORTREVISION= 0 PKGNAMESUFFIX= 103-client COMMENT= Multithreaded SQL database (client) -BROKEN_aarch64= fails to link: missing sbrk - MASTERDIR= ${.CURDIR}/../mariadb103-server FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist CMAKE_ARGS+= -DWITHOUT_SERVER=1 \ -DCONC_WITH_UNITTEST=0 \ -DCONC_WITH_MYSQLCOMPAT=1 \ -DWITH_WSREP=0 USE_LDCONFIG= ${PREFIX}/lib/mysql CLIENT_ONLY= yes post-configure: ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ -e 's|(#define LIBS.*)"\\ $$|\1 -L${PREFIX}/lib "\\|' \ ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c post-install: ${RM} -r ${STAGEDIR}${DATADIR}/policy \ ${STAGEDIR}${PREFIX}/include/mysql/server post-install-GSSAPI_NONE: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so .include "${MASTERDIR}/Makefile" Index: head/databases/mariadb103-client/files/patch-MDEV-15961 =================================================================== --- head/databases/mariadb103-client/files/patch-MDEV-15961 (nonexistent) +++ head/databases/mariadb103-client/files/patch-MDEV-15961 (revision 482974) @@ -0,0 +1,50 @@ +MDEV-15961: Fix stacktraces under FreeBSD + +https://jira.mariadb.org/browse/MDEV-15961 +--- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC ++++ mysys/stacktrace.c +@@ -34,19 +34,19 @@ + #include + #endif + ++#ifdef __linux__ + #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) +- + static char *heap_start; +- +-#if(defined HAVE_BSS_START) && !(defined __linux__) + extern char *__bss_start; +-#endif ++#else ++#define PTR_SANE(p) (p) ++#endif /* __linux */ + + void my_init_stacktrace() + { +-#if(defined HAVE_BSS_START) && !(defined __linux__) ++#ifdef __linux__ + heap_start = (char*) &__bss_start; +-#endif ++#endif /* __linux__ */ + } + + #ifdef __linux__ +@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad + + int my_safe_print_str(const char* val, size_t max_len) + { ++#ifdef __linux__ ++/* Only needed by the linux version of PTR_SANE */ + char *heap_end; + +-#ifdef __linux__ + // Try and make use of /proc filesystem to safely print memory contents. + if (!safe_print_str(val, max_len)) + return 0; +-#endif + + heap_end= (char*) sbrk(0); ++#endif + + if (!PTR_SANE(val)) + { Property changes on: head/databases/mariadb103-client/files/patch-MDEV-15961 ___________________________________________________________________ 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-client/pkg-plist =================================================================== --- head/databases/mariadb103-client/pkg-plist (revision 482973) +++ head/databases/mariadb103-client/pkg-plist (revision 482974) @@ -1,192 +1,169 @@ bin/mariadb_config bin/msql2mysql bin/mysql bin/mysql_config -bin/mysql_convert_table_format bin/mysql_find_rows @comment bin/mysql_install_db @comment bin/mysql_plugin @comment bin/mysql_secure_installation -bin/mysql_setpermission -bin/mysql_upgrade bin/mysql_waitpid @comment bin/mysqld_safe_helper bin/mysqlaccess bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump -bin/mysqlhotcopy bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysqltest -bin/my_print_defaults @comment bin/mytop @comment bin/perror -bin/replace @comment bin/resolve_stack_dump @comment bin/resolveip +@comment bin/wsrep_sst_rsync_wan include/mysql/errmsg.h include/mysql/ma_list.h include/mysql/ma_pvio.h include/mysql/ma_tls.h include/mysql/mariadb/ma_io.h include/mysql/mariadb_com.h include/mysql/mariadb_ctype.h include/mysql/mariadb_dyncol.h include/mysql/mariadb_stmt.h include/mysql/mariadb_version.h include/mysql/my_config.h include/mysql/my_global.h include/mysql/my_sys.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_version.h include/mysql/mysql/client_plugin.h include/mysql/mysql/plugin_auth.h include/mysql/mysql/plugin_auth_common.h include/mysql/mysqld_error.h %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so lib/mysql/libmariadb.so lib/mysql/libmariadb.so.3 lib/mysql/libmariadbclient.a lib/mysql/libmysqlservices.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so @comment lib/mysql/plugin/client_ed25519.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/sha256_password.so @comment man/man1/aria_chk.1.gz @comment man/man1/aria_dump_log.1.gz @comment man/man1/aria_ftdump.1.gz @comment man/man1/aria_pack.1.gz @comment man/man1/aria_read_log.1.gz @comment man/man1/galera_new_cluster.1.gz @comment man/man1/galera_recovery.1.gz @comment man/man1/innochecksum.1.gz @comment man/man1/mariadb-service-convert.1.gz +@comment man/man1/mariabackup.1.gz man/man1/msql2mysql.1.gz -man/man1/my_print_defaults.1.gz +@comment man/man1/mbstream.1.gz +@comment man/man1/my_print_defaults.1.gz man/man1/my_safe_process.1.gz @comment man/man1/myisam_ftdump.1.gz @comment man/man1/myisamchk.1.gz @comment man/man1/myisamlog.1.gz @comment man/man1/myisampack.1.gz man/man1/mysql-stress-test.pl.1.gz man/man1/mysql-test-run.pl.1.gz man/man1/mysql.1.gz @comment man/man1/mysql.server.1.gz man/man1/mysql_client_test.1.gz man/man1/mysql_client_test_embedded.1.gz man/man1/mysql_config.1.gz man/man1/mysql_convert_table_format.1.gz +@comment man/man1/mysql_embedded.1.gz man/man1/mysql_find_rows.1.gz @comment man/man1/mysql_fix_extensions.1.gz @comment man/man1/mysql_install_db.1.gz +@comment man/man1/mysql_ldb.1.gz man/man1/mysql_plugin.1.gz @comment man/man1/mysql_secure_installation.1.gz man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/mysql_waitpid.1.gz man/man1/mysqlaccess.1.gz man/man1/mysqladmin.1.gz man/man1/mysqlbinlog.1.gz man/man1/mysqlcheck.1.gz @comment man/man1/mysqld_multi.1.gz @comment man/man1/mysqld_safe.1.gz @comment man/man1/mysqld_safe_helper.1.gz man/man1/mysqldump.1.gz @comment man/man1/mysqldumpslow.1.gz man/man1/mysqlhotcopy.1.gz man/man1/mysqlimport.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz man/man1/mysqltest.1.gz man/man1/mysqltest_embedded.1.gz @comment man/man1/perror.1.gz man/man1/replace.1.gz @comment man/man1/resolve_stack_dump.1.gz @comment man/man1/resolveip.1.gz @comment man/man1/tokuft_logdump.1.gz +man/man1/tokuft_logprint.1.gz @comment man/man1/tokuftdump.1.gz @comment man/man1/wsrep_sst_common.1.gz +@comment man/man1/wsrep_sst_mariabackup.1.gz @comment man/man1/wsrep_sst_mysqldump.1.gz @comment man/man1/wsrep_sst_rsync.1.gz +@comment man/man1/wsrep_sst_rsync_wan.1.gz @comment man/man1/wsrep_sst_xtrabackup-v2.1.gz @comment man/man1/wsrep_sst_xtrabackup.1.gz @comment man/man8/mysqld.8.gz @comment share/aclocal/mysql.m4 %%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%%/dutch/errmsg.sys -%%DATADIR%%/english/errmsg.sys -%%DATADIR%%/errmsg-utf8.txt -%%DATADIR%%/estonian/errmsg.sys -%%DATADIR%%/french/errmsg.sys -%%DATADIR%%/german/errmsg.sys -%%DATADIR%%/greek/errmsg.sys -%%DATADIR%%/hindi/errmsg.sys -%%DATADIR%%/hungarian/errmsg.sys -%%DATADIR%%/italian/errmsg.sys -%%DATADIR%%/japanese/errmsg.sys -%%DATADIR%%/korean/errmsg.sys -%%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 @comment %%DATADIR%%/binary-configure @comment %%DATADIR%%/fill_help_tables.sql @comment %%DATADIR%%/magic @comment %%DATADIR%%/maria_add_gis_sp.sql @comment %%DATADIR%%/maria_add_gis_sp_bootstrap.sql @comment %%DATADIR%%/mysql-log-rotate @comment %%DATADIR%%/mysql.server @comment %%DATADIR%%/mysql_performance_tables.sql @comment %%DATADIR%%/mysql_system_tables.sql @comment %%DATADIR%%/mysql_system_tables_data.sql @comment %%DATADIR%%/mysql_test_data_timezone.sql @comment %%DATADIR%%/mysql_test_db.sql @comment %%DATADIR%%/mysql_to_mariadb.sql @comment %%DATADIR%%/mysqld_multi.server @comment %%DATADIR%%/wsrep.cnf @comment %%DATADIR%%/wsrep_notify share/pkgconfig/mariadb.pc Index: head/databases/mariadb103-server/Makefile =================================================================== --- head/databases/mariadb103-server/Makefile (revision 482973) +++ head/databases/mariadb103-server/Makefile (revision 482974) @@ -1,202 +1,212 @@ # Created by: Bernard Spil # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.8 -PORTREVISION?= 2 +PORTVERSION= 10.3.10 +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 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 WSREP OPTIONS_GROUP= COMPRESSION ENGINES GROONGA -OPTIONS_DEFINE= CONNECT_EXTRA WSREP DOCS +OPTIONS_DEFINE= CONNECT_EXTRA DOCS +OPTIONS_DEFINE_amd64= 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_OFF= -DPLUGIN_${ENGINE}=NO ${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 +WSREP_LIB_DEPENDS= libgalera.so:databases/galera ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 ZSTD_CMAKE_ON= -DWITH_ROCKSDB_ZSTD=ON ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" +.else +SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " +.endif + post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private - ${RM} -r `${FIND} ${STAGEDIR}${DATADIR} -type d -mindepth 1` + ${RM} -r ${STAGEDIR}${DATADIR}/charsets .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 ${ARCH} != amd64 +PLIST_SUB+= WSREP="@comment " +.endif .if ${OPSYS} == DragonFly CMAKE_ARGS+= -DWITHOUT_TOKUDB .endif post-patch: ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c ${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 482973) +++ head/databases/mariadb103-server/distinfo (revision 482974) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531382110 -SHA256 (mariadb-10.3.8.tar.gz) = 30bec17514d12d811a05757be46bd41724df28002cdec550d5c757b0b3f31ab8 -SIZE (mariadb-10.3.8.tar.gz) = 72152953 +TIMESTAMP = 1538732181 +SHA256 (mariadb-10.3.10.tar.gz) = 57767c048982811c7ab21d8527f6f36aa897386e8c7235f11b5505a924d68eda +SIZE (mariadb-10.3.10.tar.gz) = 70493771 Index: head/databases/mariadb103-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc =================================================================== --- head/databases/mariadb103-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc (revision 482973) +++ head/databases/mariadb103-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc (nonexistent) @@ -1,15 +0,0 @@ ---- storage/rocksdb/rocksdb/db/malloc_stats.cc.orig 2017-08-17 10:05:38 UTC -+++ storage/rocksdb/rocksdb/db/malloc_stats.cc -@@ -16,7 +16,12 @@ - namespace rocksdb { - - #ifdef ROCKSDB_JEMALLOC -+#ifdef __FreeBSD__ -+#include -+#define je_malloc_stats_print malloc_stats_print -+#else - #include "jemalloc/jemalloc.h" -+#endif - - typedef struct { - char* cur; Property changes on: head/databases/mariadb103-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.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_share_CMakeLists.txt =================================================================== --- head/databases/mariadb103-server/files/patch-sql_share_CMakeLists.txt (revision 482973) +++ head/databases/mariadb103-server/files/patch-sql_share_CMakeLists.txt (nonexistent) @@ -1,17 +0,0 @@ ---- sql/share/CMakeLists.txt.orig 2017-05-14 23:13:18 UTC -+++ sql/share/CMakeLists.txt -@@ -14,6 +14,8 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -+IF(FALSE) -+ - SET (dirs - danish - german -@@ -53,3 +55,5 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE - ) - - INSTALL(FILES ${files} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server) -+ -+ENDIF() Property changes on: head/databases/mariadb103-server/files/patch-sql_share_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_semisync__master__ack__receiver.cc =================================================================== --- head/databases/mariadb103-server/files/patch-sql_semisync__master__ack__receiver.cc (revision 482973) +++ head/databases/mariadb103-server/files/patch-sql_semisync__master__ack__receiver.cc (nonexistent) @@ -1,13 +0,0 @@ -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 ___________________________________________________________________ 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_CMakeLists.txt =================================================================== --- head/databases/mariadb103-server/files/patch-sql_CMakeLists.txt (revision 482973) +++ head/databases/mariadb103-server/files/patch-sql_CMakeLists.txt (nonexistent) @@ -1,28 +0,0 @@ ---- sql/CMakeLists.txt.orig 2017-08-17 10:05:40 UTC -+++ sql/CMakeLists.txt -@@ -386,6 +386,7 @@ ADD_CUSTOM_TARGET(distclean - VERBATIM - ) - -+IF(FALSE) - IF(INSTALL_LAYOUT STREQUAL "STANDALONE") - - # Copy db.opt into data/test/ -@@ -429,6 +430,7 @@ ELSE() - INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) - ENDIF(WIN32 AND MYSQLD_EXECUTABLE) - ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE") -+ENDIF() - - IF(WIN32) - SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql) -@@ -472,7 +474,9 @@ IF(WIN32) - TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) - ENDIF(WIN32) - -+IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN share EXCLUDE - PATTERN CMakeFiles EXCLUDE) -+ENDIF() Property changes on: head/databases/mariadb103-server/files/patch-sql_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/mysql-server.in =================================================================== --- head/databases/mariadb103-server/files/mysql-server.in (revision 482973) +++ head/databases/mariadb103-server/files/mysql-server.in (revision 482974) @@ -1,139 +1,140 @@ #!/bin/sh # $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $ # # PROVIDE: mysql # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable mysql: # mysql_(instance_)?enable (bool): Set to "NO" by default. # Set it to "YES" to enable MySQL. -# mysql_(instance_)?limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U mysql` -# just before mysql starts. +%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default. +%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` +%%LEGACY_LIMITS%%# just before mysql starts. # mysql_(instance_)?dbdir (str): Default to "/var/db/mysql" # Base database directory. # mysql_(instance_)?args (str): Custom additional arguments to be passed # to mysqld_safe (default empty). # mysql_(instance_)?pidfile (str): Custum PID file path and name. # Default to "${mysql_dbdir}/${hostname}.pid". # mysql_(instance_)?user (str): User to run mysqld as # Default to "mysql" created by the port # mysql_(instance_)?optfile (str): Server-specific option file. # Default to "${mysql_dbdir}/my.cnf". # mysql_instances (str): Set to "" by default. # If defined, list of instances to enable . /etc/rc.subr name="mysql" rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -: ${mysql_limits="NO"} +%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_user="mysql"} -: ${mysql_limits_args="-e -U $mysql_user"} +%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${mysql_dbdir="/var/db/mysql"} : ${mysql_optfile="${mysql_dbdir}/my.cnf"} command="/usr/sbin/daemon" procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" if [ -n "$2" ]; then instance="$2" load_rc_config ${name}_${instance} case "$mysql_instances" in "$2 "*|*" $2 "*|*" $2"|"$2") eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" - eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" + %%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" - eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" + %%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" ;; *) err 1 "$2 not found in mysql_instances" ;; esac else if [ -n "${mysql_instances}" -a -n "$1" ]; then for instance in ${mysql_instances}; do eval _enable="\${mysql_${instance}_enable}" case "${_enable:-${mysql_enable}}" in [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) continue ;; [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) ;; *) if [ -z "$_enable" ]; then _var=mysql_enable else _var=mysql_${instance}_enable fi warn "Bad value" \ "'${_enable:-${mysql_enable}}'" \ "for ${_var}. " \ "Instance ${instance} skipped." continue ;; esac echo "===> mysql instance: ${instance}" if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then success="${instance} ${success}" else failed="${instance} (${retcode}) ${failed}" fi done exit 0 else mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} fi fi pidfile=$mysql_pidfile mysql_install_db="%%PREFIX%%/bin/mysql_install_db" mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" mysql_create_auth_tables() { eval $mysql_install_db $mysql_install_db_args [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir} } mysql_prestart() { local dir for dir in /etc /etc/mysql; do if [ -f "${dir}/my.cnf" ]; then echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}" return 1 fi done if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 fi - if checkyesno mysql_limits; then - eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null - else - return 0 - fi +%%LEGACY_LIMITS%% if checkyesno mysql_limits; then +%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null +%%LEGACY_LIMITS%% else +%%LEGACY_LIMITS%% return 0 +%%LEGACY_LIMITS%% fi +%%MODERN_LIMITS%% return 0 } mysql_poststart() { local timeout=15 while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do timeout=$(( timeout - 1 )) sleep 1 done return 0 } run_rc_command "$1" Index: head/databases/mariadb103-server/files/patch-MDEV-15961 =================================================================== --- head/databases/mariadb103-server/files/patch-MDEV-15961 (nonexistent) +++ head/databases/mariadb103-server/files/patch-MDEV-15961 (revision 482974) @@ -0,0 +1,50 @@ +MDEV-15961: Fix stacktraces under FreeBSD + +https://jira.mariadb.org/browse/MDEV-15961 +--- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC ++++ mysys/stacktrace.c +@@ -34,19 +34,19 @@ + #include + #endif + ++#ifdef __linux__ + #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) +- + static char *heap_start; +- +-#if(defined HAVE_BSS_START) && !(defined __linux__) + extern char *__bss_start; +-#endif ++#else ++#define PTR_SANE(p) (p) ++#endif /* __linux */ + + void my_init_stacktrace() + { +-#if(defined HAVE_BSS_START) && !(defined __linux__) ++#ifdef __linux__ + heap_start = (char*) &__bss_start; +-#endif ++#endif /* __linux__ */ + } + + #ifdef __linux__ +@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad + + int my_safe_print_str(const char* val, size_t max_len) + { ++#ifdef __linux__ ++/* Only needed by the linux version of PTR_SANE */ + char *heap_end; + +-#ifdef __linux__ + // Try and make use of /proc filesystem to safely print memory contents. + if (!safe_print_str(val, max_len)) + return 0; +-#endif + + heap_end= (char*) sbrk(0); ++#endif + + if (!PTR_SANE(val)) + { Property changes on: head/databases/mariadb103-server/files/patch-MDEV-15961 ___________________________________________________________________ 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 (revision 482973) +++ head/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake (revision 482974) @@ -1,18 +1,13 @@ ---- storage/rocksdb/build_rocksdb.cmake.orig 2018-06-25 11:13:28 UTC +--- storage/rocksdb/build_rocksdb.cmake.orig 2018-10-02 09:45:43 UTC +++ storage/rocksdb/build_rocksdb.cmake -@@ -69,15 +69,9 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD +@@ -69,10 +69,6 @@ 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) + if (ZSTD_VALID) add_definitions(-DZSTD) include_directories(${ZSTD_INCLUDE_DIR}) - list(APPEND THIRDPARTY_LIBS ${ZSTD_LIBRARY}) -- endif() - endif() - - add_definitions(-DZLIB) Index: head/databases/mariadb103-server/pkg-plist =================================================================== --- head/databases/mariadb103-server/pkg-plist (revision 482973) +++ head/databases/mariadb103-server/pkg-plist (revision 482974) @@ -1,265 +1,299 @@ 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/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 %%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 data/test/db.opt @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/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 %%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/mariabackup.1.gz +man/man1/mbstream.1.gz +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 +%%ROCKSDB%%man/man1/mysql_ldb.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/tokuft_logprint.1.gz %%TOKUDB%%man/man1/tokuftdump.1.gz %%WSREP%%man/man1/wsrep_sst_common.1.gz +%%WSREP%%man/man1/wsrep_sst_mariabackup.1.gz %%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz %%WSREP%%man/man1/wsrep_sst_rsync.1.gz +%%WSREP%%man/man1/wsrep_sst_rsync_wan.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/AUTHORS +%%MROONGA%%%%DATADIR%%/mroonga/install.sql +%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%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%%/czech/errmsg.sys +%%DATADIR%%/danish/errmsg.sys +%%DATADIR%%/dutch/errmsg.sys +%%DATADIR%%/english/errmsg.sys +%%DATADIR%%/errmsg-utf8.txt +%%DATADIR%%/estonian/errmsg.sys +%%DATADIR%%/french/errmsg.sys +%%DATADIR%%/german/errmsg.sys +%%DATADIR%%/greek/errmsg.sys +%%DATADIR%%/hindi/errmsg.sys +%%DATADIR%%/hungarian/errmsg.sys +%%DATADIR%%/italian/errmsg.sys +%%DATADIR%%/japanese/errmsg.sys +%%DATADIR%%/korean/errmsg.sys +%%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 %%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