some debug logging, remove after bug is fixedbb-10.4-MDEV-18215-unknown-backup-options

3 files changed, 32 insertions, 9 deletions

diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc
index e008b2352a7..b51e6b46c0b 100644
--- a/extra/mariabackup/backup_mysql.cc
+++ b/extra/mariabackup/backup_mysql.cc
@@ -122,7 +122,7 @@ xb_mysql_connect()
 	msg("Connecting to MySQL server host: %s, user: %s, password: %s, "
 	       "port: %s, socket: %s", opt_host ? opt_host : "localhost",
 	       opt_user ? opt_user : "not set",
-	       opt_password ? "set" : "not set",
+	       opt_password ? opt_password : "not set",
 	       opt_port != 0 ? mysql_port_str : "not set",
 	       opt_socket ? opt_socket : "not set");
 
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 19058398258..40c04fb0785 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -1681,9 +1681,12 @@ check_if_param_set(const char *param)
 
 my_bool
 xb_get_one_option(int optid,
-		  const struct my_option *opt __attribute__((unused)),
+		  const struct my_option *opt,
 		  char *argument)
 {
+
+  msg("Process option %s=%s", opt->name, argument);
+
   switch(optid) {
   case 'h':
     strmake(mysql_real_data_home,argument, FN_REFLEN - 1);
@@ -6098,8 +6101,8 @@ void handle_options(int argc, char **argv, char ***argv_server,
         int argc_client= argc_backup;
         int argc_server= argc_backup;
 
-        /* 1) Load server groups and process server options, ignore unknown
-         options */
+        msg(" 1) Load server groups and process server options, ignore "
+            "unknown options");
 
         load_defaults_or_exit(conf_file, &server_default_groups[0],
                               &argc_server, argv_server);
@@ -6143,8 +6146,8 @@ void handle_options(int argc, char **argv, char ***argv_server,
 					xb_server_options, xb_get_one_option)))
 		exit(ho_error);
 
-        /* 2) Load client groups and process client options, ignore unknown
-         options */
+        msg("2) Load client groups and process client options, ignore unknown "
+         "options");
 
 	load_defaults_or_exit(conf_file, xb_client_default_groups,
 			      &argc_client, argv_client);
@@ -6163,8 +6166,8 @@ void handle_options(int argc, char **argv, char ***argv_server,
 					xb_client_options, xb_get_one_option)))
 		exit(ho_error);
 
-        /* 3) Load backup groups and process client-server options, exit on
-         unknown option */
+        msg(" 3) Load backup groups and process client-server options, exit on "
+         "unknown option ");
 
         load_defaults_or_exit(conf_file, backup_default_groups, &argc_backup,
                               argv_backup);
@@ -6206,7 +6209,7 @@ void handle_options(int argc, char **argv, char ***argv_server,
             start[1]= 0;
         }
 
-        /* 4) Process --mysqld-args options, ignore unknown options */
+        msg(" 4) Process --mysqld-args options, ignore unknown options ");
 
         my_getopt_skip_unknown = TRUE;
 
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh
index a76a3b781e4..48540205f62 100644
--- a/scripts/wsrep_sst_mariabackup.sh
+++ b/scripts/wsrep_sst_mariabackup.sh
@@ -899,6 +899,12 @@ then
             tcmd="$scomp | $tcmd"
         fi
 
+        wsrep_log_info "tmpopts: $tmpopts"
+        wsrep_log_info "INNOEXTRA: $INNOEXTRA"
+        wsrep_log_info "itmpdir: $itmpdir"
+        wsrep_log_info "sfmt: $sfmt"
+        wsrep_log_info "WSREP_SST_OPT_MYSQLD: $WSREP_SST_OPT_MYSQLD"
+
         set +e
         timeit "${stagemsg}-SST" "$INNOBACKUP | $tcmd; RC=( "\${PIPESTATUS[@]}" )"
         set -e
@@ -1139,6 +1145,13 @@ then
         fi
 
         wsrep_log_info "Preparing the backup at ${DATA}"
+
+        wsrep_log_info "tmpopts: $tmpopts"
+        wsrep_log_info "INNOEXTRA: $INNOEXTRA"
+        wsrep_log_info "itmpdir: $itmpdir"
+        wsrep_log_info "sfmt: $sfmt"
+        wsrep_log_info "WSREP_SST_OPT_MYSQLD: $WSREP_SST_OPT_MYSQLD"
+
         timeit "Xtrabackup prepare stage" "$INNOAPPLY"
 
         if [ $? -ne 0 ];
@@ -1151,6 +1164,13 @@ then
         set +e
         set -e
         wsrep_log_info "Moving the backup to ${TDATA}"
+
+        wsrep_log_info "tmpopts: $tmpopts"
+        wsrep_log_info "INNOEXTRA: $INNOEXTRA"
+        wsrep_log_info "itmpdir: $itmpdir"
+        wsrep_log_info "sfmt: $sfmt"
+        wsrep_log_info "WSREP_SST_OPT_MYSQLD: $WSREP_SST_OPT_MYSQLD"
+
         timeit "Xtrabackup move stage" "$INNOMOVE"
         if [[ $? -eq 0 ]];then 
             wsrep_log_info "Move successful, removing ${DATA}"