Merge lp:~akopytov/percona-xtrabackup/bug891496-1.6 into lp:percona-xtrabackup/1.6

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-1.6-param/90/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'patches/tar4ibd_libtar-1.2.11.patch'
--- patches/tar4ibd_libtar-1.2.11.patch	2011-09-20 01:47:28 +0000
+++ patches/tar4ibd_libtar-1.2.11.patch	2012-01-16 12:29:26 +0000
@@ -416,7 +416,9 @@
 +		fcntl(filefd, F_SETFL, O_DIRECT);
 +#endif
 +
-+	zip_size = fil_fd_get_zip_size(filefd);
++	is_sys_space = (fil_fd_get_space_id(filefd) == 0);
++
++	zip_size = is_sys_space ? 0 : fil_fd_get_zip_size(filefd);
 +	if (zip_size == -1) {
 +		fprintf(stderr,
 +			"tar4ibd: file '%s' has invalid zip_size value.\n",
@@ -426,8 +428,6 @@
 +		page_size = zip_size;
 +	}
 +
-+	is_sys_space = (fil_fd_get_space_id(filefd) == 0);
-+
 +	n_retry = 0;
  	size = th_get_size(t);
 -	for (i = size; i > T_BLOCKSIZE; i -= T_BLOCKSIZE)

=== added file 'test/t/bug891496.sh'
--- test/t/bug891496.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug891496.sh	2012-01-16 12:29:26 +0000
@@ -0,0 +1,47 @@
+##########################################################################
+# Bug #891496: tar4ibd fails on datafiles generated on 5.0               #
+##########################################################################
+
+. inc/common.sh
+
+init
+
+innodb_data_file_path="ibdata1:3M;ibdata2:10M:autoextend"
+
+cat >> $topdir/my.cnf <<EOF
+innodb_data_file_path=$innodb_data_file_path
+EOF
+
+MYSQLD_ARGS="$MYSQLD_ARGS --innodb_data_file_path=$innodb_data_file_path"
+
+run_mysqld
+load_dbase_schema sakila
+load_dbase_data sakila
+
+# Take backup
+mkdir -p $topdir/backup
+innobackupex --stream=tar $topdir/backup > $topdir/backup/out.tar
+
+stop_mysqld
+# Remove datadir
+rm -r $mysql_datadir
+# Restore sakila
+vlog "Applying log"
+backup_dir=$topdir/backup
+cd $backup_dir
+$TAR -ixvf out.tar
+cd - >/dev/null 2>&1 
+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
+
+run_mysqld
+# Check sakila
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SELECT count(*) from actor" sakila