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

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-1.6-param/152/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2012-11-22 01:51:22 +0000
+++ innobackupex	2012-11-29 09:27:29 +0000
@@ -393,7 +393,7 @@
       wait_for_safe_slave();
     }
 
-    if (!$option_incremental && !$option_no_lock) {
+    if (!$option_no_lock) {
         # make a prep copy before locking tables, if using rsync
         backup_files(1);
 
@@ -413,11 +413,8 @@
     # resume ibbackup and wait till it has finished
     my $ibbackup_exit_code = resume_ibbackup();
 
-    if (!$option_incremental) {
-        # release read locks on all tables
-        mysql_unlockall() if !$option_no_lock;
-
-    }
+    # release read locks on all tables
+    mysql_unlockall() if !$option_no_lock;
 
     if ( $option_safe_slave_backup && $host_is_slave ) {
       print STDERR "$prefix: Starting slave SQL thread\n";