Merge lp:~akopytov/percona-xtrabackup/bug729843 into lp:percona-xtrabackup/1.6

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-1.6-param/62/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2011-10-21 17:06:33 +0000
+++ innobackupex	2011-11-25 19:00:29 +0000
@@ -990,7 +990,8 @@
     my $options = get_mysql_options();
     # run mysql as a child process with a pipe connection
     $now = current_time();
-    print STDERR "$now  $prefix Starting mysql with options: $options\n";
+    (my $prt_options = $options) =~ s/--password=[^ ]+ /--password=xxxxxxxx /g;
+    print STDERR "$now  $prefix Starting mysql with options: $prt_options\n";
     $mysql_pid = open(*MYSQL_WRITER, "| mysql $options >$mysql_stdout 2>$mysql_stderr ") or Die "Failed to spawn mysql child process: $!";
     MYSQL_WRITER->autoflush(1);
     $now = current_time();

=== added file 'test/t/bug729843.sh'
--- test/t/bug729843.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug729843.sh	2011-11-25 19:00:29 +0000
@@ -0,0 +1,21 @@
+########################################################################
+# Bug #729843: innobackupex logs plaintext password
+########################################################################
+
+. inc/common.sh
+
+init
+run_mysqld
+
+mkdir $topdir/backup
+logfile=$topdir/backup/innobackupex_log
+
+# Don't use run_cmd_* or innobackupex functions here to avoid logging
+# the full command line (including the password in plaintext)
+set +e
+$IB_BIN $IB_ARGS --password=secret $topdir/backup 2>&1 | tee $logfile
+set -e
+
+# Check that the password was not logged in plaintext
+run_cmd grep  -- "--password=xxxxxxxx" $logfile 
+run_cmd_expect_failure grep -- "--password=secret" $logfile