Merge lp:~lachlan-mulcahy/percona-xtrabackup/1.6-bug860133 into lp:percona-xtrabackup/1.6

[Lachlan Mulcahy]

Fixed bug 860133 - Simply skipped the section of code that is irrelevant when --incremental-lsn is specified.

  Fixed bug 860133

  innobackupex throws errors when using --incremental and --incremental-lsn together when it tries to ls contents of a dir that it plans to create later anyway. The ls is only required if incremental-lsn isn't specified.

  Simply skipped the section of code that is irrelevant when --incremental-lsn is specified.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2011-09-21 09:00:00 +0000
+++ innobackupex	2011-09-26 23:27:26 +0000
@@ -770,9 +770,9 @@
     if ($option_incremental) {
         if($option_incremental_lsn) {
           $options = $options . " --incremental-lsn='$option_incremental_lsn'";
-	} else {
+	    } else {
           $options = $options . " --incremental-basedir='$incremental_basedir'";
-	}
+	    }
     }
 
     if ($option_tables_file) {
@@ -1658,7 +1658,7 @@
     if (!$option_apply_log && !$option_copy_back) {
         # we are making a backup, get backup root directory
         $backup_root = $ARGV[0];
-        if ($option_incremental) {
+        if ($option_incremental && !$option_incremental_lsn) {
             my @dirs = `ls -1 -t $backup_root`;
             my $inc_dir = $dirs[0];
             chomp($inc_dir);