Merge lp:~percona-core/percona-xtrabackup/release-2.1.2 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

Bugfixes for the 2.1.2 hotfix release.

[Laurynas Biveinis (laurynas-biveinis)]

OK.

Also any MPs to fix bug 11777182 and bug 1181092 / bug 1181099 for 2.0 are pre-approved.

review: Approve

=== modified file 'VERSION'
--- VERSION	2013-05-04 18:05:46 +0000
+++ VERSION	2013-05-17 16:01:30 +0000
@@ -1,1 +1,1 @@
-XTRABACKUP_VERSION=2.1.0rc1
+XTRABACKUP_VERSION=2.1.2
 
=== modified file 'innobackupex'
--- innobackupex	2013-05-07 08:12:22 +0000
+++ innobackupex	2013-05-17 16:01:30 +0000
@@ -139,6 +139,8 @@
 my $option_rebuild_indexes = '';
 my $option_rebuild_threads = 0;
 
+my $option_debug_sleep_before_unlock = '';
+
 my %mysql;
 my $option_backup = '';
 
@@ -1403,6 +1405,7 @@
     }
 
     if ($con{dbh} && $con{keepalives}) {
+        $con{dbh}->do("SET SESSION wait_timeout=2147483");
         start_keepalives(\%con);
     }
 
@@ -1535,8 +1538,8 @@
     open(FILE, ">$galera_info") || 
          Die "Failed to open file '$galera_info': $!";
 
-    print FILE $con->{status}->{wsrep_local_state_uuid}->{Value};
-    print FILE $con->{status}->{wsrep_last_committed}->{Value};
+    print FILE $con->{status}->{wsrep_local_state_uuid}->{Value} . ":";
+    print FILE $con->{status}->{wsrep_last_committed}->{Value} . "\n";
 
     close(FILE);
 
@@ -1573,7 +1576,14 @@
     $position = $con->{slave_status}->{Exec_Master_Log_Pos};
 
     if (!defined($master) || !defined($filename) || !defined($position)) {
-        Die "Failed to get master binlog coordinates from SHOW SLAVE STATUS";
+        my $now = current_time();
+
+        print STDERR "$now  $prefix Failed to get master binlog coordinates " .
+            "from SHOW SLAVE STATUS\n";
+        print STDERR "$now  $prefix This means that the server is not a " .
+            "replication slave. Ignoring the --slave-info option\n";
+
+        return;
     }
 
     # print slave status to a file
@@ -1611,7 +1621,7 @@
         mysql_query($con, "COMMIT");
     }
     write_binlog_info($con);
-    write_galera_info if $option_galera_info;
+    write_galera_info($con) if $option_galera_info;
 	
     $now = current_time();
     print STDERR "$now  $prefix All tables locked and flushed to disk\n";
@@ -1625,6 +1635,12 @@
 sub mysql_unlockall {
     my $con = shift;
 
+    if ($option_debug_sleep_before_unlock) {
+        my $now = current_time();
+        print STDERR "$now  $prefix Debug sleep for ".
+            "$option_debug_sleep_before_unlock seconds\n";
+        sleep $option_debug_sleep_before_unlock;
+    }
     mysql_query ($con, "UNLOCK TABLES");
 
     $now = current_time();
@@ -1976,7 +1992,9 @@
                         'safe-slave-backup-timeout=i' => \$option_safe_slave_backup_timeout,
                         'compact' => \$option_compact,
                         'rebuild-indexes' => \$option_rebuild_indexes,
-                        'rebuild-threads=i' => \$option_rebuild_threads
+                        'rebuild-threads=i' => \$option_rebuild_threads,
+                        'debug-sleep-before-unlock=i' =>
+                        \$option_debug_sleep_before_unlock
     );
                         
     if (!$rcode) {
@@ -2793,15 +2811,11 @@
 	Die "MySQL 5.0 support was removed in Percona XtraBackup 2.1. The last version to support MySQL 5.0 was Percona XtraBackup 2.0.";
     }
 
-    if($var_version =~ m/5\.1\.\d/ && $var_innodb_version =~ m/.*/) {
+    if($var_version =~ m/5\.1\.\d/ && !defined($var_innodb_version)) {
 	Die "Support for MySQL 5.1 with builtin InnoDB (not the plugin) was removed in Percona XtraBackup 2.1. The last version to support MySQL 5.1 with builtin InnoDB was Percona XtraBackup 2.0.";
     }
 
-    if($var_version =~ m/5\.1\.\d/ && $var_innodb_version =~ m/1\.0\.\d+$/) {
-	$ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup');
-    }
-
-    if($var_version =~ m/5\.1\.\d/ and $var_innodb_version =~ m/1\.0\.\d+-(rel)?\d/){
+    if($var_version =~ m/5\.1\.\d/) {
 	$ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup');
     }
 
@@ -3037,6 +3051,10 @@
 
 This option specifies the list of databases that innobackupex should back up. The option accepts a string argument or path to file that contains the list of databases to back up. The list is of the form "databasename1[.table_name1] databasename2[.table_name2] . . .". If this option is not specified, all databases containing MyISAM and InnoDB tables will be backed up.  Please make sure that --databases contains all of the InnoDB databases and tables, so that all of the innodb.frm files are also backed up. In case the list is very long, this can be specified in a file, and the full path of the file can be specified instead of the list. (See option --tables-file.)
 
+=item --debug-sleep-before-unlock=SECONDS
+
+This is a debug-only option used by the XtraBackup test suite.
+
 =item --defaults-file=[MY.CNF]
 
 This option specifies what file to read the default MySQL options from.  The option accepts a string argument. It is also passed directly to xtrabackup's --defaults-file option. See the xtrabackup documentation for details.
 
=== modified file 'patches/innodb56.patch'
--- patches/innodb56.patch	2013-05-16 18:03:18 +0000
+++ patches/innodb56.patch	2013-05-17 16:01:30 +0000
@@ -1345,3 +1345,21 @@
  #ifndef UNIV_HOTBACKUP
  /****************************************************************//**
  Starts Innobase and creates a new database if database files
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -965,14 +965,6 @@
+ ENDIF()
+ 
+ CHECK_C_SOURCE_COMPILES("
+-  int main(int argc, char **argv) 
+-  {
+-    extern char *__bss_start;
+-    return __bss_start ? 1 : 0;
+-  }"
+-HAVE_BSS_START)
+-
+-CHECK_C_SOURCE_COMPILES("
+     int main()
+     {
+       extern void __attribute__((weak)) foo(void);
+
 
=== added file 'test/t/bug1180922.sh'
--- test/t/bug1180922.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1180922.sh	2013-05-17 16:01:30 +0000
@@ -0,0 +1,13 @@
+########################################################################
+# Bug #1180922: DBD::mysql error
+########################################################################
+
+. inc/common.sh
+
+MYSQLD_EXTRA_MY_CNF_OPTS="wait_timeout=5"
+
+start_server
+
+backup_dir=$topdir/backup
+
+innobackupex --no-timestamp --debug-sleep-before-unlock=6 $backup_dir
 
=== added file 'test/t/server_version.sh'
--- test/t/server_version.sh	1970-01-01 00:00:00 +0000
+++ test/t/server_version.sh	2013-05-17 16:01:30 +0000
@@ -0,0 +1,46 @@
+#########################################################################
+# Test server version auto-detection
+#########################################################################
+
+. inc/common.sh
+
+# This test can only work when the xtrabackup binary autodetected by
+# innobackupex matches the binary built for this configuration, i.e. with
+# XB_BUILD=(xtradb51|xtradb55|xtradb56|innodb56)
+
+case "$XB_BUILD" in
+    "xtradb51" | "xtradb55" | "xtradb56" | "innodb56")
+	;;
+    *)
+	echo "Requires (xtradb51|xtradb55|xtradb56|innodb56) \
+build configuration" >> $SKIPPED_REASON
+	exit $SKIPPED_EXIT_CODE
+	;;
+esac
+
+start_server
+
+# Remove the explicit --ibbackup option from IB_ARGS
+IB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf"
+
+backup_dir=$topdir/backup
+innobackupex --no-timestamp $backup_dir
+vlog "Backup created in directory $backup_dir"
+
+stop_server
+# Remove datadir
+rm -r $mysql_datadir
+# Restore sakila
+vlog "Applying log"
+vlog "###########"
+vlog "# PREPARE #"
+vlog "###########"
+innobackupex --apply-log $backup_dir
+vlog "Restoring MySQL datadir"
+mkdir -p $mysql_datadir
+vlog "###########"
+vlog "# RESTORE #"
+vlog "###########"
+innobackupex --copy-back $backup_dir
+
+start_server
 
=== modified file 'test/testrun.sh'
--- test/testrun.sh	2013-05-07 13:32:47 +0000
+++ test/testrun.sh	2013-05-17 16:01:30 +0000
@@ -234,7 +234,7 @@
     export MYSQL_VERSION MYSQL_VERSION_COMMENT MYSQL_FLAVOR \
 	INNODB_VERSION XTRADB_VERSION INNODB_FLAVOR \
 	XB_BIN IB_BIN IB_ARGS XB_ARGS MYSQLD_EXTRA_ARGS \
-        DEFAULT_IBDATA_SIZE
+        DEFAULT_IBDATA_SIZE XB_BUILD
 }
 
 export SKIPPED_EXIT_CODE=200