Merge lp:~akopytov/percona-xtrabackup/bug369913 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/237/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl	2014-10-08 16:13:58 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl	2014-10-21 11:07:45 +0000
@@ -3583,6 +3583,11 @@
     } else {
         $run = 'apply-log';
     }
+
+    my $now = current_time();
+
+    print STDERR "$now  $prefix Starting the $run operation\n\n";
+
     print STDERR "IMPORTANT: Please check that the $run run completes successfully.\n";
     print STDERR "           At the end of a successful $run run $innobackup_script\n";
     print STDERR "           prints \"completed OK!\".\n\n";

=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-10-08 18:33:23 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-10-21 11:07:45 +0000
@@ -2643,6 +2643,8 @@
 	srv_undo_tablespaces_init(), because fil_is_user_tablespace_id() *
 	relies on srv_undo_tablespaces_open to be properly initialized */
 
+	msg("xtrabackup: Generating a list of tablespaces\n");
+
 	err = fil_load_single_table_tablespaces(xb_check_if_open_tablespace);
 	if (err != DB_SUCCESS) {
 		return(err);

=== added file 'storage/innobase/xtrabackup/test/t/bug369913.sh'
--- storage/innobase/xtrabackup/test/t/bug369913.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug369913.sh	2014-10-21 11:07:45 +0000
@@ -0,0 +1,15 @@
+#############################################################################
+# Bug #369913: Feature Request: more verbose output during initial table scan
+#############################################################################
+
+start_server
+
+innobackupex --no-timestamp $topdir/backup
+
+egrep -q \
+      '[0-9]{6} [0-9]{2}:[0-9]{2}:[0-9]{2} .* Starting the backup operation' \
+      $OUTFILE \
+    || die "Could not find the operation start message"
+
+grep -q "xtrabackup: Generating a list of tablespaces" $OUTFILE \
+    || die "Could not find \"Generating a list of tablespaces\" message"