Index: branches/2017Q1/databases/mariadb100-client/files/patch-build-fail-MDEV-12261 =================================================================== --- branches/2017Q1/databases/mariadb100-client/files/patch-build-fail-MDEV-12261 (nonexistent) +++ branches/2017Q1/databases/mariadb100-client/files/patch-build-fail-MDEV-12261 (revision 436948) @@ -0,0 +1,234 @@ +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,11 +86,11 @@ int maria_delete_table_files(const char *name, myf sync_dir) + { + 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_file_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, MYF(MY_WME | sync_dir)) || ++ mysql_file_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, MYF(MY_WME | sync_dir))) + DBUG_RETURN(my_errno); + +- 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_file_delete_with_symlink(key_file_dfile, name, ".TMD", MYF(0)); ++ mysql_file_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: branches/2017Q1/databases/mariadb100-client/files/patch-build-fail-MDEV-12261 ___________________________________________________________________ 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: branches/2017Q1/databases/mariadb100-server/Makefile =================================================================== --- branches/2017Q1/databases/mariadb100-server/Makefile (revision 436947) +++ branches/2017Q1/databases/mariadb100-server/Makefile (revision 436948) @@ -1,178 +1,179 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.29 +PORTVERSION= 10.0.30 +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?= 100-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 #LICENSE_FILE= ${WRKSRC}/COPYING 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 SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb100-client USES= bison:build cmake compiler:c++11-lib cpe execinfo \ ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source OPTIONS_DEFINE= FASTMTX NO_OPTIONS_SORT= yes FASTMTX_DESC= Replace mutexes with spinlocks CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mariadb" \ -DINSTALL_DOCREADMEDIR="share/doc/mariadb" \ -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_LIBEDIT=0 \ -DWITH_SSL=${OPENSSLBASE} \ -DWITH_LIBWRAP=1 \ -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[1-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ .if !defined(CLIENT_ONLY) # MySQL-Server options USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin OPTIONS_DEFINE+= MAXKEY OPTIONS_DEFAULT+= MAXKEY OPTIONS_GROUP= ENGINES OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER 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 (Requires GCC) SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine OPTIONS_SUB= yes .endif FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 # See PR209419, MariaDB 10.0 fails to build with base SSL libs WITH_OPENSSL_PORT= yes .if defined(CLIENT_ONLY) # MySQL-Client part USES+= readline .else # MySQL-Server part USES+= mysql:100m USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 .for ENGINE in ${OPTIONS_GROUP_ENGINES} ${ENGINE}_CMAKE_OFF= -DWITHOUT_${ENGINE}=1 .endfor MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1 MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy # Currently OQGraph does not build using clang. # See See https://mariadb.atlassian.net/browse/MDEV-8051. OQGRAPH_USE= gcc OQGRAPH_BROKEN= OQGraph does not build TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_PORTDOCS= PATENTS README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi post-install: # Remove programs to avoid conflict with mariadb100-client # These are "client" components, so there should be a switch that # prevents them from being installed but it's unknown right now . for f in bin/msql2mysql bin/mysql_config bin/mysql_find_rows \ bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2 share/aclocal/mysql.m4 ${RM} ${STAGEDIR}${PREFIX}/${f} . endfor ${RM} -r ${STAGEDIR}${DATADIR}/SELinux .endif .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif .if ${PORT_OPTIONS:MTOKUDB} NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ https://github.com/percona/PerconaFT/blob/master/README.md .endif .if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000 # Server segfaults on i386 when built with clang >= 3.4 USE_GCC= yes .endif post-extract-OQGRAPH-off: @${RM} -r ${WRKSRC}/storage/oqgraph 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 ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb .endif post-configure-MROONGA-on: ${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \ ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt .include Index: branches/2017Q1/databases/mariadb100-server/distinfo =================================================================== --- branches/2017Q1/databases/mariadb100-server/distinfo (revision 436947) +++ branches/2017Q1/databases/mariadb100-server/distinfo (revision 436948) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484413888 -SHA256 (mariadb-10.0.29.tar.gz) = f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4 -SIZE (mariadb-10.0.29.tar.gz) = 63385696 +TIMESTAMP = 1489029439 +SHA256 (mariadb-10.0.30.tar.gz) = 9a2cb7f06ecce1bb64dddc70c484e36507b50b756c110c1d37fa145a13a796bb +SIZE (mariadb-10.0.30.tar.gz) = 63433598 Index: branches/2017Q1/databases/mariadb100-server/files/patch-storage_connect_tabmysql.cpp =================================================================== --- branches/2017Q1/databases/mariadb100-server/files/patch-storage_connect_tabmysql.cpp (revision 436947) +++ branches/2017Q1/databases/mariadb100-server/files/patch-storage_connect_tabmysql.cpp (revision 436948) @@ -1,13 +1,11 @@ -See https://mariadb.atlassian.net/browse/MDEV-9603 - ---- storage/connect/tabmysql.cpp.orig 2016-04-28 20:27:49 UTC +--- storage/connect/tabmysql.cpp.orig 2017-03-06 20:04:37 UTC +++ storage/connect/tabmysql.cpp -@@ -334,7 +334,7 @@ bool MYSQLDEF::DefineAM(PGLOBAL g, LPCST +@@ -335,7 +335,7 @@ bool MYSQLDEF::DefineAM(PGLOBAL g, LPCST Delayed = !!GetIntCatInfo("Delayed", 0); } else { // MYSQL access from a PROXY table -- Database = GetStringCatInfo(g, "Database", Schema ? Schema : PlugDup(g, "*")); -+ Database = GetStringCatInfo(g, "Database", Schema ? Schema : PlugDup(g, (PSZ)"*")); +- Tabschema = GetStringCatInfo(g, "Database", Tabschema ? Tabschema : PlugDup(g, "*")); ++ Tabschema = GetStringCatInfo(g, "Database", Tabschema ? Tabschema : PlugDup(g, (PSZ)"*")); Isview = GetBoolCatInfo("View", false); // We must get other connection parms from the calling table Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 436947) +++ branches/2017Q1 (revision 436948) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r436389