Merge 10.0 into 10.1

Also, implement MDEV-11027 a little differently from 5.5 and 10.0:

recv_apply_hashed_log_recs(): Change the return type back to void
(DB_SUCCESS was always returned).

Report progress also via systemd using sd_notifyf().

3 files changed, 9 insertions, 44 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index 2b1698ca2bc..d30c3ee78d3 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -66,9 +66,10 @@ typedef struct my_aio_result {
 #define MY_FAE		8	/* Fatal if any error */
 #define MY_WME		16	/* Write message on error */
 #define MY_WAIT_IF_FULL 32	/* Wait and try again if disk full error */
-#define MY_IGNORE_BADFD 32      /* my_sync: ignore 'bad descriptor' errors */
+#define MY_IGNORE_BADFD 32      /* my_sync(): ignore 'bad descriptor' errors */
 #define MY_ENCRYPT      64      /* Encrypt IO_CACHE temporary files */
-#define MY_FULL_IO     512      /* For my_read - loop intil I/O is complete */
+#define MY_NOSYMLINKS  512      /* my_open(): don't follow symlinks */
+#define MY_FULL_IO     512      /* my_read(): loop intil I/O is complete */
 #define MY_DONT_CHECK_FILESIZE 128 /* Option to init_io_cache() */
 #define MY_LINK_WARNING 32	/* my_redel() gives warning if links */
 #define MY_COPYTIME	64	/* my_redel() copys time */
@@ -261,7 +262,7 @@ extern ulong	my_file_opened,my_stream_opened, my_tmp_file_created;
 extern ulong    my_file_total_opened;
 extern ulong    my_sync_count;
 extern uint	mysys_usage_id;
-extern my_bool	my_init_done;
+extern my_bool	my_init_done, my_thr_key_mysys_exists;
 extern my_bool  my_assert_on_error;
 extern myf      my_global_flags;        /* Set to MY_WME for more error messages */
 					/* Point to current my_message() */
@@ -615,6 +616,7 @@ int my_b_pread(IO_CACHE *info, uchar *Buffer, size_t Count, my_off_t pos);
 
 typedef uint32 ha_checksum;
 
+extern int (*mysys_test_invalid_symlink)(const char *filename);
 #include <my_alloc.h>
 
 	/* Prototypes for mysys and my_func functions */
@@ -642,9 +644,11 @@ extern int my_realpath(char *to, const char *filename, myf MyFlags);
 extern File my_create_with_symlink(const char *linkname, const char *filename,
 				   int createflags, int access_flags,
 				   myf MyFlags);
-extern int my_delete_with_symlink(const char *name, 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 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,
 		     myf MyFlags);
diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h
index c839b2b019b..aca66bd4974 100644
--- a/include/mysql/psi/mysql_file.h
+++ b/include/mysql/psi/mysql_file.h
@@ -442,20 +442,6 @@
 #endif
 
 /**
-  @def mysql_file_delete_with_symlink(K, P1, P2)
-  Instrumented delete with symbolic link.
-  @c mysql_file_delete_with_symlink is a replacement
-  for @c my_delete_with_symlink.
-*/
-#ifdef HAVE_PSI_FILE_INTERFACE
-  #define mysql_file_delete_with_symlink(K, P1, P2) \
-  inline_mysql_file_delete_with_symlink(K, __FILE__, __LINE__, P1, P2)
-#else
-  #define mysql_file_delete_with_symlink(K, P1, P2) \
-  inline_mysql_file_delete_with_symlink(P1, P2)
-#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
@@ -1337,31 +1323,6 @@ inline_mysql_file_create_with_symlink(
   return file;
 }
 
-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, myf flags)
-{
-  int result;
-#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, name, &locker);
-  if (likely(locker != NULL))
-  {
-    PSI_FILE_CALL(start_file_close_wait)(locker, src_file, src_line);
-    result= my_delete_with_symlink(name, flags);
-    PSI_FILE_CALL(end_file_close_wait)(locker, result);
-    return result;
-  }
-#endif
-
-  result= my_delete_with_symlink(name, flags);
-  return result;
-}
 
 static inline int
 inline_mysql_file_rename_with_symlink(
diff --git a/include/mysql/psi/psi.h b/include/mysql/psi/psi.h
index 7fcff89c8b6..3f43445e08a 100644
--- a/include/mysql/psi/psi.h
+++ b/include/mysql/psi/psi.h
@@ -417,7 +417,7 @@ enum PSI_file_operation
   PSI_FILE_FSTAT= 12,
   /** File chsize, as in @c my_chsize(). */
   PSI_FILE_CHSIZE= 13,
-  /** File delete, such as @c my_delete() or @c my_delete_with_symlink(). */
+  /** File delete, such as @c my_delete() or @c my_handler_delete_with_symlink(). */
   PSI_FILE_DELETE= 14,
   /** File rename, such as @c my_rename() or @c my_rename_with_symlink(). */
   PSI_FILE_RENAME= 15,