Merge lp:~akopytov/percona-xtrabackup/bug1175566-2.1 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

    Bug #1175566: Assertion failure in Xtrabackup --stats run on MySQL
    datadir (xtrabackup_56)

    The root cause was http://bugs.mysql.com/bug.php?id=69131 resulting in
    xtrabackup_56 trying to update data files in the read only mode.

    This also fixes a minor issue introduced by the XtraBackup port to
    5.6. In XtraBackup we want to set the initial file format to the minimum
    supported one, rather than the maximum one, to avoid updating the file
    format tag in data files. Currently, that could never lead to any
    user-visible issues, but is still an incorrect thing to do.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/296/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'patches/innodb56.patch'
--- patches/innodb56.patch	2013-04-28 18:32:11 +0000
+++ patches/innodb56.patch	2013-05-04 10:04:32 +0000
@@ -1028,7 +1028,18 @@
  		if (srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE) {
  			/* The following call is necessary for the insert
  			buffer to work with multiple tablespaces. We must
-@@ -2647,6 +2661,7 @@
+@@ -2439,7 +2452,9 @@
+ 		value.  Important to note that we can do it ONLY after
+ 		we have finished the recovery process so that the
+ 		image of TRX_SYS_PAGE_NO is not stale. */
+-		trx_sys_file_format_tag_init();
++		if (!srv_read_only_mode) {
++			trx_sys_file_format_tag_init();
++		}
+ 	}
+ 
+ 	if (!create_new_db && sum_of_new_sizes > 0) {
+@@ -2647,6 +2662,7 @@
  	    && srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes < tablespace_size_in_header) {
  
 
=== modified file 'src/innodb_int.h'
--- src/innodb_int.h	2013-04-28 18:36:35 +0000
+++ src/innodb_int.h	2013-05-04 10:04:32 +0000
@@ -176,7 +176,11 @@
 	fil_rename_tablespace(old_name_in, id, new_name)
 #  define xb_btr_root_block_get(index, mode, mtr) \
 	btr_root_block_get(index, mtr)
-#  define UNIV_FORMAT_MAX DICT_TF_FORMAT_51;
+#  if MYSQL_VERSION_ID < 50500
+#   define UNIV_FORMAT_MIN DICT_TF_FORMAT_51
+#  else
+#   define UNIV_FORMAT_MIN DICT_TF_FORMAT_MIN;
+#  endif
 #  define dict_tf_get_zip_size dict_table_flags_to_zip_size
 #  define os_file_get_size(file) os_file_get_size_as_iblonglong(file)
 #  define xb_os_file_set_size(name, file, size)				\
 
=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2013-05-02 13:07:16 +0000
+++ src/xtrabackup.cc	2013-05-04 10:04:32 +0000
@@ -1219,9 +1219,9 @@
 	srv_use_sys_malloc = TRUE;
 	srv_file_format = 1; /* Barracuda */
 #if (MYSQL_VERSION_ID < 50500)
-	srv_check_file_format_at_startup = UNIV_FORMAT_MAX; /* on */
+	srv_check_file_format_at_startup = UNIV_FORMAT_MIN; /* on */
 #else
-	srv_max_file_format_at_startup = UNIV_FORMAT_MAX; /* on */
+	srv_max_file_format_at_startup = UNIV_FORMAT_MIN; /* on */
 #endif
 	/* --------------------------------------------------*/