Merge lp:~akopytov/percona-xtrabackup/bug1116177-2.1 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

  Bug #1116177: Fix warnings reported by "use warnings FATAL => 'all'"

  Fixed a couple of warnings found with "use warnings FATAL => 'all'".

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/234/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-03-11 19:11:29 +0000
+++ innobackupex	2013-03-25 05:26:32 +0000
@@ -7,6 +7,7 @@
 # All Rights Reserved.
 #
 
+use warnings FATAL => 'all';
 use strict;
 use Getopt::Long;
 use File::Spec;
@@ -773,7 +774,7 @@
     print STDERR "$prefix in '$backup_dir'\n";
     print STDERR "$prefix back to original InnoDB log directory '$orig_iblog_dir'\n";
     while (defined($file = readdir(DIR))) {
-        if ($file =~ /'^' . $iblog_files . '$'/ && -f "$backup_dir/$file") {
+        if ($file =~ /^$iblog_files$/ && -f "$backup_dir/$file") {
             $src_name = escape_path("$backup_dir/$file");
             $dst_name = escape_path("$orig_iblog_dir");
             &$move_or_copy_file($src_name, $dst_name);
@@ -1211,8 +1212,9 @@
     parse_connection_options(\%con);
 
     $now = current_time();
-    print STDERR "$now  $prefix Connecting to MySQL server with DSN '" .
-        $con{dsn} . "' as '" . $con{dsn_user} . "' (using password: ";
+    print STDERR "$now  $prefix Connecting to MySQL server with DSN '$con{dsn}'" .
+        (defined($con{dsn_user}) ? " as '$con{dsn_user}' " : "") .
+        " (using password: ";
     if (defined($con{dsn_password})) {
         print STDERR "YES).\n";
     } else {
@@ -1863,12 +1865,12 @@
         $option_backup = "1";
         $backup_root = $ARGV[0];
         if ($option_incremental && !$option_incremental_lsn) {
-            my @dirs = `ls -1 -t $backup_root`;
-            my $inc_dir = $dirs[0];
-            chomp($inc_dir);
             if ($option_incremental_basedir) {
                 $incremental_basedir = $option_incremental_basedir;
             } else {
+                my @dirs = `ls -t $backup_root`;
+                my $inc_dir = $dirs[0];
+                chomp($inc_dir);
                 $incremental_basedir = File::Spec->catfile($backup_root, $inc_dir);
             }
         }