Index: head/databases/mariadb101-client/files/patch-build-fail-MDEV-12261 =================================================================== --- head/databases/mariadb101-client/files/patch-build-fail-MDEV-12261 (revision 440093) +++ head/databases/mariadb101-client/files/patch-build-fail-MDEV-12261 (nonexistent) @@ -1,236 +0,0 @@ -From 2c2bd8c1556b081fccd0fc3e010dc3ea2c38fffb Mon Sep 17 00:00:00 2001 -From: Sergei Golubchik -Date: Wed, 15 Mar 2017 11:46:54 +0100 -Subject: [PATCH] MDEV-12261 build failure without P_S - -restore mysql_file_delete_with_symlink() but let it use -new my_handler_delete_with_symlink() mysys helper. ---- - include/my_sys.h | 3 +-- - include/mysql/psi/mysql_file.h | 44 ++++++++++++++++++++++++++++++++++++++++ - mysys/my_symlink2.c | 14 ++++++------- - sql/handler.cc | 2 +- - sql/sql_db.cc | 6 +++--- - sql/table.cc | 2 +- - storage/maria/ma_delete_table.c | 8 ++++---- - storage/myisam/mi_delete_table.c | 8 ++++---- - 8 files changed, 64 insertions(+), 23 deletions(-) - -diff --git a/include/my_sys.h b/include/my_sys.h -index 4e129cc..5b0a114 100644 ---- include/my_sys.h.orig -+++ include/my_sys.h -@@ -597,8 +597,7 @@ extern File my_create_with_symlink(const char *linkname, const char *filename, - myf MyFlags); - extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags); - extern int my_symlink(const char *content, const char *linkname, myf MyFlags); --extern int my_handler_delete_with_symlink(PSI_file_key key, const char *name, -- const char *ext, myf sync_dir); -+extern int my_handler_delete_with_symlink(const char *filename, myf sync_dir); - - extern size_t my_read(File Filedes,uchar *Buffer,size_t Count,myf MyFlags); - extern size_t my_pread(File Filedes,uchar *Buffer,size_t Count,my_off_t offset, -diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h -index aca66bd..df94603 100644 ---- include/mysql/psi/mysql_file.h.orig -+++ include/mysql/psi/mysql_file.h -@@ -442,6 +442,20 @@ - #endif - - /** -+ @def mysql_file_delete_with_symlink(K, P1, P2, P3) -+ Instrumented delete with symbolic link. -+ @c mysql_file_delete_with_symlink is a replacement -+ for @c my_handler_delete_with_symlink. -+*/ -+#ifdef HAVE_PSI_FILE_INTERFACE -+ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ -+ inline_mysql_file_delete_with_symlink(K, __FILE__, __LINE__, P1, P2, P3) -+#else -+ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ -+ inline_mysql_file_delete_with_symlink(P1, P2, P3) -+#endif -+ -+/** - @def mysql_file_rename_with_symlink(K, P1, P2, P3) - Instrumented rename with symbolic link. - @c mysql_file_rename_with_symlink is a replacement -@@ -1294,6 +1308,7 @@ inline_mysql_file_rename( - return result; - } - -+ - static inline File - inline_mysql_file_create_with_symlink( - #ifdef HAVE_PSI_FILE_INTERFACE -@@ -1325,6 +1340,35 @@ inline_mysql_file_create_with_symlink( - - - static inline int -+inline_mysql_file_delete_with_symlink( -+#ifdef HAVE_PSI_FILE_INTERFACE -+ PSI_file_key key, const char *src_file, uint src_line, -+#endif -+ const char *name, const char *ext, myf flags) -+{ -+ int result; -+ char fullname[FN_REFLEN]; -+ fn_format(fullname, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); -+#ifdef HAVE_PSI_FILE_INTERFACE -+ struct PSI_file_locker *locker; -+ PSI_file_locker_state state; -+ locker= PSI_FILE_CALL(get_thread_file_name_locker) -+ (&state, key, PSI_FILE_DELETE, fullname, &locker); -+ if (likely(locker != NULL)) -+ { -+ PSI_FILE_CALL(start_file_close_wait)(locker, src_file, src_line); -+ result= my_handler_delete_with_symlink(fullname, flags); -+ PSI_FILE_CALL(end_file_close_wait)(locker, result); -+ return result; -+ } -+#endif -+ -+ result= my_handler_delete_with_symlink(fullname, flags); -+ return result; -+} -+ -+ -+static inline int - inline_mysql_file_rename_with_symlink( - #ifdef HAVE_PSI_FILE_INTERFACE - PSI_file_key key, const char *src_file, uint src_line, -diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c -index defcb59..c851468 100644 ---- mysys/my_symlink2.c.orig -+++ mysys/my_symlink2.c -@@ -170,22 +170,20 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags) - in this case both the symlink and the symlinked file are deleted, - but only if the symlinked file is not in the datadir. - */ --int my_handler_delete_with_symlink(PSI_file_key key, const char *name, -- const char *ext, myf sync_dir) -+int my_handler_delete_with_symlink(const char *filename, myf sync_dir) - { -- char orig[FN_REFLEN], real[FN_REFLEN]; -+ char real[FN_REFLEN]; - int res= 0; - DBUG_ENTER("my_handler_delete_with_symlink"); - -- fn_format(orig, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); -- if (my_is_symlink(orig)) -+ if (my_is_symlink(filename)) - { - /* - Delete the symlinked file only if the symlink is not - pointing into datadir. - */ -- if (!(my_realpath(real, orig, MYF(0)) || mysys_test_invalid_symlink(real))) -- res= mysql_file_delete(key, real, MYF(MY_NOSYMLINKS | sync_dir)); -+ if (!(my_realpath(real, filename, MYF(0)) || mysys_test_invalid_symlink(real))) -+ res= my_delete(real, MYF(MY_NOSYMLINKS | sync_dir)); - } -- DBUG_RETURN(mysql_file_delete(key, orig, MYF(sync_dir)) || res); -+ DBUG_RETURN(my_delete(filename, MYF(sync_dir)) || res); - } -diff --git a/sql/handler.cc b/sql/handler.cc -index 7fa8afd..fc70ed5 100644 ---- sql/handler.cc.orig -+++ sql/handler.cc -@@ -3850,7 +3850,7 @@ int handler::delete_table(const char *name) - - for (const char **ext=bas_ext(); *ext ; ext++) - { -- if (my_handler_delete_with_symlink(key_file_misc, name, *ext, 0)) -+ if (mysql_file_delete_with_symlink(key_file_misc, name, *ext, 0)) - { - if (my_errno != ENOENT) - { -diff --git a/sql/sql_db.cc b/sql/sql_db.cc -index 3f43a33..6c8c384 100644 ---- sql/sql_db.cc.orig -+++ sql/sql_db.cc -@@ -815,7 +815,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) - if there exists a table with the name 'db', so let's just do it - separately. We know this file exists and needs to be deleted anyway. - */ -- if (my_handler_delete_with_symlink(key_file_misc, path, "", MYF(0)) && -+ if (mysql_file_delete_with_symlink(key_file_misc, path, "", MYF(0)) && - my_errno != ENOENT) - { - my_error(EE_DELETE, MYF(0), path, my_errno); -@@ -1119,7 +1119,7 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp, - We ignore ENOENT error in order to skip files that was deleted - by concurrently running statement like REPAIR TABLE ... - */ -- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && -+ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && - my_errno != ENOENT) - { - my_error(EE_DELETE, MYF(0), filePath, my_errno); -@@ -1235,7 +1235,7 @@ long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path) - continue; - } - strxmov(filePath, org_path, "/", file->name, NullS); -- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) -+ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) - { - goto err; - } -diff --git a/sql/table.cc b/sql/table.cc -index 80d0e02..975d9d5 100644 ---- sql/table.cc.orig -+++ sql/table.cc -@@ -569,7 +569,7 @@ enum open_frm_error open_table_def(THD *thd, TABLE_SHARE *share, uint flags) - { - DBUG_ASSERT(flags & GTS_TABLE); - DBUG_ASSERT(flags & GTS_USE_DISCOVERY); -- my_handler_delete_with_symlink(key_file_frm, path, "", MYF(0)); -+ mysql_file_delete_with_symlink(key_file_frm, path, "", MYF(0)); - file= -1; - } - else -diff --git a/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c -index a9ab8e5..186075d 100644 ---- storage/maria/ma_delete_table.c.orig -+++ storage/maria/ma_delete_table.c -@@ -86,13 +86,13 @@ int maria_delete_table_files(const char - { - DBUG_ENTER("maria_delete_table_files"); - -- if (my_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, MYF(MY_WME | sync_dir)) || -- my_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, MYF(MY_WME | sync_dir))) -+ if (mysql_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, MYF(MY_WME | sync_dir)) || -+ mysql_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, MYF(MY_WME | sync_dir))) - DBUG_RETURN(my_errno); - - if (!temporary) { -- my_handler_delete_with_symlink(key_file_dfile, name, ".TMD", MYF(0)); -- my_handler_delete_with_symlink(key_file_dfile, name, ".OLD", MYF(0)); -+ mysql_handler_delete_with_symlink(key_file_dfile, name, ".TMD", MYF(0)); -+ mysql_handler_delete_with_symlink(key_file_dfile, name, ".OLD", MYF(0)); - } - DBUG_RETURN(0); - } -diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c -index 3422e6b..d766fb2 100644 ---- storage/myisam/mi_delete_table.c.orig -+++ storage/myisam/mi_delete_table.c -@@ -34,14 +34,14 @@ int mi_delete_table(const char *name) - check_table_is_closed(name,"delete"); - #endif - -- if (my_handler_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, MYF(MY_WME)) || -- my_handler_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, MYF(MY_WME))) -+ if (mysql_file_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, MYF(MY_WME)) || -+ mysql_file_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, MYF(MY_WME))) - DBUG_RETURN(my_errno); - - - // optionally present: -- my_handler_delete_with_symlink(mi_key_file_dfile, name, ".OLD", MYF(0)); -- my_handler_delete_with_symlink(mi_key_file_dfile, name, ".TMD", MYF(0)); -+ mysql_file_delete_with_symlink(mi_key_file_dfile, name, ".OLD", MYF(0)); -+ mysql_file_delete_with_symlink(mi_key_file_dfile, name, ".TMD", MYF(0)); - - DBUG_RETURN(0); - } Property changes on: head/databases/mariadb101-client/files/patch-build-fail-MDEV-12261 ___________________________________________________________________ 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/mariadb101-client/files/patch-CMakeLists.txt =================================================================== --- head/databases/mariadb101-client/files/patch-CMakeLists.txt (revision 440093) +++ head/databases/mariadb101-client/files/patch-CMakeLists.txt (revision 440094) @@ -1,26 +1,27 @@ ---- CMakeLists.txt.orig 2016-03-24 09:12:10 UTC +--- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC +++ CMakeLists.txt -@@ -380,7 +380,6 @@ ADD_SUBDIRECTORY(libmysql) +@@ -385,7 +385,7 @@ ADD_SUBDIRECTORY(libmysql) ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) -ADD_SUBDIRECTORY(sql/share) ++#ADD_SUBDIRECTORY(sql/share) IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(tests) -@@ -460,6 +459,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty + INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty EXCEPTIONS-CLIENT COMPONENT Readme) - # MDEV-6526 these files are not installed anymore -@@ -470,6 +470,7 @@ IF(UNIX) + +@@ -476,6 +477,7 @@ IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) ENDIF() +ENDIF() INCLUDE(CPack) Index: head/databases/mariadb101-client/pkg-plist =================================================================== --- head/databases/mariadb101-client/pkg-plist (revision 440093) +++ head/databases/mariadb101-client/pkg-plist (revision 440094) @@ -1,117 +1,119 @@ bin/msql2mysql bin/mysql bin/mysql_find_rows bin/mysqlaccess bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysql_config include/mysql/auth_dialog_client.h include/mysql/big_endian.h include/mysql/byte_order_generic.h include/mysql/byte_order_generic_x86.h include/mysql/byte_order_generic_x86_64.h include/mysql/client_plugin.h include/mysql/decimal.h include/mysql/errmsg.h include/mysql/handler_ername.h include/mysql/handler_state.h include/mysql/keycache.h include/mysql/little_endian.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/ma_dyncol.h include/mysql/my_alloc.h include/mysql/my_attribute.h include/mysql/my_byteorder.h include/mysql/my_compiler.h include/mysql/my_config.h include/mysql/my_dbug.h include/mysql/my_decimal_limits.h include/mysql/my_dir.h include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/my_net.h include/mysql/my_pthread.h include/mysql/my_sys.h include/mysql/my_valgrind.h include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_com_server.h include/mysql/mysql_embed.h include/mysql/mysql_time.h include/mysql/mysql_version.h include/mysql/mysqld_ername.h include/mysql/mysqld_error.h include/mysql/plugin.h include/mysql/plugin_audit.h include/mysql/plugin_auth.h include/mysql/plugin_auth_common.h include/mysql/plugin_encryption.h include/mysql/plugin_ftparser.h include/mysql/plugin_password_validation.h include/mysql/psi/mysql_file.h include/mysql/psi/mysql_idle.h include/mysql/psi/mysql_socket.h include/mysql/psi/mysql_stage.h include/mysql/psi/mysql_statement.h include/mysql/psi/mysql_table.h include/mysql/psi/mysql_thread.h include/mysql/psi/psi.h include/mysql/service_base64.h include/mysql/service_debug_sync.h include/mysql/service_encryption.h include/mysql/service_encryption_scheme.h include/mysql/service_kill_statement.h include/mysql/service_logger.h include/mysql/service_md5.h +include/mysql/service_my_crypt.h +include/mysql/service_my_print_error.h include/mysql/service_my_snprintf.h include/mysql/service_progress_report.h include/mysql/service_sha1.h include/mysql/service_sha2.h include/mysql/service_thd_alloc.h include/mysql/service_thd_autoinc.h include/mysql/service_thd_error_context.h include/mysql/service_thd_rnd.h include/mysql/service_thd_specifics.h include/mysql/service_thd_timezone.h include/mysql/service_thd_wait.h include/mysql/service_wsrep.h include/mysql/services.h include/mysql/sql_common.h include/mysql/sql_state.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.18 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.18 %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so lib/mysql/plugin/client_ed25519.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so man/man1/msql2mysql.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz man/man1/mysql_find_rows.1.gz man/man1/mysql_plugin.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 man/man1/mysqldump.1.gz man/man1/mysqlimport.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz Index: head/databases/mariadb101-server/Makefile =================================================================== --- head/databases/mariadb101-server/Makefile (revision 440093) +++ head/databases/mariadb101-server/Makefile (revision 440094) @@ -1,174 +1,174 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.22 -PORTREVISION?= 2 +PORTVERSION= 10.1.23 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ 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}/ PKGNAMESUFFIX?= 101-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_aarch64= Fails to link: missing sbrk BROKEN_powerpc64= Does not build: fatal error: sys/platform/ppc.h: No such file or directory SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb101-client USES= bison:build cmake compiler:c++11-lib cpe execinfo ncurses \ shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql OPTIONS_DEFINE= FASTMTX OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE FASTMTX_DESC= Replace mutexes with spinlocks .if !defined(CLIENT_ONLY) # MySQL-Server options OPTIONS_DEFINE+= MAXKEY OPTIONS_DEFAULT+= MAXKEY SPHINX SPIDER OPTIONS_GROUP= ENGINES OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB OPTIONS_EXCLUDE_i386= TOKUDB ENGINES_DESC= Optional MariaDB storage engines INNOBASE_DESC= Build InnoDB engine next to XtraDB MAXKEY_DESC= Change max key length from 1000 to 4000 MROONGA_DESC= Mroonga Full Text Search engine OQGRAPH_DESC= Open Query Graph Computation engine SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine .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" \ -DWITH_UNIT_TESTS=0 \ -DWITH_LIBWRAP=1 \ -DWITH_SSL=${OPENSSLBASE} \ -DKRB5_CONFIG=${KRB5CONFIG} \ -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" DATADIR= ${PREFIX}/share/mysql .ifdef USE_MYSQL .error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again. .endif CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb10[02-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ 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=NO .else # MySQL-Server part USES+= mysql:101m USE_GNOME= libxml2 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=NO \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 .for ENGINE in ${OPTIONS_GROUP_ENGINES} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \ -DWITHOUT_${ENGINE}=1 .endfor GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ https://mariadb.atlassian.net/browse/MDEV-9627 post-install: # Remove programs to avoid conflict with mariadb101-client # These are "client" components, so there should be a switch that # prevents them from being installed but it's unknown right now ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ ${STAGEDIR}${PREFIX}/bin/mysql_config \ ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ ${STAGEDIR}${PREFIX}/bin/mysqlaccess \ ${STAGEDIR}${PREFIX}/lib/mysql/plugin/client_ed25519.so ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ ${STAGEDIR}${PREFIX}/share/pkgconfig .endif # defined(CLIENT_ONLY) .include .if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE} IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .if ${OPSYS} == FreeBSD CMAKE_ARGS+= -DWITH_JEMALLOC="system" .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 .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif post-configure-MROONGA-on: @${REINPLACE_CMD} "s|/usr/bin/c++ |/usr/bin/c++ -L${LOCALBASE}/lib |" \ ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt .include Index: head/databases/mariadb101-server/distinfo =================================================================== --- head/databases/mariadb101-server/distinfo (revision 440093) +++ head/databases/mariadb101-server/distinfo (revision 440094) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489523834 -SHA256 (mariadb-10.1.22.tar.gz) = bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce -SIZE (mariadb-10.1.22.tar.gz) = 61542321 +TIMESTAMP = 1493839895 +SHA256 (mariadb-10.1.23.tar.gz) = 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf +SIZE (mariadb-10.1.23.tar.gz) = 61772244 Index: head/databases/mariadb101-server/files/patch-CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-CMakeLists.txt (revision 440093) +++ head/databases/mariadb101-server/files/patch-CMakeLists.txt (revision 440094) @@ -1,20 +1,18 @@ -Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options - ---- CMakeLists.txt.orig 2016-03-24 09:12:10 UTC +--- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC +++ CMakeLists.txt -@@ -460,6 +460,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty + INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty EXCEPTIONS-CLIENT COMPONENT Readme) - # MDEV-6526 these files are not installed anymore -@@ -470,6 +471,7 @@ IF(UNIX) + +@@ -476,6 +477,7 @@ IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) ENDIF() +ENDIF() INCLUDE(CPack) Index: head/databases/mariadb101-server/files/patch-MDEV-12281 =================================================================== --- head/databases/mariadb101-server/files/patch-MDEV-12281 (nonexistent) +++ head/databases/mariadb101-server/files/patch-MDEV-12281 (revision 440094) @@ -0,0 +1,15 @@ +--- storage/innobase/dict/dict0stats.cc.orig 2017-05-02 07:13:44.000000000 +0200 ++++ storage/innobase/dict/dict0stats.cc 2017-05-03 17:26:34.159233678 +0200 +@@ -1168,10 +1168,10 @@ + leaf-level delete marks because delete marks on + non-leaf level do not make sense. */ + +- if (level == 0 && srv_stats_include_delete_marked? 0: ++ if (level == 0 && (srv_stats_include_delete_marked ? 0: + rec_get_deleted_flag( + rec, +- page_is_comp(btr_pcur_get_page(&pcur)))) { ++ page_is_comp(btr_pcur_get_page(&pcur))))) { + + if (rec_is_last_on_page + && !prev_rec_is_copied Property changes on: head/databases/mariadb101-server/files/patch-MDEV-12281 ___________________________________________________________________ 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/mariadb101-server/pkg-plist =================================================================== --- head/databases/mariadb101-server/pkg-plist (revision 440093) +++ head/databases/mariadb101-server/pkg-plist (revision 440094) @@ -1,251 +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 bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_client_test bin/mysql_client_test_embedded bin/mysql_convert_table_format bin/mysql_embedded bin/mysql_fix_extensions bin/mysql_install_db bin/mysql_plugin bin/mysql_secure_installation bin/mysql_setpermission bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysql_zap bin/mysqlbug bin/mysqld_multi bin/mysqld_safe bin/mysqld_safe_helper bin/mysqldumpslow bin/mysqlhotcopy bin/mysqltest bin/mysqltest_embedded @comment bin/mytop bin/perror bin/replace bin/resolve_stack_dump bin/resolveip %%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 include/mysql/private/atomic/gcc_builtins.h include/mysql/private/atomic/generic-msvc.h include/mysql/private/atomic/nolock.h include/mysql/private/atomic/solaris.h include/mysql/private/atomic/x86-gcc.h include/mysql/private/config.h include/mysql/private/ft_global.h include/mysql/private/embedded_priv.h include/mysql/private/hash.h include/mysql/private/heap.h include/mysql/private/lf.h include/mysql/private/maria.h include/mysql/private/my_alarm.h include/mysql/private/my_atomic.h include/mysql/private/my_base.h include/mysql/private/my_bit.h include/mysql/private/my_bitmap.h include/mysql/private/my_check_opt.h include/mysql/private/my_compare.h include/mysql/private/my_context.h include/mysql/private/my_cpu.h include/mysql/private/my_crypt.h include/mysql/private/my_default.h include/mysql/private/my_handler_errors.h include/mysql/private/my_libwrap.h include/mysql/private/my_md5.h include/mysql/private/my_nosys.h include/mysql/private/my_rdtsc.h include/mysql/private/my_rnd.h include/mysql/private/my_stacktrace.h include/mysql/private/my_systemd.h include/mysql/private/my_time.h include/mysql/private/my_tree.h include/mysql/private/my_uctype.h include/mysql/private/my_user.h include/mysql/private/myisam.h include/mysql/private/myisamchk.h include/mysql/private/myisammrg.h include/mysql/private/myisampack.h include/mysql/private/mysql_async.h include/mysql/private/mysqld_default_groups.h include/mysql/private/mysys_err.h include/mysql/private/password.h include/mysql/private/probes_mysql.h include/mysql/private/probes_mysql_nodtrace.h include/mysql/private/queues.h include/mysql/private/rijndael.h include/mysql/private/service_versions.h include/mysql/private/t_ctype.h include/mysql/private/thr_alarm.h include/mysql/private/thr_lock.h include/mysql/private/thr_timer.h include/mysql/private/thread_pool_priv.h include/mysql/private/violite.h include/mysql/private/waiting_threads.h include/mysql/private/welcome_copyright_notice.h include/mysql/private/wqueue.h include/mysql/private/wsrep.h lib/mysql/libmysqld.a lib/mysql/libmysqld.so lib/mysql/libmysqld.so.18 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 %%INNOBASE%%lib/mysql/plugin/ha_innodb.so %%MROONGA%%lib/mysql/plugin/ha_mroonga.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.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 @comment lib/mysql/plugin/mysql_clear_password.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/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/server_audit.so lib/mysql/plugin/simple_password_check.so lib/mysql/plugin/sql_errlog.so 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 +man/man1/mariadb-service-convert.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 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 man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/mysql_zap.1.gz man/man1/mysqlbug.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 man/man1/mysqlhotcopy.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 +%%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 man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%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%%/fill_help_tables.sql %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%DATADIR%%/install_spider.sql %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic %%DATADIR%%/maria_add_gis_sp.sql %%DATADIR%%/maria_add_gis_sp_bootstrap.sql %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%DATADIR%%/my-huge.cnf %%DATADIR%%/my-innodb-heavy-4G.cnf %%DATADIR%%/my-large.cnf %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%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_to_mariadb.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%%/wsrep.cnf %%DATADIR%%/wsrep_notify