Merge lp:~akopytov/percona-xtrabackup/bug713267-2.0 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/206/

[Stewart Smith (stewart)]

 review approve
 merge approve

--
Stewart Smith

review: Approve

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-05-21 07:55:19 +0000
+++ src/xtrabackup.c	2012-05-30 09:24:26 +0000
@@ -2919,6 +2919,38 @@
 #endif
 }
 
+#ifdef INNODB_VERSION_SHORT
+/***********************************************************************
+Reads the space flags from a given data file and returns the compressed
+page size, or 0 if the space is not compressed. */
+static
+ulint
+xb_get_zip_size(os_file_t file)
+{
+	byte	*buf;
+	byte	*page;
+	ulint	 zip_size = ULINT_UNDEFINED;
+	ibool	 success;
+	ulint	 space;
+
+	buf = ut_malloc(2 * UNIV_PAGE_SIZE_MAX);
+	page = ut_align(buf, UNIV_PAGE_SIZE_MAX);
+
+	success = os_file_read(file, page, 0, 0, UNIV_PAGE_SIZE_MAX);
+	if (!success) {
+		goto end;
+	}
+
+	space = mach_read_from_4(page + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID);
+	zip_size = (space == 0 ) ? 0 :
+		dict_table_flags_to_zip_size(fsp_header_get_flags(page));
+end:
+	ut_free(buf);
+
+	return(zip_size);
+}
+#endif
+
 /* TODO: We may tune the behavior (e.g. by fil_aio)*/
 #define COPY_CHUNK 64
 
@@ -3043,11 +3075,58 @@
 	}
 
 skip_filter:
+
+#ifdef XTRADB_BASED
+	if (trx_sys_sys_space(node->space->id))
+#else
+	if (node->space->id == 0)
+#endif
+	{
+		char *next, *p;
+		/* system datafile "/fullpath/datafilename.ibd" or "./datafilename.ibd" */
+		p = node->name;
+		while ((next = strstr(p, SRV_PATH_SEPARATOR_STR)) != NULL)
+		{
+			p = next + 1;
+		}
+		strncpy(dst_name, p, sizeof(dst_name));
+	} else {
+		/* file per table style "./database/table.ibd" */
+		strncpy(dst_name, node->name, sizeof(dst_name));
+	}
+
+	/* open src_file*/
+	if (!node->open) {
+		src_file = xb_file_create_no_error_handling(node->name,
+							    OS_FILE_OPEN,
+							    OS_FILE_READ_ONLY,
+							    &success);
+		if (!success) {
+			/* The following call prints an error message */
+			os_file_get_last_error(TRUE);
+
+			msg("[%02u] xtrabackup: Warning: cannot open %s\n"
+			    "[%02u] xtrabackup: Warning: We assume the "
+			    "table was dropped or renamed during "
+			    "xtrabackup execution and ignore the file.\n",
+			    thread_n, node->name, thread_n);
+			goto skip;
+		}
+
+		xb_file_set_nocache(src_file, node->name, "OPEN");
+	} else {
+		src_file = node->handle;
+	}
+
+#ifdef USE_POSIX_FADVISE
+	posix_fadvise(src_file, 0, 0, POSIX_FADV_SEQUENTIAL);
+#endif
+
 #ifndef INNODB_VERSION_SHORT
 	page_size = UNIV_PAGE_SIZE;
 	page_size_shift = UNIV_PAGE_SIZE_SHIFT;
 #else
-	zip_size = fil_space_get_zip_size(node->space->id);
+	zip_size = xb_get_zip_size(src_file);
 	if (zip_size == ULINT_UNDEFINED) {
 		goto skip;
 	} else if (zip_size) {
@@ -3066,25 +3145,6 @@
 	}
 #endif
 
-#ifdef XTRADB_BASED
-	if (trx_sys_sys_space(node->space->id))
-#else
-	if (node->space->id == 0)
-#endif
-	{
-		char *next, *p;
-		/* system datafile "/fullpath/datafilename.ibd" or "./datafilename.ibd" */
-		p = node->name;
-		while ((next = strstr(p, SRV_PATH_SEPARATOR_STR)) != NULL)
-		{
-			p = next + 1;
-		}
-		strncpy(dst_name, p, sizeof(dst_name));
-	} else {
-		/* file per table style "./database/table.ibd" */
-		strncpy(dst_name, node->name, sizeof(dst_name));
-	}
-
 	if (xtrabackup_incremental) {
 		/* allocate buffer for incremental backup (4096 pages) */
 		incremental_buffer_base = ut_malloc((UNIV_PAGE_SIZE_MAX / 4 + 1)
@@ -3106,33 +3166,6 @@
 	} else
 		info.page_size = 0;
 
-	/* open src_file*/
-	if (!node->open) {
-		src_file = xb_file_create_no_error_handling(node->name,
-							    OS_FILE_OPEN,
-							    OS_FILE_READ_ONLY,
-							    &success);
-		if (!success) {
-			/* The following call prints an error message */
-			os_file_get_last_error(TRUE);
-
-			msg("[%02u] xtrabackup: Warning: cannot open %s\n"
-			    "[%02u] xtrabackup: Warning: We assume the "
-			    "table was dropped or renamed during "
-			    "xtrabackup execution and ignore the file.\n",
-			    thread_n, node->name, thread_n);
-			goto skip;
-		}
-
-		xb_file_set_nocache(src_file, node->name, "OPEN");
-	} else {
-		src_file = node->handle;
-	}
-
-#ifdef USE_POSIX_FADVISE
-	posix_fadvise(src_file, 0, 0, POSIX_FADV_SEQUENTIAL);
-#endif
-
 	if (my_stat(node->name, &src_stat, MYF(MY_WME)) == NULL) {
 		msg("[%02u] xtrabackup: Warning: cannot stat %s\n",
 		    thread_n, node->name);