Merge branch '12.2' into 12.3

Author: vuvova

.gitignore

@@ -31,6 +31,7 @@ Docs/INFO_BIN
 Docs/INFO_SRC
 Makefile
 TAGS
+mariadb-plugin-columnstore.install.generated
 Testing/
 tmp/
 VERSION.dep

client/my_readline.h

@@ -34,9 +34,10 @@ typedef struct st_line_buffer
   bool truncated;
 } LINE_BUFFER;
 
-extern LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file);
 extern LINE_BUFFER *batch_readline_command(LINE_BUFFER *buffer, char * str);
 extern char *batch_readline(LINE_BUFFER *buffer, bool binary_mode);
 extern void batch_readline_end(LINE_BUFFER *buffer);
+extern bool init_line_buffer(LINE_BUFFER *buffer, File file, ulong size,
+                             ulong max_size);
 
 #endif /* CLIENT_MY_READLINE_INCLUDED */

client/mysql.cc

@@ -1216,6 +1216,88 @@ inline int get_command_index(char cmd_char)
   return -1;
 }
 
+static LINE_BUFFER *batch_readline_init(ulong max_size, const char *path)
+{
+  LINE_BUFFER *line_buff;
+  File file;
+  MY_STAT input_file_stat;
+  char buff[FN_REFLEN + 512];
+
+  if (path)
+  {
+    file= my_open(path, O_RDONLY | O_BINARY, MYF(0));
+    if (file < 0 && my_errno == ENOENT && script_dir)
+    {
+      char full_path[FN_REFLEN];
+      strxnmov(full_path, sizeof(full_path)-1, script_dir, "/", path, NULL);
+      file= my_open(full_path, O_RDONLY | O_BINARY, MYF(0));
+    }
+    if (file < 0)
+    {
+#ifdef _WIN32
+      if (my_errno == EACCES && my_stat(path, &input_file_stat, MYF(0)) &&
+          MY_S_ISDIR(input_file_stat.st_mode))
+        my_snprintf(buff, sizeof(buff), "Can't read from a directory '%.*s'",
+                    FN_REFLEN, path);
+      else
+#endif
+      my_snprintf(buff, sizeof(buff), "Failed to open file '%.*s', error: %d",
+                  FN_REFLEN, path, my_errno);
+      put_info(buff, INFO_ERROR, 0);
+      return 0;
+    }
+  }
+  else
+  {
+    file= my_fileno(stdin);
+  }
+
+  if (my_fstat(file, &input_file_stat, MYF(0)))
+  {
+    my_snprintf(buff, sizeof(buff), "Failed to stat file '%.*s', error: %d",
+                FN_REFLEN, path ? path : "stdin", my_errno);
+    goto err1;
+  }
+
+  if (MY_S_ISDIR(input_file_stat.st_mode))
+  {
+    my_snprintf(buff, sizeof(buff), "Can't read from a directory '%.*s'",
+                FN_REFLEN, path ? path : "stdin");
+    goto err1;
+  }
+
+#ifndef _WIN32
+  if (MY_S_ISBLK(input_file_stat.st_mode))
+  {
+    my_snprintf(buff, sizeof(buff), "Can't read from a block device '%.*s'",
+                FN_REFLEN, path ? path : "stdin");
+    goto err1;
+  }
+#endif
+
+  if (!(line_buff= (LINE_BUFFER*) my_malloc(PSI_NOT_INSTRUMENTED,
+                                            sizeof(*line_buff),
+                                            MYF(MY_WME | MY_ZEROFILL))))
+  {
+    goto err;
+  }
+
+  if (init_line_buffer(line_buff, file, IO_SIZE, max_size))
+  {
+    my_free(line_buff);
+    goto err;
+  }
+
+  return line_buff;
+
+err1:
+  put_info(buff, INFO_ERROR, 0);
+err:
+  if (path)
+    my_close(file, MYF(0));
+  return 0;
+}
+
 static int delimiter_index= -1;
 static int charset_index= -1;
 static int sandbox_index= -1;
@@ -1290,10 +1372,8 @@ int main(int argc,char *argv[])
   }
 
   if (status.batch && !status.line_buff &&
-      !(status.line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, stdin)))
+      !(status.line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, NULL)))
   {
-    put_info("Can't initialize batch_readline - may be the input source is "
-             "a directory or a block device.", INFO_ERROR, 0);
     free_defaults(defaults_argv);
     my_end(0);
     exit(1);
@@ -4742,11 +4822,9 @@ static int com_connect(String *buffer, char *line)
 static int com_source(String *, char *line)
 {
   char source_name[FN_REFLEN], *end, *param;
-  char full_path[FN_REFLEN];
   LINE_BUFFER *line_buff;
   int error;
   STATUS old_status;
-  FILE *sql_file;
   my_bool save_ignore_errors;
 
   if (status.sandbox)
@@ -4766,27 +4844,10 @@ static int com_source(String *, char *line)
     end--;
   end[0]=0;
   unpack_filename(source_name,source_name);
-  /* open file name */
-  if (!(sql_file = my_fopen(source_name, O_RDONLY | O_BINARY,MYF(0))))
-  {
-    if (script_dir)
-    {
-      snprintf(full_path, sizeof(full_path), "%s/%s", script_dir, source_name);
-      sql_file = my_fopen(full_path, O_RDONLY | O_BINARY, MYF(0));
-    }
-  }
-
-  if (!sql_file)
-  {
-    char buff[FN_REFLEN + 60];
-    sprintf(buff, "Failed to open file '%s', error: %d", source_name, errno);
-    return put_info(buff, INFO_ERROR, 0);
-  }
 
-  if (!(line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, sql_file)))
+  if (!(line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, source_name)))
   {
-    my_fclose(sql_file,MYF(0));
-    return put_info("Can't initialize batch_readline", INFO_ERROR, 0);
+    return ignore_errors ? -1 : 1;
   }
 
   /* Save old status */
@@ -4805,7 +4866,7 @@ static int com_source(String *, char *line)
   ignore_errors= save_ignore_errors;
   status=old_status;				// Continue as before
   in_com_source= aborted= 0;
-  my_fclose(sql_file,MYF(0));
+  my_close(line_buff->file, MYF(0));
   batch_readline_end(line_buff);
   /*
     If we got an error during source operation, don't abort the client

client/mysqldump.cc

@@ -7311,6 +7311,85 @@ static void init_connection_pool(uint n_connections)
   connection_pool.init(conn, n_connections);
 }
 
+/*
+  Fix permissions and ownership of given directory to be the same
+  as the root output directory.
+
+  The function is used for newly created database directories,
+  together with --dir option
+
+  This function is not thread-safe, nor does it need to be, because
+  it is called from the main thread only.
+
+  chmod/chown errors are ignored after the first one, with a warning printed,
+  so it is really the best effort attempt. We might see an error later
+  if the server can't write into the directory, and this will be the
+  real error.
+
+  On Windows, this function does nothing, because the permissions are
+  inherited from the parent directory anyway.
+
+  @param dirpath  Directory path
+*/
+static void fix_permissions_and_owner(const char *dirpath)
+{
+#ifndef _WIN32
+  // Permissions and ownership of output directory (--dir)
+  static struct stat  st_out_dir;
+
+  static bool fix_perms= true; // Try fixing permission bits
+  static bool fix_ownership_uid= true; // Try fixing user+group ownership
+  static bool fix_ownership_gid= false; // Try fixing group ownership only
+
+  static bool first_time= true;
+  if (first_time)
+  {
+    /* Find out permissions and ownership of output directory */
+    first_time= false;
+    if (stat(opt_dir, &st_out_dir) != 0)
+    {
+      die(EX_CONSCHECK, "Error: cannot stat output directory %s, errno %d",
+          opt_dir, errno);
+    }
+  }
+
+  /* Change permissions to be the same as for the output directory*/
+  if (fix_perms &&
+      chmod(dirpath, st_out_dir.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO)))
+  {
+    fprintf(stderr,
+        "Warning: cannot set permissions on directory %s, errno %d\n",
+        dirpath, errno);
+    fix_perms= false;
+  }
+
+  /*
+    Change ownership to be the same as backup root dir.
+    If user can't be changed, try changing owner group only.
+  */
+  if (fix_ownership_uid &&
+          chown(dirpath, st_out_dir.st_uid, st_out_dir.st_gid))
+  {
+    // No warning, error is expected, unless current user is root.
+    fix_ownership_uid= false;
+    fix_ownership_gid= true;
+  }
+
+  if (fix_ownership_gid && chown(dirpath, -1, st_out_dir.st_gid))
+  {
+    if (!(st_out_dir.st_mode & S_IWOTH))
+    {
+      /* Only warn if directory is not world-writable (group ownership
+         matters more in this case), to avoid spamming stderr.*/
+      fprintf(stderr,
+              "Warning: cannot set group ownership on directory %s, errno %d\n",
+              dirpath, errno);
+    }
+    fix_ownership_gid= false;
+  }
+#endif
+}
+
 /*
   If --dir option is in use, ensure that output directory for given db
   exists.
@@ -7330,6 +7409,7 @@ static void ensure_out_dir_exists(const char *db)
   }
   if (my_mkdir(outdir, 0777, MYF(MY_WME)))
     die(EX_MYSQLERR, "Error creating directory %s", outdir);
+  fix_permissions_and_owner(outdir);
 }
 
 

client/readline.cc

@@ -23,38 +23,11 @@
 #include <my_dir.h>
 #include "my_readline.h"
 
-static bool init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,
-			    ulong max_size);
 static bool init_line_buffer_from_string(LINE_BUFFER *buffer,char * str);
 static size_t fill_buffer(LINE_BUFFER *buffer);
 static char *intern_read_line(LINE_BUFFER *buffer, ulong *out_length);
 
 
-LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file)
-{
-  LINE_BUFFER *line_buff;
-
-#ifndef _WIN32
-  MY_STAT input_file_stat;
-  if (my_fstat(fileno(file), &input_file_stat, MYF(MY_WME)) ||
-      MY_S_ISDIR(input_file_stat.st_mode) ||
-      MY_S_ISBLK(input_file_stat.st_mode))
-    return 0;
-#endif
-
-  if (!(line_buff=(LINE_BUFFER*)
-        my_malloc(PSI_NOT_INSTRUMENTED, sizeof(*line_buff),
-                  MYF(MY_WME | MY_ZEROFILL))))
-    return 0;
-  if (init_line_buffer(line_buff,my_fileno(file),IO_SIZE,max_size))
-  {
-    my_free(line_buff);
-    return 0;
-  }
-  return line_buff;
-}
-
-
 char *batch_readline(LINE_BUFFER *line_buff, bool binary_mode)
 {
   char *pos;
@@ -105,8 +78,7 @@ LINE_BUFFER *batch_readline_command(LINE_BUFFER *line_buff, char * str)
       Functions to handle buffered readings of lines from a stream
 ******************************************************************************/
 
-static bool
-init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,ulong max_buffer)
+bool init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,ulong max_buffer)
 {
   buffer->file=file;
   buffer->bufread=size;

cmake/build_configurations/mysql_release.cmake

@@ -120,8 +120,8 @@ ELSEIF(DEB)
   SET(WITH_ZLIB system CACHE STRING "")
   SET(WITH_LIBWRAP ON)
   SET(HAVE_EMBEDDED_PRIVILEGE_CONTROL ON)
-  # No hurd implementation
-  IF(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "i686-AT386")
+  # On Hurd systems (GNU) there is no auth socket implementation
+  IF(NOT CMAKE_SYSTEM_NAME STREQUAL "GNU")
     SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "")
   ENDIF()
   SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "")

cmake/mariadb_connector_c.cmake

@@ -7,12 +7,7 @@ ENDIF()
 SET(CONC_WITH_SIGNCODE ${SIGNCODE})
 SET(SIGN_OPTIONS ${SIGNTOOL_PARAMETERS})
 SET(CONC_WITH_EXTERNAL_ZLIB ON)
-SET(CLIENT_PLUGIN_PARSEC OFF)
 
-CHECK_INCLUDE_FILES (threads.h HAVE_THREADS_H)
-IF(HAVE_THREADS_H)
-SET(CLIENT_PLUGIN_PARSEC DYNAMIC)
-ENDIF()
 
 IF(NOT CONC_WITH_SSL)
   IF(SSL_DEFINES MATCHES "WOLFSSL")

extra/mariabackup/xtrabackup.cc

@@ -1237,7 +1237,7 @@ static void backup_file_op_fail(uint32_t space_id, int type,
 		msg("DDL tracking : create %" PRIu32 " \"%.*s\"",
 			space_id, int(len), name);
 		fail = !check_if_skip_table(spacename.c_str());
-		if (!opt_no_lock && fail &&
+		if (fail && !opt_no_lock &&
 		    check_if_fts_table(spacename.c_str())) {
 			/* Ignore the FTS internal table because InnoDB does
 			create intermediate table and their associative FTS
@@ -1264,6 +1264,11 @@ static void backup_file_op_fail(uint32_t space_id, int type,
 		break;
 	case FILE_DELETE:
 		fail = !check_if_skip_table(spacename.c_str())
+			/* Ignore the FTS internal table because InnoDB may
+			drop intermediate table and their associative FTS
+			internal table as a part of inplace rollback operation.
+			backup_set_alter_copy_lock() downgrades the
+			MDL_BACKUP_DDL before inplace phase of alter */
 			&& !check_if_fts_table(spacename.c_str());
 		msg("DDL tracking : delete %" PRIu32 " \"%.*s\"",
 			space_id, int(len), name);
@@ -5877,6 +5882,8 @@ void CorruptedPages::backup_fix_ddl(ds_ctxt *ds_data, ds_ctxt *ds_meta)
 					 node, 0, dest_name.c_str(),
 					 wf_write_through, *this);
 	}
+
+	DBUG_MARIABACKUP_EVENT("after_backup_fix_ddl", {});
 }
 
 
@@ -6120,16 +6127,12 @@ xb_delta_open_matching_space(
 	ut_ad(fil_space_t::physical_size(flags) == info.page_size);
 
 	mysql_mutex_lock(&fil_system.mutex);
-	fil_space_t* space = fil_space_t::create(uint32_t(info.space_id),
-						 flags, false, 0,
-						 FIL_ENCRYPTION_DEFAULT, true);
+	std::ignore = fil_space_t::create(uint32_t(info.space_id),
+					  flags, false, 0,
+					  FIL_ENCRYPTION_DEFAULT, true);
 	mysql_mutex_unlock(&fil_system.mutex);
-	if (space) {
-		*success = xb_space_create_file(real_name, info.space_id,
-						flags, &file);
-	} else {
-		msg("Can't create tablespace %s\n", dest_space_name);
-	}
+	*success = xb_space_create_file(real_name, info.space_id,
+					flags, &file);
 
 	goto exit;
 }