Merge lp:~percona-dev/percona-xtrabackup/bugfix759701 into lp:percona-xtrabackup/2.0

[Vadim Tkachenko]

This supposes to fix
https://bugs.launchpad.net/percona-xtrabackup/+bug/771981
https://bugs.launchpad.net/percona-xtrabackup/+bug/783596

This removes condition in innobackupex that non-InnoDB tables and files
are not handled in incremental.

This fix should be throughly tested in innobackupex + incremental schema.

[Valentine Gostev (longbow)]

Looks good.
Keeping open connection resolved mentioned problems.

review: Approve (qa)

=== modified file 'innobackupex'
--- innobackupex	2011-04-29 14:12:21 +0000
+++ innobackupex	2011-05-20 17:30:29 +0000
@@ -361,39 +361,35 @@
         wait_for_ibbackup_suspend();
     }
 
-    if (!$option_incremental) {
-        # connect to database
-        mysql_open();
-
-        if ( $option_safe_slave_backup ) {
-          wait_for_safe_slave();
-        }
-
-        # flush tables with read lock
-        mysql_check();
-        mysql_lockall() if !$option_no_lock;
-
+    # connect to database
+    mysql_open();
+
+    if ( $option_safe_slave_backup ) {
+        wait_for_safe_slave();
     }
 
+    # flush tables with read lock
+    mysql_check();
+    mysql_lockall() if !$option_no_lock;
+
+
     # backup .frm, .MRG, .MYD, .MYI, .TRG, .TRN, .ARM, .ARZ, .CSM, .CSV and .opt files
     backup_files();
 
     # 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;
-
-       if ( $option_safe_slave_backup ) {
-         print STDERR "$prefix: Starting slave SQL thread\n";
-         mysql_send('START SLAVE SQL_THREAD;');
-       }
-
-        # disconnect from database
-        mysql_close();
+    # release read locks on all tables
+    mysql_unlockall() if !$option_no_lock;
+
+    if ( $option_safe_slave_backup ) {
+       print STDERR "$prefix: Starting slave SQL thread\n";
+       mysql_send('START SLAVE SQL_THREAD;');
     }
 
+    # disconnect from database
+    mysql_close();
+
     if ($option_remote_host) {
         system("scp $option_scp_opt '$tmp_logfile' '$option_remote_host:$backup_dir/xtrabackup_logfile'")
             and Die "Failed to scp file '$option_remote_host:$backup_dir/xtrabackup_logfile': $!";