Merge lp:~akopytov/percona-xtrabackup/bug1181092-bug1181099-2.0 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

The corresponding change has already been merged to 2.1, but the 2.0 MP got lost somehow.

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-05-03 10:40:03 +0000
+++ innobackupex	2013-08-07 05:44:27 +0000
@@ -2886,13 +2886,10 @@
 if($var_version =~ m/5\.0\.\d/){
 	$ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup_51');
 }
-if($var_version =~ m/5\.1\.\d/ and $var_innodb_version =~ m/.*/){
+if($var_version =~ m/5\.1\.\d/ and !$var_innodb_version){
 	$ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup_51');
 }
-if($var_version =~ m/5\.1\.\d/ and $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/ and $var_innodb_version){
 	$ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup');
 }
 if($var_version =~ m/5\.2\.\d/){

=== 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-08-07 05:44:27 +0000
@@ -0,0 +1,32 @@
+#########################################################################
+# Test server version auto-detection
+#########################################################################
+
+. inc/common.sh
+
+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