Merge 10.4 into 10.5

MariaDB · Jun 18, 2020 · c515b1d · c515b1d
2 parents baff3ba + 205b0ce
commit c515b1d
Show file tree

Hide file tree

Showing 27 changed files with 321 additions and 166 deletions.
diff --git a/extra/mariabackup/innobackupex.cc b/extra/mariabackup/innobackupex.cc
@@ -112,6 +112,8 @@ bool ibx_partial_backup = false;
 char *ibx_position_arg = NULL;
 char *ibx_backup_directory = NULL;
 
+extern bool xb_opt_destroy_password;
+
 /* copy of proxied xtrabackup options */
 my_bool ibx_xb_close_files;
 const char *ibx_xtrabackup_compress_alg;
@@ -770,18 +772,7 @@ ibx_get_one_option(const struct my_option *opt,
 		xtrabackup_compress = TRUE;
 		break;
 	case 'p':
-		if (argument)
-		{
-		        char *start = argument;
-			my_free(opt_ibx_password);
-			opt_ibx_password= my_strdup(PSI_NOT_INSTRUMENTED,
-                                                    argument, MYF(MY_FAE));
-			/*  Destroy argument */
-			while (*argument)
-				*argument++= 'x';
-			if (*start)
-				start[1]=0 ;
-		}
+    opt_ibx_password= argument;
 		break;
         }
 	return(0);