Merge lp:~akopytov/percona-xtrabackup/bug1373984-2.1 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

http://jenkins.percona.com/view/PXB%202.1/job/percona-xtrabackup-2.1-param-new/19/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/test/t/bug740489.sh'
--- storage/innobase/xtrabackup/test/t/bug740489.sh	2013-04-27 18:46:54 +0000
+++ storage/innobase/xtrabackup/test/t/bug740489.sh	2014-09-25 16:08:07 +0000
@@ -12,19 +12,17 @@
 
 defaults_extra_file=$topdir/740489.cnf
 
-cat > $defaults_extra_file <<EOF
-[mysqld]
-datadir=${MYSQLD_DATADIR}
+cp $MYSQLD_VARDIR/my.cnf $defaults_extra_file
 
+cat >> $defaults_extra_file <<EOF
 [client]
-user=root
 password=password
 EOF
 
 backup_dir=$topdir/backup
 run_cmd $IB_BIN \
     --defaults-extra-file=$defaults_extra_file --socket=${MYSQLD_SOCKET} \
-    --ibbackup=$XB_BIN --no-timestamp $backup_dir
+    --ibbackup=$XB_BIN --no-version-check --no-timestamp $backup_dir
 vlog "Backup created in directory $backup_dir"
 
 run_cmd ${MYSQL} ${MYSQL_ARGS} --password=password <<EOF