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

[Alexey Kopytov]

[Stewart Smith (stewart)]

On Wed, 25 May 2011 15:05:58 -0000, Alexey Kopytov <email address hidden> wrote:
> Alexey Kopytov has proposed merging lp:~percona-dev/percona-xtrabackup/bug387587 into lp:percona-xtrabackup.

I also want this for 1.6.1 - which we need to create tree on lp
for. (based on 1.6 tree)

--
Stewart Smith

[Valentine Gostev (longbow)]

Looks fine

review: Approve (qa)

=== modified file 'patches/tar4ibd_libtar-1.2.11.patch'
--- patches/tar4ibd_libtar-1.2.11.patch	2011-03-15 21:58:13 +0000
+++ patches/tar4ibd_libtar-1.2.11.patch	2011-05-25 15:05:40 +0000
@@ -1,5 +1,6 @@
---- a/lib/Makefile.in	2011-02-21 08:15:39.000000000 -0800
-+++ b/lib/Makefile.in	2011-02-23 06:43:36.000000000 -0800
+diff -ruN a/lib/Makefile.in b/lib/Makefile.in
+--- a/lib/Makefile.in	2011-05-25 16:46:41.000000000 +0400
++++ b/lib/Makefile.in	2011-05-25 16:47:54.000000000 +0400
 @@ -29,7 +29,7 @@
  		  -I${top_srcdir}/compat \
  		  -I../listhash \
@@ -9,8 +10,9 @@
  LDFLAGS		= @LDFLAGS@
  LIBS		= @LIBS@
  LIBOBJS		= @LIBOBJS@
---- a/lib/append.c	2011-02-21 08:15:39.000000000 -0800
-+++ b/lib/append.c	2011-02-23 21:31:20.000000000 -0800
+diff -ruN a/lib/append.c b/lib/append.c
+--- a/lib/append.c	2011-05-25 16:46:41.000000000 +0400
++++ b/lib/append.c	2011-05-25 17:42:25.000000000 +0400
 @@ -27,6 +27,218 @@
  # include <unistd.h>
  #endif
@@ -230,6 +232,15 @@
  
  struct tar_dev
  {
+@@ -69,7 +281,7 @@
+ 	       (savename ? savename : "[NULL]"));
+ #endif
+ 
+-	if (lstat(realname, &s) != 0)
++	if (stat(realname, &s) != 0)
+ 	{
+ #ifdef DEBUG
+ 		perror("lstat()");
 @@ -210,11 +422,14 @@
  int
  tar_append_regfile(TAR *t, char *realname)
@@ -324,8 +335,9 @@
  	}
  
  	close(filefd);
---- a/lib/extract.c	2011-02-21 08:15:39.000000000 -0800
-+++ b/lib/extract.c	2011-02-21 08:17:37.000000000 -0800
+diff -ruN a/lib/extract.c b/lib/extract.c
+--- a/lib/extract.c	2011-05-25 16:46:41.000000000 +0400
++++ b/lib/extract.c	2011-05-25 16:47:54.000000000 +0400
 @@ -158,11 +158,11 @@
  tar_extract_regfile(TAR *t, char *realname)
  {
@@ -340,8 +352,9 @@
  	char buf[T_BLOCKSIZE];
  	char *filename;
  
---- a/lib/libtar.h	2011-02-21 08:15:39.000000000 -0800
-+++ b/lib/libtar.h	2011-02-21 08:17:37.000000000 -0800
+diff -ruN a/lib/libtar.h b/lib/libtar.h
+--- a/lib/libtar.h	2011-05-25 16:46:41.000000000 +0400
++++ b/lib/libtar.h	2011-05-25 16:47:54.000000000 +0400
 @@ -180,7 +180,7 @@
  
  /* decode tar header info */
@@ -381,8 +394,9 @@
  
  
  /***** wrapper.c **********************************************************/
---- a/lib/util.c	2011-02-21 08:15:39.000000000 -0800
-+++ b/lib/util.c	2011-02-21 08:17:37.000000000 -0800
+diff -ruN a/lib/util.c b/lib/util.c
+--- a/lib/util.c	2011-05-25 16:46:41.000000000 +0400
++++ b/lib/util.c	2011-05-25 16:47:54.000000000 +0400
 @@ -138,6 +138,14 @@
  	return i;
  }
@@ -445,8 +459,9 @@
 +	}
 +	return i;
 +}
---- a/libtar/Makefile.in	2011-02-21 08:15:39.000000000 -0800
-+++ b/libtar/Makefile.in	2011-02-23 06:44:41.000000000 -0800
+diff -ruN a/libtar/Makefile.in b/libtar/Makefile.in
+--- a/libtar/Makefile.in	2011-05-25 16:46:41.000000000 +0400
++++ b/libtar/Makefile.in	2011-05-25 16:47:54.000000000 +0400
 @@ -29,7 +29,7 @@
  		  -I${top_srcdir}/lib \
  		  -I${top_srcdir}/compat \
@@ -482,8 +497,9 @@
 -	${INSTALL_PROGRAM} libtar ${DESTDIR}${bindir}
 +	${INSTALL_PROGRAM} tar4ibd ${DESTDIR}${bindir}
  
---- a/libtar/libtar.c	2011-02-21 08:15:39.000000000 -0800
-+++ b/libtar/libtar.c	2011-02-23 06:56:56.000000000 -0800
+diff -ruN a/libtar/libtar.c b/libtar/libtar.c
+--- a/libtar/libtar.c	2011-05-25 16:46:41.000000000 +0400
++++ b/libtar/libtar.c	2011-05-25 16:47:54.000000000 +0400
 @@ -14,6 +14,7 @@
  #include <libtar.h>
  

=== modified file 'test/inc/common.sh'
--- test/inc/common.sh	2011-04-15 18:38:43 +0000
+++ test/inc/common.sh	2011-05-25 15:05:40 +0000
@@ -6,6 +6,13 @@
 mysql_port="3306"
 mysql_socket=${mysql_socket:-"/tmp/xtrabackup.mysql.sock"}
 
+if gnutar --version > /dev/null 2>&1
+then
+    TAR=gnutar
+else
+    TAR=tar
+fi
+
 OUTFILE=results/`basename $0`_innobackupex.out
 
 function vlog
@@ -64,9 +71,9 @@
 			MYSQL_INSTALL_DB=mysql_install_db
 			MYSQL_ARGS="--no-defaults --socket=${mysql_socket} --user=root"
 			MYSQLD=mysqld
-			MYSQL_BASEDIR="/usr"
+			MYSQL_BASEDIR=${MYSQL_BASEDIR:-"/usr"}
 			MYSQLD_ARGS="--no-defaults --basedir=${MYSQL_BASEDIR} --socket=${mysql_socket} --datadir=$mysql_datadir"
-			IB_BIN="innobackupex --defaults-file=$topdir/my.cnf"
+			IB_BIN="innobackupex --defaults-file=$topdir/my.cnf --user=root"
 			XB_BIN=xtrabackup
 			;;
 		5.0)
@@ -82,7 +89,7 @@
 			MYSQL_BASEDIR=$topdir/mysql-$version
 			MYSQLD_ARGS="--no-defaults --basedir=${MYSQL_BASEDIR} --socket=${mysql_socket} --datadir=$mysql_datadir"
 			MYSQL_ARGS="--no-defaults --socket=${mysql_socket} --user=root"
-			IB_BIN="innobackupex --defaults-file=$topdir/my.cnf"
+			IB_BIN="innobackupex --defaults-file=$topdir/my.cnf --user=root"
 			XB_BIN=xtrabackup_51
 			cd -
 			;;
@@ -99,7 +106,7 @@
 			MYSQL_BASEDIR=$topdir/mysql-$version
 			MYSQLD_ARGS="--no-defaults --basedir=${MYSQL_BASEDIR} --socket=${mysql_socket} --datadir=$mysql_datadir"
 			MYSQL_ARGS="--no-defaults --socket=${mysql_socket} --user=root"
-			IB_BIN="innobackupex --defaults-file=$topdir/my.cnf"
+			IB_BIN="innobackupex --defaults-file=$topdir/my.cnf --user=root"
 			XB_BIN=xtrabackup
 			cd -
 			;;
@@ -116,7 +123,7 @@
 			MYSQL_BASEDIR=$topdir/mysql-$version
 			MYSQLD_ARGS="--no-defaults --basedir=${MYSQL_BASEDIR} --socket=${mysql_socket} --datadir=$mysql_datadir"
 			MYSQL_ARGS="--no-defaults --socket=${mysql_socket} --user=root"
-			IB_BIN="innobackupex --defaults-file=$topdir/my.cnf"
+			IB_BIN="innobackupex --defaults-file=$topdir/my.cnf --user=root"
 			XB_BIN=xtrabackup_55
 			cd -
 			;;
@@ -136,7 +143,7 @@
 			set +u
 			export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$topdir/Percona-Server-$version/lib/mysql
 			set -u
-			IB_BIN="innobackupex --defaults-file=$topdir/my.cnf"
+			IB_BIN="innobackupex --defaults-file=$topdir/my.cnf --user=root"
 			XB_BIN=xtrabackup
 
 			cd -

=== modified file 'test/t/bug606981.sh'
--- test/t/bug606981.sh	2011-02-24 05:43:22 +0000
+++ test/t/bug606981.sh	2011-05-25 15:05:40 +0000
@@ -29,7 +29,7 @@
 vlog "Applying log"
 backup_dir=$topdir/backup
 cd $backup_dir
-tar -ixvf out.tar
+$TAR -ixvf out.tar
 cd - >/dev/null 2>&1 
 run_cmd innobackupex --apply-log --defaults-file=$topdir/my.cnf $backup_dir
 vlog "Restoring MySQL datadir"

=== modified file 'test/t/bug723318.sh'
--- test/t/bug723318.sh	2011-04-17 23:40:32 +0000
+++ test/t/bug723318.sh	2011-05-25 15:05:40 +0000
@@ -12,7 +12,7 @@
 
 stop_mysqld
 cd $topdir/backup/stream/
-tar -ixvf out.tar
+$TAR -ixvf out.tar
 
 if [ -f $topdir/backup/stream/xtrabackup_binary ]
 then

=== added file 'test/t/tar4ibd_symlink.sh'
--- test/t/tar4ibd_symlink.sh	1970-01-01 00:00:00 +0000
+++ test/t/tar4ibd_symlink.sh	2011-05-25 15:05:40 +0000
@@ -0,0 +1,55 @@
+########################################################################
+# Tests for tar4ibd + symlinks (bug #387587)
+########################################################################
+
+. inc/common.sh
+
+init
+run_mysqld --innodb_file_per_table
+load_dbase_schema sakila
+load_dbase_data sakila
+
+# Copy some .ibd files to a temporary location and replace them with symlinks
+
+mv $topdir/mysql/sakila/actor.ibd $topdir
+ln -s $topdir/actor.ibd $topdir/mysql/sakila
+
+mv $topdir/mysql/sakila/customer.ibd $topdir
+ln -s $topdir/customer.ibd $topdir/customer_link.ibd
+ln -s $topdir/customer_link.ibd $topdir/mysql/sakila/customer.ibd
+
+# Take backup
+mkdir -p $topdir/backup
+run_cmd ${IB_BIN} --socket=$mysql_socket --stream=tar $topdir/backup > $topdir/backup/out.tar 2> $OUTFILE
+
+stop_mysqld
+
+# Remove datadir
+rm -r $mysql_datadir
+
+# Remove the temporary files referenced by symlinks
+rm -f $topdir/actor.ibd
+rm -f $topdir/customer.ibd
+rm -f $topdir/customer_link.ibd
+
+# Restore sakila
+vlog "Applying log"
+backup_dir=$topdir/backup
+cd $backup_dir
+$TAR -ixvf out.tar
+cd - >/dev/null 2>&1 
+
+run_cmd ${IB_BIN} --apply-log $backup_dir >> $OUTFILE 2>&1
+
+vlog "Restoring MySQL datadir"
+mkdir -p $mysql_datadir
+
+run_cmd ${IB_BIN} --copy-back $backup_dir >> $OUTFILE 2>&1
+
+run_mysqld
+
+# Check sakila
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SELECT COUNT(*) FROM actor" sakila
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SELECT COUNT(*) FROM customer" sakila
+stop_mysqld
+clean

=== modified file 'test/t/xb_stream.sh'
--- test/t/xb_stream.sh	2011-04-15 18:38:43 +0000
+++ test/t/xb_stream.sh	2011-05-25 15:05:40 +0000
@@ -16,7 +16,7 @@
 vlog "Applying log"
 backup_dir=$topdir/backup
 cd $backup_dir
-tar -ixvf out.tar
+$TAR -ixvf out.tar
 cd - >/dev/null 2>&1 
 echo "###########" >> $OUTFILE
 echo "# PREPARE #" >> $OUTFILE