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

[Lachlan Mulcahy]

Merged fix for bug 857788

In some cases certain combinations of options would create a situation where innobackupex attempted to send commands through a mysql connection that was no longer open.

  Fixed bug 857788

  In some cases certain combinations of options would create a situation where innobackupex attempted to send commands through a mysql connection that was no longer open.

  This patch greatly simplifies the connection open and closing so that it's less confusing to know, depending on which options you are using, whether you need to open a fresh connection or not, just always try to reuse the same one.

[Alexey Kopytov (akopytov)]

Looks good.

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2011-09-21 09:00:00 +0000
+++ innobackupex	2011-09-26 22:57:28 +0000
@@ -359,24 +359,27 @@
         wait_for_ibbackup_suspend();
     }
 
+    # connect to database
+    mysql_open();
+    mysql_check();
+
     if ($option_safe_slave_backup) {
-      mysql_open();
       mysql_check();
       wait_for_safe_slave();
-      mysql_close();
     }
 
     if (!$option_incremental) {
-        # connect to database
-        mysql_open();
-
         # flush tables with read lock
         mysql_check();
         mysql_lockall() if !$option_no_lock;
 
     }
 
-    write_slave_info() if $option_slave_info;
+    if ($option_slave_info) {
+        mysql_check();
+        write_slave_info();
+    }
+
 
     # backup .frm, .MRG, .MYD, .MYI, .TRG, .TRN, .ARM, .ARZ, .CSM, .CSV and .opt files
     backup_files();
@@ -385,21 +388,21 @@
     my $ibbackup_exit_code = resume_ibbackup();
 
     if (!$option_incremental) {
+        mysql_check();
         # release read locks on all tables
         mysql_unlockall() if !$option_no_lock;
 
-        # disconnect from database
-        mysql_close();
     }
 
     if ( $option_safe_slave_backup ) {
-      mysql_open();
       mysql_check();
       print STDERR "$prefix: Starting slave SQL thread\n";
       mysql_send('START SLAVE SQL_THREAD;');
-      mysql_close();
     }
 
+    # Close the DB connection
+    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': $!";