Merge lp:~akopytov/percona-xtrabackup/rebase-2.1-on-newer-server-versions into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

Rebased XtraBackup on MySQL versions 5.1.70, 5.5.30, 5.6.11 and Percona
Server versions 5.1.70-rel14.8 and 5.5.31-rel30.3.

[Alexey Kopytov (akopytov)]

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

innodb56/xtradb56 failures are bug #1203669.

galera55 failures are bug #1201686 and bug #1203668 (currently being looked at by Raghu).

[Laurynas Biveinis (laurynas-biveinis)]

Indentation or tabs vs spaces in diff lines 4377 to the end?

review: Needs Fixing

[Alexey Kopytov (akopytov)]

I have standardized on spaces for indentation for XB shell scripts, because that's what the majority of code uses. I fix that in existing code whenever I have to touch a line. I deliberately kept tabs on the lines I didn't have to touch to simplify the patch.

[Laurynas Biveinis (laurynas-biveinis)]

OK

review: Approve

=== modified file 'Makefile'
--- Makefile	2013-06-18 08:07:48 +0000
+++ Makefile	2013-07-22 14:01:36 +0000
@@ -4,61 +4,31 @@
 
 # Here we specify what server versions we build against
 
-MYSQL_51_SOURCE=mysql-5.1.59.tar.gz
-MYSQL_55_SOURCE=mysql-5.5.17.tar.gz
-MYSQL_56_SOURCE=mysql-5.6.10.tar.gz
-PS_51_VERSION=5.1.59-13.0
-PS_51_SOURCE=Percona-Server-XtraBackup-$(PS_51_VERSION).tar.gz
-PS_55_VERSION=5.5.16-22.0
-PS_55_SOURCE=Percona-Server-XtraBackup-$(PS_55_VERSION).tar.gz
+MYSQL_51_SOURCE=mysql-5.1.70.tar.gz
+MYSQL_55_SOURCE=mysql-5.5.31.tar.gz
+MYSQL_56_SOURCE=mysql-5.6.11.tar.gz
+PS_51_SOURCE=Percona-Server-5.1.70-rel14.8.tar.gz
+PS_55_SOURCE=Percona-Server-5.5.31-rel30.3.tar.gz
 BZR_REVNO=$(shell bzr revno 2>/dev/null || cat REVNO)
 XTRABACKUP_VERSION=$(shell sed -e 's/XTRABACKUP_VERSION=//' < VERSION)
 
 # targets for fetching server source tarballs
 
-SERVER_SOURCE_TARBALLS=$(MYSQL_51_SOURCE) $(MYSQL_55_SOURCE) $(MYSQL_56_SOURCE)
-PS_SERVER=$(PS_51_SOURCE) $(PS_55_SOURCE)
-
-# PS server source tarballs are inadequate
-# for these older versions, so we have to make them ourselves
+SERVER_SOURCE_TARBALLS=$(MYSQL_51_SOURCE) $(MYSQL_55_SOURCE) \
+  $(MYSQL_56_SOURCE) $(PS_51_SOURCE) $(PS_55_SOURCE)
 
 .PHONY: ps51source ps55source
 
 ps51source: $(PS_51_SOURCE)
 
-
-$(PS_51_SOURCE):
-	rm -rf percona-server-5.1-xtrabackup
-	bzr branch -r tag:Percona-Server-$(PS_51_VERSION) lp:percona-server/5.1 percona-server-5.1-xtrabackup
-	cd percona-server-5.1-xtrabackup && bzr export percona-server-5.1-xtrabackup.tar.gz
-	mv percona-server-5.1-xtrabackup/percona-server-5.1-xtrabackup.tar.gz .
-	rm -rf percona-server-5.1-xtrabackup
-	tar xfz percona-server-5.1-xtrabackup.tar.gz
-	cd percona-server-5.1-xtrabackup && make mysql-$(shell echo $(PS_51_VERSION) | sed -e 's/-.*//').tar.gz
-	rm percona-server-5.1-xtrabackup.tar.gz
-	tar cfz $(PS_51_SOURCE) percona-server-5.1-xtrabackup
-	rm -rf percona-server-5.1-xtrabackup
-
 ps55source: $(PS_55_SOURCE)
 
-$(PS_55_SOURCE):
-	rm -rf percona-server-5.5-xtrabackup
-	bzr branch -r tag:Percona-Server-$(PS_55_VERSION) lp:percona-server/5.5 percona-server-5.5-xtrabackup
-	cd percona-server-5.5-xtrabackup && bzr export percona-server-5.5-xtrabackup.tar.gz
-	mv percona-server-5.5-xtrabackup/percona-server-5.5-xtrabackup.tar.gz .
-	rm -rf percona-server-5.5-xtrabackup
-	tar xfz percona-server-5.5-xtrabackup.tar.gz
-	cd percona-server-5.5-xtrabackup && make mysql-$(shell echo $(PS_55_VERSION) | sed -e 's/-.*//').tar.gz
-	rm percona-server-5.5-xtrabackup.tar.gz
-	tar cfz $(PS_55_SOURCE) percona-server-5.5-xtrabackup
-	rm -rf percona-server-5.5-xtrabackup
-
 # source dist targets
 
-dist: $(SERVER_SOURCE_TARBALLS) $(PS_SERVER)
+dist: $(SERVER_SOURCE_TARBALLS)
 	bzr export percona-xtrabackup-$(XTRABACKUP_VERSION).tar.gz
 	tar xfz percona-xtrabackup-$(XTRABACKUP_VERSION).tar.gz
-	cp $(SERVER_SOURCE_TARBALLS) $(PS_SERVER) percona-xtrabackup-$(XTRABACKUP_VERSION)/
+	cp $(SERVER_SOURCE_TARBALLS) percona-xtrabackup-$(XTRABACKUP_VERSION)/
 	echo $(BZR_REVNO) > percona-xtrabackup-$(XTRABACKUP_VERSION)/REVNO
 	rm percona-xtrabackup-$(XTRABACKUP_VERSION).tar.gz
 	tar cfz percona-xtrabackup-$(XTRABACKUP_VERSION)-$(BZR_REVNO).tar.gz percona-xtrabackup-$(XTRABACKUP_VERSION)
 
=== modified file 'patches/innodb51.patch'
--- patches/innodb51.patch	2013-05-07 13:32:47 +0000
+++ patches/innodb51.patch	2013-07-22 14:01:36 +0000
@@ -9,7 +9,7 @@
  buf_block_t*
  btr_root_block_get(
  /*===============*/
-@@ -1122,7 +1122,7 @@
+@@ -1169,7 +1169,7 @@
  /************************************************************//**
  Returns the child page of a node pointer and x-latches it.
  @return	child page, x-latched */
@@ -18,16 +18,6 @@
  buf_block_t*
  btr_node_ptr_get_child(
  /*===================*/
---- a/storage/innodb_plugin/btr/btr0cur.c
-+++ b/storage/innodb_plugin/btr/btr0cur.c
-@@ -3308,6 +3308,7 @@
- 		byte*	field;
- 
- 		field = rec_get_nth_field(rec, offsets, i, &rec_len);
-+		(void)field;
- 
- 		if (rec_len != UNIV_SQL_NULL) {
- 			n_not_null[i]++;
 --- a/storage/innodb_plugin/buf/buf0buf.c
 +++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -51,6 +51,7 @@
@@ -38,7 +28,7 @@
  
  /*
  		IMPLEMENTATION OF THE BUFFER POOL
-@@ -358,7 +359,7 @@
+@@ -350,7 +351,7 @@
  		return(TRUE);
  	}
  
@@ -47,7 +37,7 @@
  	if (recv_lsn_checks_on) {
  		ib_uint64_t	current_lsn;
  
-@@ -670,6 +671,7 @@
+@@ -662,6 +663,7 @@
  	block->page.in_flush_list = FALSE;
  	block->page.in_free_list = FALSE;
  	block->page.in_LRU_list = FALSE;
@@ -55,7 +45,7 @@
  	block->in_unzip_LRU_list = FALSE;
  #endif /* UNIV_DEBUG */
  #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
-@@ -1690,7 +1692,9 @@
+@@ -1588,7 +1590,9 @@
  	ut_ad(zip_size == fil_space_get_zip_size(space));
  	ut_ad(ut_is_2pow(zip_size));
  #ifndef UNIV_LOG_DEBUG
@@ -66,7 +56,7 @@
  #endif
  	buf_pool->stat.n_page_gets++;
  loop:
-@@ -2802,6 +2806,12 @@
+@@ -2704,6 +2708,12 @@
  			frame = ((buf_block_t*) bpage)->frame;
  		}
  
@@ -79,7 +69,7 @@
  		/* If this page is not uninitialized and not in the
  		doublewrite buffer, then the page number and space id
  		should be the same as in block. */
-@@ -2894,7 +2904,8 @@
+@@ -2796,7 +2806,8 @@
  			recv_recover_page(TRUE, (buf_block_t*) bpage);
  		}
  
@@ -199,7 +189,7 @@
  
  /*
  		IMPLEMENTATION OF THE TABLESPACE MEMORY CACHE
-@@ -287,7 +289,7 @@
+@@ -288,7 +290,7 @@
  
  /** The tablespace memory cache. This variable is NULL before the module is
  initialized. */
@@ -208,7 +198,7 @@
  
  
  /********************************************************************//**
-@@ -298,7 +300,7 @@
+@@ -299,7 +301,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -217,7 +207,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -623,7 +625,7 @@
+@@ -624,7 +626,7 @@
  Opens a the file of a node of a tablespace. The caller must own the fil_system
  mutex. */
  static
@@ -226,7 +216,7 @@
  fil_node_open_file(
  /*===============*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -657,7 +659,17 @@
+@@ -658,7 +660,17 @@
  			node->name, OS_FILE_OPEN, OS_FILE_READ_ONLY, &success);
  		if (!success) {
  			/* The following call prints an error message */
@@ -245,7 +235,7 @@
  
  			ut_print_timestamp(stderr);
  
-@@ -718,12 +730,15 @@
+@@ -719,12 +731,15 @@
  
  		if (UNIV_UNLIKELY(space_id != space->id)) {
  			fprintf(stderr,
@@ -264,7 +254,7 @@
  		}
  
  		if (UNIV_UNLIKELY(space_id == ULINT_UNDEFINED
-@@ -747,8 +762,8 @@
+@@ -748,8 +763,8 @@
  		}
  
  		if (size_bytes >= 1024 * 1024) {
@@ -275,7 +265,7 @@
  		}
  
  		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
-@@ -793,6 +808,8 @@
+@@ -794,6 +809,8 @@
  		/* Put the node to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
@@ -284,7 +274,7 @@
  }
  
  /**********************************************************************//**
-@@ -1418,7 +1435,12 @@
+@@ -1438,7 +1455,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -298,7 +288,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1470,7 +1492,12 @@
+@@ -1490,7 +1512,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -312,7 +302,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1910,7 +1937,7 @@
+@@ -1929,7 +1956,7 @@
  	mem_free(path);
  }
  
@@ -321,7 +311,7 @@
  /********************************************************//**
  Writes a log record about an .ibd file create/rename/delete. */
  static
-@@ -2134,7 +2161,7 @@
+@@ -2153,7 +2180,7 @@
  			if (fil_create_new_single_table_tablespace(
  				    space_id, name, FALSE, flags,
  				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
@@ -330,7 +320,7 @@
  			}
  		}
  
-@@ -2297,7 +2324,7 @@
+@@ -2317,7 +2344,7 @@
  	}
  
  	if (success) {
@@ -339,16 +329,16 @@
  		/* Write a log record about the deletion of the .ibd
  		file, so that ibbackup can replay it in the
  		--apply-log phase. We use a dummy mtr and the familiar
-@@ -2598,7 +2625,7 @@
+@@ -2618,7 +2645,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
 -#ifndef UNIV_HOTBACKUP
 +#ifdef UNDEFINED
- 	if (success) {
+ 	if (success && !recv_recovery_on) {
  		mtr_t		mtr;
  
-@@ -2788,7 +2815,7 @@
+@@ -2808,7 +2835,7 @@
  
  	fil_node_create(path, size, space_id, FALSE);
  
@@ -357,7 +347,7 @@
  	{
  		mtr_t		mtr;
  
-@@ -3041,19 +3068,97 @@
+@@ -3061,19 +3088,97 @@
  		      "InnoDB: open the tablespace file ", stderr);
  		ut_print_filename(stderr, filepath);
  		fputs("!\n"
@@ -465,7 +455,7 @@
  		return(FALSE);
  	}
  
-@@ -3284,7 +3389,7 @@
+@@ -3304,7 +3409,7 @@
  	cannot be ok. */
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
@@ -474,7 +464,7 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3414,7 +3519,51 @@
+@@ -3434,7 +3539,51 @@
  
  	fil_node_create(filepath, 0, space_id, FALSE);
  func_exit:
@@ -527,7 +517,7 @@
  	ut_free(buf2);
  	mem_free(filepath);
  }
-@@ -3425,7 +3574,7 @@
+@@ -3445,7 +3594,7 @@
  idea is to read as much good data as we can and jump over bad data.
  @return 0 if ok, -1 if error even after the retries, 1 if at the end
  of the directory */
@@ -536,7 +526,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -3469,7 +3618,7 @@
+@@ -3489,7 +3638,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  ulint
@@ -545,7 +535,7 @@
  /*===================================*/
  {
  	int		ret;
-@@ -3525,7 +3674,9 @@
+@@ -3545,7 +3694,9 @@
  			dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -556,7 +546,7 @@
  
  		if (dbdir != NULL) {
  			/* printf("Opened dir %s\n", dbinfo.name); */
-@@ -3551,8 +3702,11 @@
+@@ -3571,8 +3722,11 @@
  						   ".ibd")) {
  					/* The name ends in .ibd; try opening
  					the file */
@@ -569,7 +559,7 @@
  				}
  next_file_item:
  				ret = fil_file_readdir_next_file(&err,
-@@ -3724,15 +3878,97 @@
+@@ -3744,15 +3898,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -675,7 +665,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4121,7 +4357,7 @@
+@@ -4141,7 +4377,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -684,7 +674,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4141,10 +4377,13 @@
+@@ -4161,10 +4397,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -699,7 +689,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4157,6 +4396,8 @@
+@@ -4177,6 +4416,8 @@
  	}
  
  	node->n_pending++;
@@ -708,7 +698,7 @@
  }
  
  /********************************************************************//**
-@@ -4292,7 +4533,9 @@
+@@ -4312,7 +4553,9 @@
  	ut_ad(recv_no_ibuf_operations || (type == OS_FILE_WRITE)
  	      || !ibuf_bitmap_page(zip_size, block_offset)
  	      || sync || is_log);
@@ -719,7 +709,7 @@
  	      || ibuf_page(space_id, zip_size, block_offset, NULL));
  # endif /* UNIV_LOG_DEBUG */
  	if (sync) {
-@@ -4341,6 +4584,16 @@
+@@ -4361,6 +4604,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -736,6 +726,26 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
+@@ -4869,6 +5122,12 @@
+ 	const char*	tmp_name)	/*!< in: temp table name used while
+ 					swapping */
+ {
++	(void)old_space_id;
++	(void)old_name;
++	(void)new_space_id;
++	(void)new_name;
++	(void)tmp_name;
++#ifdef UNDEFINED
+ 	mtr_t           mtr;
+ 	mtr_start(&mtr);
+ 	fil_op_write_log(MLOG_FILE_RENAME, old_space_id,
+@@ -4876,5 +5135,6 @@
+ 	fil_op_write_log(MLOG_FILE_RENAME, new_space_id,
+ 			 0, 0, new_name, old_name, &mtr);
+ 	mtr_commit(&mtr);
++#endif
+ }
+ 
 --- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c
 +++ b/storage/innodb_plugin/ibuf/ibuf0ibuf.c
 @@ -1061,6 +1061,9 @@
@@ -748,7 +758,7 @@
  	if (ibuf_fixed_addr_page(space, zip_size, page_no)) {
  
  		return(TRUE);
-@@ -2277,6 +2280,9 @@
+@@ -2275,6 +2278,9 @@
  	ulint	n_bytes;
  	ulint	n_pag2;
  
@@ -760,7 +770,7 @@
  
 --- a/storage/innodb_plugin/include/fil0fil.h
 +++ b/storage/innodb_plugin/include/fil0fil.h
-@@ -504,7 +504,7 @@
+@@ -505,7 +505,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  ulint
@@ -771,7 +781,7 @@
  Returns TRUE if a single-table tablespace does not exist in the memory cache,
 --- a/storage/innodb_plugin/include/mem0mem.ic
 +++ b/storage/innodb_plugin/include/mem0mem.ic
-@@ -367,7 +367,7 @@
+@@ -363,7 +363,7 @@
  	buf = (byte*)buf + MEM_FIELD_HEADER_SIZE;
  
  	/* Check that the field lengths agree */
@@ -782,7 +792,7 @@
  	return(buf);
 --- a/storage/innodb_plugin/include/mtr0mtr.ic
 +++ b/storage/innodb_plugin/include/mtr0mtr.ic
-@@ -160,7 +160,7 @@
+@@ -161,7 +161,7 @@
  	while (offset > 0) {
  		offset -= sizeof(mtr_memo_slot_t);
  
@@ -989,7 +999,7 @@
  ibool
  log_block_checksum_is_ok_or_old_format(
  /*===================================*/
-@@ -1486,6 +1487,7 @@
+@@ -1492,6 +1493,7 @@
  					     buf_block_get_page_no(block));
  
  	if ((recv_addr == NULL)
@@ -997,7 +1007,7 @@
  	    || (recv_addr->state == RECV_BEING_PROCESSED)
  	    || (recv_addr->state == RECV_PROCESSED)) {
  
-@@ -1575,9 +1577,16 @@
+@@ -1581,9 +1583,16 @@
  			if (page_zip) {
  				memset(FIL_PAGE_LSN + page_zip->data, 0, 8);
  			}
@@ -1015,7 +1025,7 @@
  
  			ib_uint64_t	end_lsn;
  
-@@ -1762,6 +1771,18 @@
+@@ -1769,6 +1778,18 @@
  			ulint	zip_size = fil_space_get_zip_size(space);
  			ulint	page_no = recv_addr->page_no;
  
@@ -1034,7 +1044,7 @@
  			if (recv_addr->state == RECV_NOT_PROCESSED) {
  				if (!has_printed) {
  					ut_print_timestamp(stderr);
-@@ -1795,7 +1816,7 @@
+@@ -1802,7 +1823,7 @@
  
  				mutex_enter(&(recv_sys->mutex));
  			}
@@ -1043,7 +1053,7 @@
  			recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
  		}
  
-@@ -2297,7 +2318,7 @@
+@@ -2304,7 +2325,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -1052,7 +1062,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2320,7 +2341,7 @@
+@@ -2327,7 +2348,7 @@
  					ut_error;
  				}
  			}
@@ -1061,7 +1071,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2737,8 +2758,11 @@
+@@ -2744,8 +2765,11 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -1075,7 +1085,7 @@
  		}
  	}
  
-@@ -2841,7 +2865,7 @@
+@@ -2848,7 +2872,7 @@
  		"InnoDB: Reading tablespace information"
  		" from the .ibd files...\n");
  
@@ -1084,7 +1094,7 @@
  
  	/* If we are using the doublewrite method, we will
  	check if there are half-written pages in data files,
-@@ -2850,12 +2874,14 @@
+@@ -2857,12 +2881,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -1100,7 +1110,7 @@
  	}
  }
  
-@@ -3005,6 +3031,7 @@
+@@ -3012,6 +3038,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -1108,7 +1118,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3286,6 +3313,7 @@
+@@ -3293,6 +3320,7 @@
  	that the data dictionary tables will be free of any locks.
  	The data dictionary latch should guarantee that there is at
  	most one data dictionary transaction active at a time. */
@@ -1127,7 +1137,7 @@
  #if defined(UNIV_HOTBACKUP) || defined(__WIN__) || defined(__NETWARE__)
  /* InnoDB Hot Backup does not lock the data files.
   * On Windows, mandatory locking is used.
-@@ -1316,8 +1316,9 @@
+@@ -1324,8 +1324,9 @@
  		attributes = 0;
  		ut_error;
  	}
@@ -1138,7 +1148,7 @@
  			  GENERIC_READ | GENERIC_WRITE, /* read and write
  							access */
  			  share_mode,	/* File can be read also by other
-@@ -1376,7 +1377,11 @@
+@@ -1391,7 +1392,11 @@
  	if (create_mode == OS_FILE_OPEN || create_mode == OS_FILE_OPEN_RAW
  	    || create_mode == OS_FILE_OPEN_RETRY) {
  		mode_str = "OPEN";
@@ -1151,7 +1161,7 @@
  	} else if (create_mode == OS_FILE_CREATE) {
  		mode_str = "CREATE";
  		create_flag = O_RDWR | O_CREAT | O_EXCL;
-@@ -2545,6 +2550,9 @@
+@@ -2560,6 +2565,9 @@
  	ut_a((offset & 0xFFFFFFFFUL) == offset);
  	ut_a((n & 0xFFFFFFFFUL) == n);
  
@@ -1161,7 +1171,7 @@
  	os_n_file_writes++;
  
  	ut_ad(file);
-@@ -2669,6 +2677,9 @@
+@@ -2684,6 +2692,9 @@
  #else
  	ssize_t	ret;
  
@@ -1193,7 +1203,7 @@
  
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
-@@ -374,6 +374,10 @@
+@@ -383,6 +383,10 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
@@ -1204,7 +1214,7 @@
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -1002,7 +1006,7 @@
+@@ -1011,7 +1015,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -1213,7 +1223,7 @@
  }
  
  /*********************************************************************//**
-@@ -1013,6 +1017,7 @@
+@@ -1022,6 +1026,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -1221,7 +1231,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1026,6 +1031,7 @@
+@@ -1035,6 +1040,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -1334,9 +1344,9 @@
  	srv_was_started = TRUE;
 --- a/storage/innodb_plugin/trx/trx0purge.c
 +++ b/storage/innodb_plugin/trx/trx0purge.c
-@@ -1087,6 +1087,9 @@
+@@ -1093,6 +1093,9 @@
  	/*	que_thr_t*	thr2; */
- 	ulint		old_pages_handled;
+ 	ulonglong	old_pages_handled;
  
 +	if (srv_fake_write)
 +		return(0);
@@ -1360,7 +1370,7 @@
  
 --- a/storage/innodb_plugin/trx/trx0sys.c
 +++ b/storage/innodb_plugin/trx/trx0sys.c
-@@ -1586,12 +1586,14 @@
+@@ -1583,12 +1583,14 @@
  	mem_free(trx_doublewrite);
  	trx_doublewrite = NULL;
  
@@ -1375,7 +1385,7 @@
  
  	/* There can't be any active transactions. */
  	rseg = UT_LIST_GET_FIRST(trx_sys->rseg_list);
-@@ -1617,10 +1619,12 @@
+@@ -1614,10 +1616,12 @@
  		UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
  	}
  
@@ -1425,9 +1435,9 @@
  
  /*
  			WAIT ARRAY
-@@ -927,6 +928,13 @@
- 	ibool		fatal = FALSE;
- 	double		longest_diff = 0;
+@@ -932,6 +933,13 @@
+ 		return(FALSE);
+ 	}
  
 +	if (srv_rebuild_indexes) {
 +
@@ -1436,12 +1446,12 @@
 +		return(FALSE);
 +	}
 +
+ 	sync_array_enter(sync_primary_wait_array);
+ 
  	for (i = 0; i < sync_primary_wait_array->n_cells; i++) {
- 
- 		double	diff;
 --- a/storage/innodb_plugin/include/buf0buf.h
 +++ b/storage/innodb_plugin/include/buf0buf.h
-@@ -1191,6 +1191,8 @@
+@@ -1270,6 +1270,8 @@
  					frees a page in buffer pool */
  # endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
  #endif /* !UNIV_HOTBACKUP */
@@ -1493,14 +1503,3 @@
  
  	UNIV_MEM_FREE(buf, n);
  }
---- a/configure.in
-+++ b/configure.in
-@@ -22,7 +22,7 @@
- AM_INIT_AUTOMAKE([1.9 tar-ustar])
- AC_PROG_LIBTOOL
- 
--AM_CONFIG_HEADER([include/config.h])
-+AC_CONFIG_HEADERS([include/config.h])
- 
- # Request support for automake silent-rules if available.
- # Default to verbose output. One can use the configure-time
 
=== modified file 'patches/innodb55.patch'
--- patches/innodb55.patch	2013-05-07 13:32:47 +0000
+++ patches/innodb55.patch	2013-07-22 14:01:36 +0000
@@ -1,6 +1,6 @@
 --- a/storage/innobase/btr/btr0btr.c
 +++ b/storage/innobase/btr/btr0btr.c
-@@ -674,7 +674,7 @@
+@@ -698,7 +698,7 @@
  /**************************************************************//**
  Gets the root node of a tree and x-latches it.
  @return	root page, x-latched */
@@ -9,7 +9,7 @@
  buf_block_t*
  btr_root_block_get(
  /*===============*/
-@@ -1123,7 +1123,7 @@
+@@ -1183,7 +1183,7 @@
  /************************************************************//**
  Returns the child page of a node pointer and x-latches it.
  @return	child page, x-latched */
@@ -28,7 +28,7 @@
  
  /*
  		IMPLEMENTATION OF THE BUFFER POOL
-@@ -518,7 +519,7 @@
+@@ -538,7 +539,7 @@
  		return(TRUE);
  	}
  
@@ -37,7 +37,7 @@
  	if (recv_lsn_checks_on) {
  		ib_uint64_t	current_lsn;
  
-@@ -881,6 +882,7 @@
+@@ -918,6 +919,7 @@
  	block->page.in_flush_list = FALSE;
  	block->page.in_free_list = FALSE;
  	block->page.in_LRU_list = FALSE;
@@ -45,7 +45,7 @@
  	block->in_unzip_LRU_list = FALSE;
  #endif /* UNIV_DEBUG */
  #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
-@@ -2299,7 +2301,8 @@
+@@ -2256,7 +2258,8 @@
  	ut_ad(zip_size == fil_space_get_zip_size(space));
  	ut_ad(ut_is_2pow(zip_size));
  #ifndef UNIV_LOG_DEBUG
@@ -55,7 +55,7 @@
  	      || ibuf_page_low(space, zip_size, offset,
  			       FALSE, file, line, NULL));
  #endif
-@@ -3567,6 +3570,13 @@
+@@ -3535,6 +3538,13 @@
  			frame = ((buf_block_t*) bpage)->frame;
  		}
  
@@ -69,7 +69,7 @@
  		/* If this page is not uninitialized and not in the
  		doublewrite buffer, then the page number and space id
  		should be the same as in block. */
-@@ -3668,7 +3678,8 @@
+@@ -3637,7 +3647,8 @@
  			recv_recover_page(TRUE, (buf_block_t*) bpage);
  		}
  
@@ -81,7 +81,7 @@
  				bpage->offset, buf_page_get_zip_size(bpage),
 --- a/storage/innobase/buf/buf0rea.c
 +++ b/storage/innobase/buf/buf0rea.c
-@@ -124,6 +124,45 @@
+@@ -162,6 +162,45 @@
  	bpage = buf_page_init_for_read(err, mode, space, zip_size, unzip,
  				       tablespace_version, offset);
  	if (bpage == NULL) {
@@ -127,7 +127,7 @@
  
  		return(0);
  	}
-@@ -768,6 +807,50 @@
+@@ -820,6 +859,50 @@
  		/* It is a single table tablespace and the .ibd file is
  		missing: do nothing */
  
@@ -189,7 +189,7 @@
  #ifndef UNIV_HOTBACKUP
  # include "buf0lru.h"
  # include "ibuf0ibuf.h"
-@@ -297,7 +299,7 @@
+@@ -300,7 +302,7 @@
  
  /** The tablespace memory cache. This variable is NULL before the module is
  initialized. */
@@ -198,7 +198,7 @@
  
  #ifdef UNIV_DEBUG
  /** Try fil_validate() every this many times */
-@@ -336,7 +338,7 @@
+@@ -339,7 +341,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -207,7 +207,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -661,7 +663,7 @@
+@@ -664,7 +666,7 @@
  Opens a the file of a node of a tablespace. The caller must own the fil_system
  mutex. */
  static
@@ -216,7 +216,7 @@
  fil_node_open_file(
  /*===============*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -696,7 +698,17 @@
+@@ -699,7 +701,17 @@
  			OS_FILE_READ_ONLY, &success);
  		if (!success) {
  			/* The following call prints an error message */
@@ -235,7 +235,7 @@
  
  			ut_print_timestamp(stderr);
  
-@@ -757,12 +769,15 @@
+@@ -760,12 +772,15 @@
  
  		if (UNIV_UNLIKELY(space_id != space->id)) {
  			fprintf(stderr,
@@ -254,7 +254,7 @@
  		}
  
  		if (UNIV_UNLIKELY(space_id == ULINT_UNDEFINED
-@@ -786,8 +801,8 @@
+@@ -789,8 +804,8 @@
  		}
  
  		if (size_bytes >= 1024 * 1024) {
@@ -265,7 +265,7 @@
  		}
  
  		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
-@@ -838,6 +853,8 @@
+@@ -841,6 +856,8 @@
  		/* Put the node to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
@@ -274,7 +274,7 @@
  }
  
  /**********************************************************************//**
-@@ -1464,7 +1481,12 @@
+@@ -1504,7 +1521,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -288,7 +288,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1516,7 +1538,12 @@
+@@ -1573,7 +1595,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -302,7 +302,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1957,7 +1984,7 @@
+@@ -2021,7 +2048,7 @@
  	mem_free(path);
  }
  
@@ -311,7 +311,7 @@
  /********************************************************//**
  Writes a log record about an .ibd file create/rename/delete. */
  static
-@@ -2181,7 +2208,7 @@
+@@ -2245,7 +2272,7 @@
  			if (fil_create_new_single_table_tablespace(
  				    space_id, name, FALSE, flags,
  				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
@@ -320,7 +320,7 @@
  			}
  		}
  
-@@ -2344,7 +2371,7 @@
+@@ -2434,7 +2461,7 @@
  	}
  
  	if (success) {
@@ -329,16 +329,16 @@
  		/* Write a log record about the deletion of the .ibd
  		file, so that ibbackup can replay it in the
  		--apply-log phase. We use a dummy mtr and the familiar
-@@ -2645,7 +2672,7 @@
+@@ -2735,7 +2762,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
 -#ifndef UNIV_HOTBACKUP
 +#ifdef UNDEFINED
- 	if (success) {
+ 	if (success && !recv_recovery_on) {
  		mtr_t		mtr;
  
-@@ -2836,7 +2863,7 @@
+@@ -2926,7 +2953,7 @@
  
  	fil_node_create(path, size, space_id, FALSE);
  
@@ -347,7 +347,7 @@
  	{
  		mtr_t		mtr;
  
-@@ -3091,19 +3118,97 @@
+@@ -3181,19 +3208,97 @@
  		      "InnoDB: open the tablespace file ", stderr);
  		ut_print_filename(stderr, filepath);
  		fputs("!\n"
@@ -455,7 +455,7 @@
  		return(FALSE);
  	}
  
-@@ -3335,7 +3440,7 @@
+@@ -3425,7 +3530,7 @@
  	cannot be ok. */
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
@@ -464,7 +464,7 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3465,7 +3570,51 @@
+@@ -3555,7 +3660,51 @@
  
  	fil_node_create(filepath, 0, space_id, FALSE);
  func_exit:
@@ -517,7 +517,7 @@
  	ut_free(buf2);
  	mem_free(filepath);
  }
-@@ -3476,7 +3625,7 @@
+@@ -3566,7 +3715,7 @@
  idea is to read as much good data as we can and jump over bad data.
  @return 0 if ok, -1 if error even after the retries, 1 if at the end
  of the directory */
@@ -526,7 +526,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -3520,7 +3669,7 @@
+@@ -3610,7 +3759,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  ulint
@@ -535,7 +535,7 @@
  /*===================================*/
  {
  	int		ret;
-@@ -3576,7 +3725,9 @@
+@@ -3666,7 +3815,9 @@
  			dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -546,7 +546,7 @@
  
  		if (dbdir != NULL) {
  			/* printf("Opened dir %s\n", dbinfo.name); */
-@@ -3602,8 +3753,11 @@
+@@ -3692,8 +3843,11 @@
  						   ".ibd")) {
  					/* The name ends in .ibd; try opening
  					the file */
@@ -559,7 +559,7 @@
  				}
  next_file_item:
  				ret = fil_file_readdir_next_file(&err,
-@@ -3775,15 +3929,97 @@
+@@ -3865,15 +4019,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -665,7 +665,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4172,7 +4408,7 @@
+@@ -4262,7 +4498,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -674,7 +674,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4192,10 +4428,13 @@
+@@ -4282,10 +4518,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -689,7 +689,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4208,6 +4447,8 @@
+@@ -4298,6 +4537,8 @@
  	}
  
  	node->n_pending++;
@@ -698,7 +698,7 @@
  }
  
  /********************************************************************//**
-@@ -4390,6 +4631,16 @@
+@@ -4482,6 +4723,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -715,9 +715,29 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
+@@ -4997,6 +5248,12 @@
+ 	const char*	tmp_name)	/*!< in: temp table name used while
+ 					swapping */
+ {
++	(void)old_space_id;
++	(void)old_name;
++	(void)new_space_id;
++	(void)new_name;
++	(void)tmp_name;
++#ifdef UNDEFINED
+ 	mtr_t           mtr;
+ 	mtr_start(&mtr);
+ 	fil_op_write_log(MLOG_FILE_RENAME, old_space_id,
+@@ -5004,5 +5261,6 @@
+ 	fil_op_write_log(MLOG_FILE_RENAME, new_space_id,
+ 			 0, 0, new_name, old_name, &mtr);
+ 	mtr_commit(&mtr);
++#endif
+ }
+ 
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
-@@ -1148,6 +1148,9 @@
+@@ -1157,6 +1157,9 @@
  	ut_ad(!recv_no_ibuf_operations);
  	ut_ad(x_latch || mtr == NULL);
  
@@ -727,7 +747,7 @@
  	if (ibuf_fixed_addr_page(space, zip_size, page_no)) {
  
  		return(TRUE);
-@@ -2715,6 +2718,9 @@
+@@ -2729,6 +2732,9 @@
  	ulint	n_bytes;
  	ulint	n_pag2;
  
@@ -739,7 +759,7 @@
  
 --- a/storage/innobase/include/fil0fil.h
 +++ b/storage/innobase/include/fil0fil.h
-@@ -505,7 +505,7 @@
+@@ -513,7 +513,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  ulint
@@ -803,16 +823,16 @@
  
  	if (log_sys->n_pending_checkpoint_writes > 0) {
  		/* A checkpoint write is running */
-@@ -3114,6 +3116,7 @@
+@@ -3141,6 +3143,7 @@
  	shutdown, because the InnoDB layer may have committed or
  	prepared transactions and we don't want to lose them. */
  
 +	if (!srv_apply_log_only) {
  	server_busy = trx_n_mysql_transactions > 0
  		|| UT_LIST_GET_LEN(trx_sys->trx_list) > trx_n_prepared;
- 	mutex_exit(&kernel_mutex);
-@@ -3121,6 +3124,10 @@
- 	if (server_busy || srv_is_any_background_thread_active()) {
+ 
+@@ -3193,6 +3196,10 @@
+ 
  		goto loop;
  	}
 +	}
@@ -902,7 +922,7 @@
  ibool
  log_block_checksum_is_ok_or_old_format(
  /*===================================*/
-@@ -1496,6 +1497,7 @@
+@@ -1502,6 +1503,7 @@
  					     buf_block_get_page_no(block));
  
  	if ((recv_addr == NULL)
@@ -910,7 +930,7 @@
  	    || (recv_addr->state == RECV_BEING_PROCESSED)
  	    || (recv_addr->state == RECV_PROCESSED)) {
  
-@@ -1585,9 +1587,16 @@
+@@ -1591,9 +1593,16 @@
  			if (page_zip) {
  				memset(FIL_PAGE_LSN + page_zip->data, 0, 8);
  			}
@@ -928,7 +948,7 @@
  
  			ib_uint64_t	end_lsn;
  
-@@ -1774,6 +1783,18 @@
+@@ -1780,6 +1789,18 @@
  			ulint	zip_size = fil_space_get_zip_size(space);
  			ulint	page_no = recv_addr->page_no;
  
@@ -947,7 +967,7 @@
  			if (recv_addr->state == RECV_NOT_PROCESSED) {
  				if (!has_printed) {
  					ut_print_timestamp(stderr);
-@@ -1807,7 +1828,7 @@
+@@ -1813,7 +1834,7 @@
  
  				mutex_enter(&(recv_sys->mutex));
  			}
@@ -956,7 +976,7 @@
  			recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
  		}
  
-@@ -2308,7 +2329,7 @@
+@@ -2314,7 +2335,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -965,7 +985,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2331,7 +2352,7 @@
+@@ -2337,7 +2358,7 @@
  					ut_error;
  				}
  			}
@@ -974,7 +994,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2748,8 +2769,11 @@
+@@ -2754,8 +2775,11 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -988,7 +1008,7 @@
  		}
  	}
  
-@@ -2854,7 +2878,7 @@
+@@ -2860,7 +2884,7 @@
  		"InnoDB: Reading tablespace information"
  		" from the .ibd files...\n");
  
@@ -997,7 +1017,7 @@
  
  	/* If we are using the doublewrite method, we will
  	check if there are half-written pages in data files,
-@@ -2863,12 +2887,14 @@
+@@ -2869,12 +2893,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -1013,7 +1033,7 @@
  	}
  }
  
-@@ -3018,6 +3044,7 @@
+@@ -3024,6 +3050,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -1021,7 +1041,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3299,6 +3326,7 @@
+@@ -3305,6 +3332,7 @@
  	that the data dictionary tables will be free of any locks.
  	The data dictionary latch should guarantee that there is at
  	most one data dictionary transaction active at a time. */
@@ -1031,7 +1051,7 @@
  
 --- a/storage/innobase/os/os0file.c
 +++ b/storage/innobase/os/os0file.c
-@@ -656,7 +656,7 @@
+@@ -658,7 +658,7 @@
  }
  
  #undef USE_FILE_LOCK
@@ -1040,7 +1060,7 @@
  #if defined(UNIV_HOTBACKUP) || defined(__WIN__)
  /* InnoDB Hot Backup does not lock the data files.
   * On Windows, mandatory locking is used.
-@@ -1456,8 +1456,9 @@
+@@ -1465,8 +1465,9 @@
  		attributes = 0;
  		ut_error;
  	}
@@ -1051,7 +1071,7 @@
  			  GENERIC_READ | GENERIC_WRITE, /* read and write
  							access */
  			  share_mode,	/* File can be read also by other
-@@ -1516,7 +1517,11 @@
+@@ -1531,7 +1532,11 @@
  	if (create_mode == OS_FILE_OPEN || create_mode == OS_FILE_OPEN_RAW
  	    || create_mode == OS_FILE_OPEN_RETRY) {
  		mode_str = "OPEN";
@@ -1064,7 +1084,7 @@
  	} else if (create_mode == OS_FILE_CREATE) {
  		mode_str = "CREATE";
  		create_flag = O_RDWR | O_CREAT | O_EXCL;
-@@ -2694,6 +2699,9 @@
+@@ -2709,6 +2714,9 @@
  	ut_a((offset & 0xFFFFFFFFUL) == offset);
  	ut_a((n & 0xFFFFFFFFUL) == n);
  
@@ -1074,7 +1094,7 @@
  	os_n_file_writes++;
  
  	ut_ad(file);
-@@ -2818,6 +2826,9 @@
+@@ -2833,6 +2841,9 @@
  #else
  	ssize_t	ret;
  
@@ -1105,7 +1125,7 @@
  }
 --- a/storage/innobase/srv/srv0srv.c
 +++ b/storage/innobase/srv/srv0srv.c
-@@ -399,6 +399,10 @@
+@@ -405,6 +405,10 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
@@ -1116,7 +1136,7 @@
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -1078,7 +1082,7 @@
+@@ -1084,7 +1088,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -1125,7 +1145,7 @@
  }
  
  /*********************************************************************//**
-@@ -1089,6 +1093,7 @@
+@@ -1095,6 +1099,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -1133,7 +1153,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1102,6 +1107,7 @@
+@@ -1108,6 +1113,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -1141,7 +1161,7 @@
  }
  
  /*********************************************************************//**
-@@ -1717,7 +1723,7 @@
+@@ -1727,7 +1733,7 @@
  		}
  
  		/* Record the lock wait time for this thread */
@@ -1187,7 +1207,7 @@
  ulint
  open_or_create_data_files(
  /*======================*/
-@@ -1419,7 +1422,7 @@
+@@ -1448,7 +1451,7 @@
  	}
  #endif /* UNIV_LOG_ARCHIVE */
  
@@ -1196,7 +1216,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: combined size of log files"
-@@ -1714,6 +1717,10 @@
+@@ -1743,6 +1746,10 @@
  		are initialized in trx_sys_init_at_db_start(). */
  
  		recv_recovery_from_checkpoint_finish();
@@ -1207,7 +1227,7 @@
  		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
-@@ -1873,6 +1880,17 @@
+@@ -1902,6 +1909,17 @@
  	if (!srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes != tablespace_size_in_header) {
  
@@ -1225,7 +1245,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: tablespace size"
-@@ -1952,6 +1970,7 @@
+@@ -1981,6 +1999,7 @@
  
  			return(DB_ERROR);
  		}
@@ -1233,7 +1253,7 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -1976,6 +1995,10 @@
+@@ -2005,6 +2024,10 @@
  
  	os_fast_mutex_free(&srv_os_test_mutex);
  
@@ -1244,7 +1264,7 @@
  	if (srv_print_verbose_log) {
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
-@@ -2064,6 +2087,7 @@
+@@ -2093,6 +2116,7 @@
  		ibuf_update_max_tablespace_id();
  	}
  
@@ -1268,7 +1288,7 @@
  
 --- a/storage/innobase/trx/trx0sys.c
 +++ b/storage/innobase/trx/trx0sys.c
-@@ -1655,12 +1655,14 @@
+@@ -1656,12 +1656,14 @@
  	mem_free(trx_doublewrite);
  	trx_doublewrite = NULL;
  
@@ -1283,7 +1303,7 @@
  
  	/* There can't be any active transactions. */
  	rseg = UT_LIST_GET_FIRST(trx_sys->rseg_list);
-@@ -1686,10 +1688,12 @@
+@@ -1687,10 +1689,12 @@
  		UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
  	}
  
@@ -1325,7 +1345,7 @@
  								"InnoDB: Since"
 --- a/storage/innobase/trx/trx0purge.c
 +++ b/storage/innobase/trx/trx0purge.c
-@@ -1129,6 +1129,9 @@
+@@ -1141,6 +1141,9 @@
  	que_thr_t*	thr;
  	ulint		old_pages_handled;
  
@@ -1335,19 +1355,6 @@
  	ut_a(purge_sys->trx->n_active_thrs == 0);
  
  	rw_lock_x_lock(&purge_sys->latch);
---- a/configure.cmake
-+++ b/configure.cmake
-@@ -149,7 +149,9 @@
-   SET(CMAKE_REQUIRED_LIBRARIES 
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
- 
--  LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
-+  IF(CMAKE_REQUIRED_LIBRARIES)
-+    LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
-+  ENDIF()
-   LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
-   
-   OPTION(WITH_LIBWRAP "Compile with tcp wrappers support" OFF)
 --- a/storage/innobase/sync/sync0arr.c
 +++ b/storage/innobase/sync/sync0arr.c
 @@ -41,6 +41,7 @@
@@ -1358,9 +1365,9 @@
  
  /*
  			WAIT ARRAY
-@@ -928,6 +929,13 @@
- 	ibool		fatal = FALSE;
- 	double		longest_diff = 0;
+@@ -929,6 +930,13 @@
+ 		return(FALSE);
+ 	}
  
 +	if (srv_rebuild_indexes) {
 +
@@ -1374,7 +1381,7 @@
  	extremely slowly. UNIV_DEBUG_VALGRIND does not necessary mean that
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -1441,6 +1441,8 @@
+@@ -1531,6 +1531,8 @@
  					frees a page in buffer pool */
  # endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
  #endif /* !UNIV_HOTBACKUP */
@@ -1385,7 +1392,7 @@
  /** The buffer control block structure */
 --- a/storage/innobase/mem/mem0dbg.c
 +++ b/storage/innobase/mem/mem0dbg.c
-@@ -280,18 +280,10 @@
+@@ -282,18 +282,10 @@
  	byte*	buf,	/*!< in: pointer to buffer */
  	ulint	 n)	/*!< in: length of buffer */
  {
@@ -1406,7 +1413,7 @@
  
  	UNIV_MEM_INVALID(buf, n);
  }
-@@ -306,17 +298,10 @@
+@@ -308,17 +300,10 @@
  	byte*	buf,	/*!< in: pointer to buffer */
  	ulint	n)	/*!< in: length of buffer */
  {
 
=== modified file 'patches/innodb56.patch'
--- patches/innodb56.patch	2013-07-10 12:29:40 +0000
+++ patches/innodb56.patch	2013-07-22 14:01:36 +0000
@@ -52,7 +52,7 @@
  	block->in_unzip_LRU_list = FALSE;
  #endif /* UNIV_DEBUG */
  #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
-@@ -3951,6 +3959,13 @@
+@@ -3963,6 +3971,13 @@
  			frame = ((buf_block_t*) bpage)->frame;
  		}
  
@@ -66,7 +66,7 @@
  		/* If this page is not uninitialized and not in the
  		doublewrite buffer, then the page number and space id
  		should be the same as in block. */
-@@ -4068,7 +4083,7 @@
+@@ -4080,7 +4095,7 @@
  			recv_recover_page(TRUE, (buf_block_t*) bpage);
  		}
  
@@ -177,7 +177,7 @@
  }
  
  /**********************************************************************//**
-@@ -1491,7 +1510,12 @@
+@@ -1506,7 +1525,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -191,7 +191,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -2095,7 +2119,7 @@
+@@ -2109,7 +2133,7 @@
  	mem_free(path);
  }
  
@@ -200,7 +200,7 @@
  /********************************************************//**
  Writes a log record about an .ibd file create/rename/delete. */
  static
-@@ -2329,7 +2353,7 @@
+@@ -2343,7 +2367,7 @@
  				    space_id, name, path, flags,
  				    DICT_TF2_USE_TABLESPACE,
  				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
@@ -209,7 +209,7 @@
  			}
  		}
  
-@@ -2687,7 +2711,7 @@
+@@ -2702,7 +2726,7 @@
  	}
  
  	if (err == DB_SUCCESS) {
@@ -218,7 +218,7 @@
  		/* Write a log record about the deletion of the .ibd
  		file, so that ibbackup can replay it in the
  		--apply-log phase. We use a dummy mtr and the familiar
-@@ -3042,7 +3066,7 @@
+@@ -3057,7 +3081,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
@@ -227,7 +227,7 @@
  	if (success && !recv_recovery_on) {
  		mtr_t		mtr;
  
-@@ -3426,7 +3450,7 @@
+@@ -3441,7 +3465,7 @@
  		goto error_exit_1;
  	}
  
@@ -236,7 +236,7 @@
  	{
  		mtr_t		mtr;
  		ulint		mlog_file_flag = 0;
-@@ -3504,6 +3528,97 @@
+@@ -3519,6 +3543,97 @@
  #endif /* UNIV_LOG_ARCHIVE */
  };
  
@@ -334,7 +334,7 @@
  /********************************************************************//**
  Tries to open a single-table tablespace and optionally checks that the
  space id in it is correct. If this does not succeed, print an error message
-@@ -3569,6 +3684,9 @@
+@@ -3584,6 +3699,9 @@
  	in the default location. If it is remote, it should not be here. */
  	def.filepath = fil_make_ibd_name(tablename, false);
  
@@ -344,7 +344,7 @@
  	/* The path_in was read from SYS_DATAFILES. */
  	if (path_in) {
  		if (strcmp(def.filepath, path_in)) {
-@@ -3616,6 +3734,7 @@
+@@ -3631,6 +3749,7 @@
  			tablespaces_found++;
  		}
  	}
@@ -352,7 +352,7 @@
  
  	/* Always look for a file at the default location. */
  	ut_a(def.filepath);
-@@ -3712,11 +3831,15 @@
+@@ -3727,11 +3846,15 @@
  		/* The following call prints an error message */
  		os_file_get_last_error(true);
  
@@ -369,7 +369,7 @@
  
  		err = DB_CORRUPTION;
  
-@@ -3974,6 +4097,9 @@
+@@ -3989,6 +4112,9 @@
  #ifdef UNIV_HOTBACKUP
  	fil_space_t*	space;
  #endif
@@ -379,7 +379,7 @@
  
  	memset(&def, 0, sizeof(def));
  	memset(&remote, 0, sizeof(remote));
-@@ -4018,6 +4144,9 @@
+@@ -4033,6 +4159,9 @@
  # endif /* !UNIV_HOTBACKUP */
  #endif
  
@@ -389,7 +389,7 @@
  	/* Check for a link file which locates a remote tablespace. */
  	remote.success = fil_open_linked_file(
  		tablename, &remote.filepath, &remote.file);
-@@ -4028,8 +4157,20 @@
+@@ -4043,8 +4172,20 @@
  		if (!remote.success) {
  			os_file_close(remote.file);
  			mem_free(remote.filepath);
@@ -410,7 +410,7 @@
  
  
  	/* Try to open the tablespace in the datadir. */
-@@ -4042,6 +4183,17 @@
+@@ -4057,6 +4198,17 @@
  		fil_validate_single_table_tablespace(tablename, &def);
  		if (!def.success) {
  			os_file_close(def.file);
@@ -428,7 +428,7 @@
  		}
  	}
  
-@@ -4114,7 +4266,7 @@
+@@ -4129,7 +4281,7 @@
  	/* At this point, only one tablespace is open */
  	ut_a(def.success == !remote.success);
  
@@ -437,7 +437,7 @@
  
  	/* Get and test the file size. */
  	size = os_file_get_size(fsp->file);
-@@ -4133,9 +4285,9 @@
+@@ -4148,9 +4300,9 @@
  
  	/* Every .ibd file is created >= 4 pages in size. Smaller files
  	cannot be ok. */
@@ -449,7 +449,7 @@
  		ib_logf(IB_LOG_LEVEL_ERROR,
  			"The size of single-table tablespace file %s "
  			"is only " UINT64PF ", should be at least %lu!",
-@@ -4216,7 +4368,7 @@
+@@ -4231,7 +4383,7 @@
  	}
  	mutex_exit(&fil_system->mutex);
  #endif /* UNIV_HOTBACKUP */
@@ -458,7 +458,7 @@
  		tablename, fsp->id, fsp->flags, FIL_TABLESPACE);
  
  	if (!file_space_create_success) {
-@@ -4243,13 +4395,55 @@
+@@ -4258,13 +4410,55 @@
  	}
  
  func_exit:
@@ -518,7 +518,7 @@
  	mem_free(tablename);
  	if (remote.success) {
  		mem_free(remote.filepath);
-@@ -4263,7 +4457,7 @@
+@@ -4278,7 +4472,7 @@
  idea is to read as much good data as we can and jump over bad data.
  @return 0 if ok, -1 if error even after the retries, 1 if at the end
  of the directory */
@@ -527,7 +527,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4303,7 +4497,7 @@
+@@ -4318,7 +4512,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  dberr_t
@@ -536,7 +536,7 @@
  /*===================================*/
  {
  	int		ret;
-@@ -4359,7 +4553,9 @@
+@@ -4374,7 +4568,9 @@
  			    "%s/%s", fil_path_to_mysql_datadir, dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -547,7 +547,7 @@
  
  		if (dbdir != NULL) {
  
-@@ -4380,9 +4576,15 @@
+@@ -4395,9 +4591,15 @@
  				    && (0 == strcmp(fileinfo.name
  						   + strlen(fileinfo.name) - 4,
  						   ".ibd")
@@ -565,7 +565,7 @@
  					/* The name ends in .ibd or .isl;
  					try opening the file */
  					fil_load_single_table_tablespace(
-@@ -4538,6 +4740,7 @@
+@@ -4553,6 +4755,7 @@
  {
  	fil_space_t*	fnamespace;
  	fil_space_t*	space;
@@ -573,7 +573,7 @@
  
  	ut_ad(fil_system);
  
-@@ -4615,6 +4818,10 @@
+@@ -4630,6 +4833,10 @@
  		if (fnamespace == NULL) {
  			if (print_error_if_does_not_exist) {
  				fil_report_missing_tablespace(name, id);
@@ -584,7 +584,7 @@
  			}
  		} else {
  			ut_print_timestamp(stderr);
-@@ -4638,6 +4845,10 @@
+@@ -4653,6 +4860,10 @@
  
  		mutex_exit(&fil_system->mutex);
  
@@ -595,7 +595,7 @@
  		return(FALSE);
  	}
  
-@@ -4728,6 +4939,7 @@
+@@ -4743,6 +4954,7 @@
  	ulint		page_size;
  	ulint		pages_added;
  	ibool		success;
@@ -603,7 +603,7 @@
  
  	ut_ad(!srv_read_only_mode);
  
-@@ -4772,13 +4984,17 @@
+@@ -4787,13 +4999,17 @@
  		goto retry;
  	}
  
@@ -622,7 +622,7 @@
  	start_page_no = space->size;
  	file_start_page_no = space->size - node->size;
  
-@@ -5024,7 +5240,7 @@
+@@ -5039,7 +5255,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -631,7 +631,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -5044,9 +5260,12 @@
+@@ -5059,9 +5275,12 @@
  	}
  
  	if (node->open == FALSE) {
@@ -645,7 +645,7 @@
  	}
  
  	if (node->n_pending == 0 && fil_space_belongs_in_lru(space)) {
-@@ -5058,6 +5277,8 @@
+@@ -5073,6 +5292,8 @@
  	}
  
  	node->n_pending++;
@@ -654,7 +654,7 @@
  }
  
  /********************************************************************//**
-@@ -5259,6 +5480,16 @@
+@@ -5274,6 +5495,16 @@
  
  	ut_ad(mode != OS_AIO_IBUF || space->purpose == FIL_TABLESPACE);
  
@@ -671,7 +671,7 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
-@@ -5290,7 +5521,11 @@
+@@ -5305,7 +5536,11 @@
  	}
  
  	/* Open file if closed */
@@ -684,7 +684,7 @@
  
  	/* Check that at least the start offset is within the bounds of a
  	single-table tablespace, including rollback tablespaces. */
-@@ -6164,6 +6399,7 @@
+@@ -6179,6 +6414,7 @@
  	return(err);
  }
  
@@ -692,11 +692,10 @@
  /****************************************************************//**
  Generate redo logs for swapping two .ibd files */
  UNIV_INTERN
-@@ -6187,4 +6423,4 @@
- 			 0, 0, new_name, old_name, &mtr);
- 	mtr_commit(&mtr);
+@@ -6205,3 +6441,4 @@
+ 				 0, 0, new_name, old_name, mtr);
+ 	}
  }
--
 +#endif
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
@@ -709,7 +708,7 @@
  
  		if (thd && thd_sql_command(thd) == SQLCOM_DROP_TABLE) {
  
-@@ -2423,43 +2423,19 @@
+@@ -2459,43 +2459,19 @@
  	ulint		buflen,	/*!< in: length of buf, in bytes */
  	const char*	id,	/*!< in: identifier to convert */
  	ulint		idlen,	/*!< in: length of id, in bytes */
@@ -758,7 +757,7 @@
  		if (UNIV_UNLIKELY(idlen > buflen)) {
  			idlen = buflen;
  		}
-@@ -16642,45 +16618,24 @@
+@@ -16774,45 +16750,24 @@
  void
  ib_logf(
  /*====*/
@@ -1022,20 +1021,6 @@
  #if defined(UNIV_HOTBACKUP) || defined(__WIN__)
  /* InnoDB Hot Backup does not lock the data files.
   * On Windows, mandatory locking is used.
---- a/storage/innobase/row/row0merge.cc
-+++ b/storage/innobase/row/row0merge.cc
-@@ -3227,9 +3227,11 @@
- 		goto err_exit;
- 	}
- 
-+#if 0
- 	/* Generate the redo logs for file operations */
- 	fil_mtr_rename_log(old_table->space, old_name,
- 			   new_table->space, new_table->name, tmp_name);
-+#endif
- 
- 	/* What if the redo logs are flushed to disk here?  This is
- 	tested with following crash point */
 --- a/storage/innobase/srv/srv0srv.cc
 +++ b/storage/innobase/srv/srv0srv.cc
 @@ -349,6 +349,10 @@
@@ -1049,7 +1034,7 @@
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_spin_wait_delay	= 6;
-@@ -1808,7 +1812,8 @@
+@@ -1814,7 +1818,8 @@
  	if (ret == SRV_NONE
  	    && srv_shutdown_state != SRV_SHUTDOWN_NONE
  	    && trx_purge_state() != PURGE_STATE_DISABLED
@@ -1173,7 +1158,7 @@
  		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
-@@ -2439,7 +2452,9 @@
+@@ -2439,7 +2453,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. */
@@ -1184,7 +1169,7 @@
  	}
  
  	if (!create_new_db && sum_of_new_sizes > 0) {
-@@ -2647,6 +2662,7 @@
+@@ -2647,6 +2663,7 @@
  	    && srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes < tablespace_size_in_header) {
  
@@ -1192,7 +1177,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: tablespace size stored in header"
-@@ -2683,6 +2698,7 @@
+@@ -2683,6 +2700,7 @@
  
  			return(DB_ERROR);
  		}
@@ -1200,7 +1185,7 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -2707,6 +2723,10 @@
+@@ -2707,6 +2725,10 @@
  
  	os_fast_mutex_free(&srv_os_test_mutex);
  
@@ -1211,7 +1196,7 @@
  	if (srv_print_verbose_log) {
  		ib_logf(IB_LOG_LEVEL_INFO,
  			"%s started; log sequence number " LSN_PF "",
-@@ -2739,6 +2759,7 @@
+@@ -2739,6 +2761,7 @@
  		fts_optimize_init();
  	}
  
@@ -1219,7 +1204,7 @@
  	srv_was_started = TRUE;
  
  	return(DB_SUCCESS);
-@@ -2794,7 +2815,7 @@
+@@ -2794,7 +2817,7 @@
  		return(DB_SUCCESS);
  	}
  
@@ -1285,7 +1270,7 @@
  	total_trx = UT_LIST_GET_LEN(trx_sys->rw_trx_list)
 --- a/storage/innobase/trx/trx0trx.cc
 +++ b/storage/innobase/trx/trx0trx.cc
-@@ -2053,7 +2053,8 @@
+@@ -2084,7 +2084,8 @@
  		scenario where some undo generated by a transaction,
  		has XA stuff, and other undo, generated by the same
  		transaction, doesn't. */
@@ -1320,7 +1305,7 @@
  
  /*
  			WAIT ARRAY
-@@ -903,6 +904,13 @@
+@@ -899,6 +900,13 @@
  	ibool		fatal = FALSE;
  	double		longest_diff = 0;
  
@@ -1336,7 +1321,7 @@
  		return(FALSE);
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -1583,6 +1583,8 @@
+@@ -1580,6 +1580,8 @@
  					or buf_block_t::mutex. */
  # endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
  #endif /* !UNIV_HOTBACKUP */
@@ -1390,7 +1375,7 @@
  }
 --- a/storage/innobase/include/srv0start.h
 +++ b/storage/innobase/include/srv0start.h
-@@ -77,6 +77,23 @@
+@@ -68,6 +68,23 @@
  srv_add_path_separator_if_needed(
  /*=============================*/
  	char*	str);	/*!< in: null-terminated character string */
@@ -1416,7 +1401,7 @@
  Starts Innobase and creates a new database if database files
 --- a/configure.cmake
 +++ b/configure.cmake
-@@ -965,14 +965,6 @@
+@@ -979,14 +979,6 @@
  ENDIF()
  
  CHECK_C_SOURCE_COMPILES("
@@ -1448,3 +1433,21 @@
    return tmp && tmp->init ? &tmp->dbug : 0;
  }
  #endif /* DBUG_OFF */
+--- a/storage/innobase/handler/handler0alter.cc
++++ b/storage/innobase/handler/handler0alter.cc
+@@ -5434,6 +5434,7 @@
+ 				= static_cast<ha_innobase_inplace_ctx*>(*pctx);
+ 
+ 			DBUG_ASSERT(ctx->need_rebuild());
++#if 0
+ 			/* Generate the redo log for the file
+ 			operations that will be performed in
+ 			commit_cache_rebuild(). */
+@@ -5442,6 +5443,7 @@
+ 					   ctx->new_table->space,
+ 					   ctx->new_table->name,
+ 					   ctx->tmp_name, &mtr);
++#endif
+ 			DBUG_INJECT_CRASH("ib_commit_inplace_crash",
+ 					  crash_inject_count++);
+ 		}
 
=== modified file 'patches/xtradb51.patch'
--- patches/xtradb51.patch	2013-05-07 13:32:47 +0000
+++ patches/xtradb51.patch	2013-07-22 14:01:36 +0000
@@ -1,6 +1,6 @@
 --- a/storage/innodb_plugin/btr/btr0btr.c
 +++ b/storage/innodb_plugin/btr/btr0btr.c
-@@ -674,7 +674,7 @@
+@@ -680,7 +680,7 @@
  /**************************************************************//**
  Gets the root node of a tree and x-latches it.
  @return	root page, x-latched */
@@ -9,7 +9,7 @@
  buf_block_t*
  btr_root_block_get(
  /*===============*/
-@@ -1134,7 +1134,7 @@
+@@ -1198,7 +1198,7 @@
  /************************************************************//**
  Returns the child page of a node pointer and x-latches it.
  @return	child page, x-latched */
@@ -28,7 +28,7 @@
  
  /* prototypes for new functions added to ha_innodb.cc */
  trx_t* innobase_get_trx();
-@@ -412,7 +413,7 @@
+@@ -414,7 +415,7 @@
  		return(TRUE);
  	}
  
@@ -37,7 +37,7 @@
  	if (recv_lsn_checks_on) {
  		ib_uint64_t	current_lsn;
  
-@@ -744,6 +745,7 @@
+@@ -746,6 +747,7 @@
  	block->page.zip_list.prev = NULL;
  	block->page.zip_list.next = NULL;
  	block->page.in_LRU_list = FALSE;
@@ -45,7 +45,7 @@
  	block->in_unzip_LRU_list = FALSE;
  #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
  	block->n_pointers = 0;
-@@ -1888,7 +1890,9 @@
+@@ -1787,7 +1789,9 @@
  	ut_ad(zip_size == fil_space_get_zip_size(space));
  	ut_ad(ut_is_2pow(zip_size));
  #ifndef UNIV_LOG_DEBUG
@@ -56,7 +56,7 @@
  #endif
  	if (innobase_get_slow_log()) {
  		trx = innobase_get_trx();
-@@ -3190,6 +3194,13 @@
+@@ -3096,6 +3100,13 @@
  			frame = ((buf_block_t*) bpage)->frame;
  		}
  
@@ -70,7 +70,7 @@
  		/* If this page is not uninitialized and not in the
  		doublewrite buffer, then the page number and space id
  		should be the same as in block. */
-@@ -3302,7 +3313,8 @@
+@@ -3208,7 +3219,8 @@
  			recv_recover_page(TRUE, (buf_block_t*) bpage);
  		}
  
@@ -82,7 +82,7 @@
  				(srv_pass_corrupt_table && bpage->is_corrupt) ? NULL :
 --- a/storage/innodb_plugin/fil/fil0fil.c
 +++ b/storage/innodb_plugin/fil/fil0fil.c
-@@ -297,7 +297,7 @@
+@@ -298,7 +298,7 @@
  
  /** The tablespace memory cache. This variable is NULL before the module is
  initialized. */
@@ -91,7 +91,7 @@
  
  
  /********************************************************************//**
-@@ -308,7 +308,7 @@
+@@ -309,7 +309,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -100,7 +100,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -633,7 +633,7 @@
+@@ -634,7 +634,7 @@
  Opens a the file of a node of a tablespace. The caller must own the fil_system
  mutex. */
  static
@@ -109,7 +109,7 @@
  fil_node_open_file(
  /*===============*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -667,7 +667,17 @@
+@@ -668,7 +668,17 @@
  			node->name, OS_FILE_OPEN, OS_FILE_READ_ONLY, &success);
  		if (!success) {
  			/* The following call prints an error message */
@@ -128,7 +128,7 @@
  
  			ut_print_timestamp(stderr);
  
-@@ -728,12 +738,14 @@
+@@ -729,12 +739,14 @@
  
  		if (UNIV_UNLIKELY(space_id != space->id)) {
  			fprintf(stderr,
@@ -147,7 +147,7 @@
  		}
  
  		if (UNIV_UNLIKELY(space_id == ULINT_UNDEFINED
-@@ -757,8 +769,8 @@
+@@ -758,8 +770,8 @@
  		}
  
  		if (size_bytes >= 1024 * 1024) {
@@ -158,7 +158,7 @@
  		}
  
  		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
-@@ -803,6 +815,8 @@
+@@ -804,6 +816,8 @@
  		/* Put the node to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
@@ -167,7 +167,7 @@
  }
  
  /**********************************************************************//**
-@@ -1431,7 +1445,12 @@
+@@ -1451,7 +1465,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -181,7 +181,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1483,7 +1502,12 @@
+@@ -1503,7 +1522,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -195,7 +195,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1933,7 +1957,7 @@
+@@ -1952,7 +1976,7 @@
  	mem_free(path);
  }
  
@@ -204,7 +204,7 @@
  /********************************************************//**
  Writes a log record about an .ibd file create/rename/delete. */
  static
-@@ -2157,7 +2181,7 @@
+@@ -2176,7 +2200,7 @@
  			if (fil_create_new_single_table_tablespace(
  				    space_id, name, FALSE, flags,
  				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
@@ -213,7 +213,7 @@
  			}
  		}
  
-@@ -2324,7 +2348,7 @@
+@@ -2344,7 +2368,7 @@
  	}
  
  	if (success) {
@@ -222,16 +222,16 @@
  		/* Write a log record about the deletion of the .ibd
  		file, so that ibbackup can replay it in the
  		--apply-log phase. We use a dummy mtr and the familiar
-@@ -2625,7 +2649,7 @@
+@@ -2645,7 +2669,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
 -#ifndef UNIV_HOTBACKUP
 +#ifdef UNDEFINED
- 	if (success) {
+ 	if (success && !recv_recovery_on) {
  		mtr_t		mtr;
  
-@@ -2815,7 +2839,7 @@
+@@ -2835,7 +2859,7 @@
  
  	fil_node_create(path, size, space_id, FALSE);
  
@@ -240,7 +240,7 @@
  	{
  		mtr_t		mtr;
  
-@@ -3159,19 +3183,97 @@
+@@ -3182,19 +3206,97 @@
  		      "InnoDB: open the tablespace file ", stderr);
  		ut_print_filename(stderr, filepath);
  		fputs("!\n"
@@ -348,7 +348,7 @@
  		return(FALSE);
  	}
  
-@@ -4106,7 +4208,7 @@
+@@ -4138,7 +4240,7 @@
  	cannot be ok. */
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
@@ -357,7 +357,7 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -4236,7 +4338,51 @@
+@@ -4268,7 +4370,51 @@
  
  	fil_node_create(filepath, 0, space_id, FALSE);
  func_exit:
@@ -410,7 +410,7 @@
  	ut_free(buf2);
  	mem_free(filepath);
  }
-@@ -4247,7 +4393,7 @@
+@@ -4279,7 +4425,7 @@
  idea is to read as much good data as we can and jump over bad data.
  @return 0 if ok, -1 if error even after the retries, 1 if at the end
  of the directory */
@@ -419,7 +419,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4291,7 +4437,7 @@
+@@ -4323,7 +4469,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  ulint
@@ -428,7 +428,7 @@
  /*===================================*/
  {
  	int		ret;
-@@ -4347,7 +4493,9 @@
+@@ -4379,7 +4525,9 @@
  			dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -439,7 +439,7 @@
  
  		if (dbdir != NULL) {
  			/* printf("Opened dir %s\n", dbinfo.name); */
-@@ -4373,8 +4521,11 @@
+@@ -4405,8 +4553,11 @@
  						   ".ibd")) {
  					/* The name ends in .ibd; try opening
  					the file */
@@ -452,7 +452,7 @@
  				}
  next_file_item:
  				ret = fil_file_readdir_next_file(&err,
-@@ -4546,15 +4697,97 @@
+@@ -4578,15 +4729,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -558,7 +558,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4953,7 +5186,7 @@
+@@ -4985,7 +5218,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -567,7 +567,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4973,10 +5206,13 @@
+@@ -5005,10 +5238,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -582,7 +582,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4989,6 +5225,8 @@
+@@ -5021,6 +5257,8 @@
  	}
  
  	node->n_pending++;
@@ -591,7 +591,7 @@
  }
  
  /********************************************************************//**
-@@ -5125,7 +5363,9 @@
+@@ -5157,7 +5395,9 @@
  	ut_ad(recv_no_ibuf_operations || (type == OS_FILE_WRITE)
  	      || !ibuf_bitmap_page(zip_size, block_offset)
  	      || sync || is_log);
@@ -602,7 +602,7 @@
  	      || ibuf_page(space_id, zip_size, block_offset, NULL));
  # endif /* UNIV_LOG_DEBUG */
  	if (sync) {
-@@ -5190,6 +5430,16 @@
+@@ -5222,6 +5462,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -619,9 +619,24 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
+@@ -5924,6 +6174,7 @@
+ 	const char*	tmp_name)	/*!< in: temp table name used while
+ 					swapping */
+ {
++#ifdef UNDEFINED
+ 	mtr_t           mtr;
+ 	mtr_start(&mtr);
+ 	fil_op_write_log(MLOG_FILE_RENAME, old_space_id,
+@@ -5931,5 +6182,6 @@
+ 	fil_op_write_log(MLOG_FILE_RENAME, new_space_id,
+ 			 0, 0, new_name, old_name, &mtr);
+ 	mtr_commit(&mtr);
++#endif
+ }
+ 
 --- a/storage/innodb_plugin/handler/ha_innodb.cc
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -365,12 +365,6 @@
+@@ -388,12 +388,6 @@
    "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.",
    NULL, NULL, 50, 1, 1024 * 1024 * 1024, 0);
  
@@ -634,7 +649,7 @@
  static MYSQL_THDVAR_BOOL(fake_changes, PLUGIN_VAR_OPCMDARG,
    "In the transaction after enabled, UPDATE, INSERT and DELETE only move the cursor to the records "
    "and do nothing other operations (no changes, no ibuf, no undo, no transaction log) in the transaction. "
-@@ -760,17 +754,6 @@
+@@ -789,17 +783,6 @@
  }
  
  /******************************************************************//**
@@ -652,7 +667,7 @@
  Returns true if expand_fast_index_creation is enabled for the current
  session.
  @return	the value of the server's expand_fast_index_creation variable */
-@@ -11966,7 +11949,6 @@
+@@ -12551,7 +12534,6 @@
    MYSQL_SYSVAR(flush_neighbor_pages),
    MYSQL_SYSVAR(read_ahead),
    MYSQL_SYSVAR(adaptive_checkpoint),
@@ -672,7 +687,7 @@
  	if (ibuf_fixed_addr_page(space, zip_size, page_no)) {
  
  		return(TRUE);
-@@ -2280,6 +2283,9 @@
+@@ -2278,6 +2281,9 @@
  	ulint	n_bytes;
  	ulint	n_pag2;
  
@@ -684,7 +699,7 @@
  
 --- a/storage/innodb_plugin/include/fil0fil.h
 +++ b/storage/innodb_plugin/include/fil0fil.h
-@@ -505,7 +505,7 @@
+@@ -509,7 +509,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  ulint
@@ -712,7 +727,7 @@
  @return	the value of the server's innodb_expand_fast_index_creation variable */
 --- a/storage/innodb_plugin/include/log0recv.h
 +++ b/storage/innodb_plugin/include/log0recv.h
-@@ -444,7 +444,7 @@
+@@ -481,7 +481,7 @@
  /* defined in os0file.c */
  #define OS_AIO_MERGE_N_CONSECUTIVE	64
  /* defined in log0recv.c */
@@ -723,7 +738,7 @@
  
 --- a/storage/innodb_plugin/include/mem0mem.ic
 +++ b/storage/innodb_plugin/include/mem0mem.ic
-@@ -367,7 +367,7 @@
+@@ -363,7 +363,7 @@
  	buf = (byte*)buf + MEM_FIELD_HEADER_SIZE;
  
  	/* Check that the field lengths agree */
@@ -734,7 +749,7 @@
  	return(buf);
 --- a/storage/innodb_plugin/include/srv0srv.h
 +++ b/storage/innodb_plugin/include/srv0srv.h
-@@ -226,6 +226,11 @@
+@@ -243,6 +243,11 @@
  
  extern ulong	srv_replication_delay;
  
@@ -816,7 +831,7 @@
  
 --- a/storage/innodb_plugin/log/log0log.c
 +++ b/storage/innodb_plugin/log/log0log.c
-@@ -1370,7 +1370,7 @@
+@@ -1449,7 +1449,7 @@
  #endif /* UNIV_DEBUG */
  	ulint		unlock;
  
@@ -825,7 +840,7 @@
  		/* Recovery is running and no operations on the log files are
  		allowed yet (the variable name .._no_ibuf_.. is misleading) */
  
-@@ -2032,7 +2032,7 @@
+@@ -2117,7 +2117,7 @@
  		return(TRUE);
  	}
  
@@ -834,7 +849,7 @@
  
  	if (log_sys->n_pending_checkpoint_writes > 0) {
  		/* A checkpoint write is running */
-@@ -3127,6 +3127,7 @@
+@@ -3232,6 +3232,7 @@
  	shutdown, because the InnoDB layer may have committed or
  	prepared transactions and we don't want to lose them. */
  
@@ -842,7 +857,7 @@
  	if (trx_n_mysql_transactions > 0
  	    || UT_LIST_GET_LEN(trx_sys->trx_list) > trx_n_prepared) {
  
-@@ -3134,6 +3135,7 @@
+@@ -3239,6 +3240,7 @@
  
  		goto loop;
  	}
@@ -885,7 +900,7 @@
  
  /** The recovery system */
  UNIV_INTERN recv_sys_t*	recv_sys = NULL;
-@@ -621,7 +622,7 @@
+@@ -622,7 +623,7 @@
  /***********************************************************************//**
  Checks the consistency of the checkpoint info
  @return	TRUE if ok */
@@ -894,7 +909,7 @@
  ibool
  recv_check_cp_is_consistent(
  /*========================*/
-@@ -651,7 +652,7 @@
+@@ -652,7 +653,7 @@
  /********************************************************//**
  Looks for the maximum consistent checkpoint from the log groups.
  @return	error code or DB_SUCCESS */
@@ -903,16 +918,7 @@
  ulint
  recv_find_max_checkpoint(
  /*=====================*/
-@@ -840,7 +841,7 @@
- InnoDB-3.23.52 where the checksum field contains the log block number.
- @return TRUE if ok, or if the log block may be in the format of InnoDB
- version predating 3.23.52 */
--static
-+//static
- ibool
- log_block_checksum_is_ok_or_old_format(
- /*===================================*/
-@@ -1629,9 +1630,16 @@
+@@ -1636,9 +1637,16 @@
  			if (page_zip) {
  				memset(FIL_PAGE_LSN + page_zip->data, 0, 8);
  			}
@@ -930,7 +936,7 @@
  
  			ib_uint64_t	end_lsn;
  
-@@ -1830,6 +1838,18 @@
+@@ -1838,6 +1846,18 @@
  			ulint	zip_size = fil_space_get_zip_size(space);
  			ulint	page_no = recv_addr->page_no;
  
@@ -949,7 +955,7 @@
  			if (recv_addr->state == RECV_NOT_PROCESSED) {
  				if (!has_printed) {
  					ut_print_timestamp(stderr);
-@@ -1863,7 +1883,7 @@
+@@ -1871,7 +1891,7 @@
  
  				mutex_enter(&(recv_sys->mutex));
  			}
@@ -958,7 +964,7 @@
  			recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
  		}
  
-@@ -2369,7 +2389,7 @@
+@@ -2377,7 +2397,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -967,7 +973,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2392,7 +2412,7 @@
+@@ -2400,7 +2420,7 @@
  					ut_error;
  				}
  			}
@@ -976,7 +982,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2809,8 +2829,11 @@
+@@ -2817,8 +2837,11 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -990,7 +996,7 @@
  		}
  	}
  
-@@ -2913,7 +2936,7 @@
+@@ -2921,7 +2944,7 @@
  		"InnoDB: Reading tablespace information"
  		" from the .ibd files...\n");
  
@@ -999,7 +1005,7 @@
  
  	/* If we are using the doublewrite method, we will
  	check if there are half-written pages in data files,
-@@ -2922,12 +2945,14 @@
+@@ -2930,12 +2953,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -1015,7 +1021,7 @@
  	}
  }
  
-@@ -3095,6 +3120,7 @@
+@@ -3103,6 +3128,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -1023,7 +1029,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3453,6 +3479,7 @@
+@@ -3461,6 +3487,7 @@
  	that the data dictionary tables will be free of any locks.
  	The data dictionary latch should guarantee that there is at
  	most one data dictionary transaction active at a time. */
@@ -1042,7 +1048,7 @@
  #if defined(UNIV_HOTBACKUP) || defined(__WIN__) || defined(__NETWARE__)
  /* InnoDB Hot Backup does not lock the data files.
   * On Windows, mandatory locking is used.
-@@ -1357,8 +1357,9 @@
+@@ -1365,8 +1365,9 @@
  		attributes = 0;
  		ut_error;
  	}
@@ -1053,7 +1059,7 @@
  			  GENERIC_READ | GENERIC_WRITE, /* read and write
  							access */
  			  share_mode,	/* File can be read also by other
-@@ -1417,7 +1418,11 @@
+@@ -1432,7 +1433,11 @@
  	if (create_mode == OS_FILE_OPEN || create_mode == OS_FILE_OPEN_RAW
  	    || create_mode == OS_FILE_OPEN_RETRY) {
  		mode_str = "OPEN";
@@ -1066,7 +1072,7 @@
  	} else if (create_mode == OS_FILE_CREATE) {
  		mode_str = "CREATE";
  		create_flag = O_RDWR | O_CREAT | O_EXCL;
-@@ -2682,6 +2687,9 @@
+@@ -2716,6 +2721,9 @@
  	ut_a((offset & 0xFFFFFFFFUL) == offset);
  	ut_a((n & 0xFFFFFFFFUL) == n);
  
@@ -1076,7 +1082,7 @@
  	os_n_file_writes++;
  
  	ut_ad(file);
-@@ -2806,6 +2814,9 @@
+@@ -2840,6 +2848,9 @@
  #else
  	ssize_t	ret;
  
@@ -1108,9 +1114,9 @@
  
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
-@@ -86,11 +86,6 @@
- #include "trx0i_s.h"
- #include "os0sync.h" /* for HAVE_ATOMIC_BUILTINS */
+@@ -96,11 +96,6 @@
+ # include "my_sys.h" /* DEBUG_SYNC_C */
+ #endif
  
 -/* prototypes of new functions added to ha_innodb.cc for kill_idle_transaction */
 -ibool		innobase_thd_is_idle(const void* thd);
@@ -1120,7 +1126,7 @@
  /* prototypes for new functions added to ha_innodb.cc */
  ibool	innobase_get_slow_log();
  
-@@ -415,6 +410,11 @@
+@@ -438,6 +433,11 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
@@ -1132,7 +1138,7 @@
  UNIV_INTERN long long	srv_ibuf_max_size = 0;
  UNIV_INTERN ulint	srv_ibuf_active_contract = 0; /* 0:disable 1:enable */
  UNIV_INTERN ulint	srv_ibuf_accel_rate = 100;
-@@ -1065,7 +1065,7 @@
+@@ -1095,7 +1095,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -1141,7 +1147,7 @@
  }
  
  /*********************************************************************//**
-@@ -1076,6 +1076,7 @@
+@@ -1106,6 +1106,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -1149,7 +1155,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1089,6 +1090,7 @@
+@@ -1119,6 +1120,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -1157,7 +1163,7 @@
  }
  
  /*********************************************************************//**
-@@ -2570,36 +2572,6 @@
+@@ -2634,36 +2636,6 @@
  		old_sema = sema;
  	}
  
@@ -1196,7 +1202,7 @@
  
 --- a/storage/innodb_plugin/srv/srv0start.c
 +++ b/storage/innodb_plugin/srv/srv0start.c
-@@ -62,6 +62,7 @@
+@@ -63,6 +63,7 @@
  #include "ibuf0ibuf.h"
  #include "srv0start.h"
  #include "srv0srv.h"
@@ -1204,7 +1210,7 @@
  #ifndef UNIV_HOTBACKUP
  # include "os0proc.h"
  # include "sync0sync.h"
-@@ -95,6 +96,8 @@
+@@ -96,6 +97,8 @@
  /** Log sequence number at shutdown */
  UNIV_INTERN ib_uint64_t	srv_shutdown_lsn;
  
@@ -1213,7 +1219,7 @@
  #ifdef HAVE_DARWIN_THREADS
  # include <sys/utsname.h>
  /** TRUE if the F_FULLFSYNC option is available */
-@@ -545,7 +548,7 @@
+@@ -540,7 +543,7 @@
  /*********************************************************************//**
  Creates or opens the log files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1222,7 +1228,7 @@
  ulint
  open_or_create_log_file(
  /*====================*/
-@@ -703,7 +706,7 @@
+@@ -698,7 +701,7 @@
  /*********************************************************************//**
  Creates or opens database data files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1231,7 +1237,7 @@
  ulint
  open_or_create_data_files(
  /*======================*/
-@@ -1782,6 +1785,10 @@
+@@ -1804,6 +1807,10 @@
  		are initialized in trx_sys_init_at_db_start(). */
  
  		recv_recovery_from_checkpoint_finish();
@@ -1242,7 +1248,7 @@
  		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
-@@ -1962,7 +1969,18 @@
+@@ -1990,7 +1997,18 @@
  
  	if (srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes < tablespace_size_in_header) {
@@ -1261,7 +1267,7 @@
  		fprintf(stderr,
  			"InnoDB: Error: tablespace size stored in header"
  			" is %lu pages, but\n"
-@@ -1987,6 +2005,7 @@
+@@ -2015,6 +2033,7 @@
  
  			return(DB_ERROR);
  		}
@@ -1269,7 +1275,7 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -2008,6 +2027,10 @@
+@@ -2036,6 +2055,10 @@
  
  	os_fast_mutex_free(&srv_os_test_mutex);
  
@@ -1280,7 +1286,7 @@
  	if (!srv_file_per_table_original_value
  	    && srv_pass_corrupt_table) {
  		fprintf(stderr, "InnoDB: Warning:"
-@@ -2089,6 +2112,7 @@
+@@ -2117,6 +2140,7 @@
  		ibuf_update_max_tablespace_id();
  	}
  
@@ -1290,9 +1296,9 @@
  	srv_was_started = TRUE;
 --- a/storage/innodb_plugin/trx/trx0purge.c
 +++ b/storage/innodb_plugin/trx/trx0purge.c
-@@ -1113,6 +1113,9 @@
+@@ -1119,6 +1119,9 @@
  	/*	que_thr_t*	thr2; */
- 	ulint		old_pages_handled;
+ 	ulonglong	old_pages_handled;
  
 +	if (srv_fake_write)
 +		return(0);
@@ -1316,7 +1322,7 @@
  
 --- a/storage/innodb_plugin/trx/trx0sys.c
 +++ b/storage/innodb_plugin/trx/trx0sys.c
-@@ -1910,12 +1910,14 @@
+@@ -1944,12 +1944,14 @@
  	mem_free(trx_doublewrite);
  	trx_doublewrite = NULL;
  
@@ -1331,7 +1337,7 @@
  
  	/* There can't be any active transactions. */
  	rseg = UT_LIST_GET_FIRST(trx_sys->rseg_list);
-@@ -1941,10 +1943,12 @@
+@@ -1975,10 +1977,12 @@
  		UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
  	}
  
@@ -1389,7 +1395,7 @@
  	mutex_enter(&kernel_mutex);
  
  	ret = trx_start_low(trx, rseg_id);
-@@ -990,7 +984,6 @@
+@@ -1000,7 +994,6 @@
  	trx->read_view = NULL;
  
  	if (lsn) {
@@ -1397,7 +1403,7 @@
  
  		mutex_exit(&kernel_mutex);
  
-@@ -999,11 +992,6 @@
+@@ -1009,11 +1002,6 @@
  			trx_undo_insert_cleanup(trx);
  		}
  
@@ -1409,7 +1415,7 @@
  
  		/* NOTE that we could possibly make a group commit more
  		efficient here: call os_thread_yield here to allow also other
-@@ -1036,9 +1024,9 @@
+@@ -1046,9 +1034,9 @@
  		if (trx->flush_log_later) {
  			/* Do nothing yet */
  			trx->must_flush_log_later = TRUE;
@@ -1421,7 +1427,7 @@
  			if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
  				/* Write the log but do not flush it to disk */
  
-@@ -1050,7 +1038,7 @@
+@@ -1060,7 +1048,7 @@
  
  				log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
  			}
@@ -1430,7 +1436,7 @@
  
  			/* Write the log but do not flush it to disk */
  
-@@ -1730,23 +1718,16 @@
+@@ -1742,23 +1730,16 @@
  	trx_t*	trx)	/*!< in: trx handle */
  {
  	ib_uint64_t	lsn	= trx->commit_lsn;
@@ -1456,7 +1462,7 @@
  		if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
  			/* Write the log but do not flush it to disk */
  
-@@ -1757,7 +1738,7 @@
+@@ -1769,7 +1750,7 @@
  
  			log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
  		}
@@ -1465,7 +1471,7 @@
  
  		/* Write the log but do not flush it to disk */
  
-@@ -2018,8 +1999,6 @@
+@@ -2047,8 +2028,6 @@
  	/*--------------------------------------*/
  
  	if (lsn) {
@@ -1474,7 +1480,7 @@
  		/* Depending on the my.cnf options, we may now write the log
  		buffer to the log files, making the prepared state of the
  		transaction durable if the OS does not crash. We may also
-@@ -2039,15 +2018,9 @@
+@@ -2068,15 +2047,9 @@
  
  		mutex_exit(&kernel_mutex);
  
@@ -1492,7 +1498,7 @@
  			if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
  				/* Write the log but do not flush it to disk */
  
-@@ -2059,7 +2032,7 @@
+@@ -2088,7 +2061,7 @@
  
  				log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
  			}
@@ -1511,9 +1517,9 @@
  
  /*
  			WAIT ARRAY
-@@ -926,6 +927,13 @@
- 	ibool		fatal = FALSE;
- 	double		longest_diff = 0;
+@@ -931,6 +932,13 @@
+ 		return(FALSE);
+ 	}
  
 +	if (srv_rebuild_indexes) {
 +
@@ -1522,12 +1528,12 @@
 +		return(FALSE);
 +	}
 +
+ 	sync_array_enter(sync_primary_wait_array);
+ 
  	for (i = 0; i < sync_primary_wait_array->n_cells; i++) {
- 
- 		double	diff;
 --- a/storage/innodb_plugin/include/buf0buf.h
 +++ b/storage/innodb_plugin/include/buf0buf.h
-@@ -1211,6 +1211,8 @@
+@@ -1295,6 +1295,8 @@
  					frees a page in buffer pool */
  # endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
  #endif /* !UNIV_HOTBACKUP */
@@ -1579,14 +1585,3 @@
  
  	UNIV_MEM_FREE(buf, n);
  }
---- a/configure.in
-+++ b/configure.in
-@@ -22,7 +22,7 @@
- AM_INIT_AUTOMAKE([1.9 tar-ustar])
- AC_PROG_LIBTOOL
- 
--AM_CONFIG_HEADER([include/config.h])
-+AC_CONFIG_HEADERS([include/config.h])
- 
- # Request support for automake silent-rules if available.
- # Default to verbose output. One can use the configure-time
 
=== modified file 'patches/xtradb55.patch'
--- patches/xtradb55.patch	2013-05-07 13:32:47 +0000
+++ patches/xtradb55.patch	2013-07-22 14:01:36 +0000
@@ -1,6 +1,7 @@
+=== modified file 'Percona-Server/storage/innobase/btr/btr0btr.c'
 --- a/storage/innobase/btr/btr0btr.c
 +++ b/storage/innobase/btr/btr0btr.c
-@@ -674,7 +674,7 @@
+@@ -704,7 +704,7 @@
  /**************************************************************//**
  Gets the root node of a tree and x-latches it.
  @return	root page, x-latched */
@@ -9,7 +10,7 @@
  buf_block_t*
  btr_root_block_get(
  /*===============*/
-@@ -1134,7 +1134,7 @@
+@@ -1209,7 +1209,7 @@
  /************************************************************//**
  Returns the child page of a node pointer and x-latches it.
  @return	child page, x-latched */
@@ -28,7 +29,7 @@
  
  /* prototypes for new functions added to ha_innodb.cc */
  trx_t* innobase_get_trx();
-@@ -581,7 +582,7 @@
+@@ -599,7 +600,7 @@
  		return(TRUE);
  	}
  
@@ -37,7 +38,7 @@
  	if (recv_lsn_checks_on) {
  		ib_uint64_t	current_lsn;
  
-@@ -965,6 +966,7 @@
+@@ -1000,6 +1001,7 @@
  	block->page.zip_list.prev = NULL;
  	block->page.zip_list.next = NULL;
  	block->page.in_LRU_list = FALSE;
@@ -45,7 +46,7 @@
  	block->in_unzip_LRU_list = FALSE;
  #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
  	block->n_pointers = 0;
-@@ -2542,7 +2544,8 @@
+@@ -2471,7 +2473,8 @@
  	ut_ad(zip_size == fil_space_get_zip_size(space));
  	ut_ad(ut_is_2pow(zip_size));
  #ifndef UNIV_LOG_DEBUG
@@ -55,7 +56,7 @@
  	      || ibuf_page_low(space, zip_size, offset,
  			       FALSE, file, line, NULL));
  #endif
-@@ -3952,6 +3955,13 @@
+@@ -3902,6 +3905,13 @@
  			frame = ((buf_block_t*) bpage)->frame;
  		}
  
@@ -69,19 +70,19 @@
  		/* If this page is not uninitialized and not in the
  		doublewrite buffer, then the page number and space id
  		should be the same as in block. */
-@@ -4064,7 +4074,8 @@
+@@ -4025,7 +4035,8 @@
  			recv_recover_page(TRUE, (buf_block_t*) bpage);
  		}
  
 -		if (uncompressed && !recv_no_ibuf_operations) {
 +		if (uncompressed && !recv_no_ibuf_operations &&
 +		    !srv_fake_write && !bpage->is_compacted) {
- 			ibuf_merge_or_delete_for_page(
- 				/* Delete possible entries, if bpage is_corrupt */
- 				(srv_pass_corrupt_table && bpage->is_corrupt) ? NULL :
+ 
+ 			buf_block_t*	block;
+ 			ibool		update_ibuf_bitmap;
 --- a/storage/innobase/fil/fil0fil.c
 +++ b/storage/innobase/fil/fil0fil.c
-@@ -307,7 +307,7 @@
+@@ -310,7 +310,7 @@
  
  /** The tablespace memory cache. This variable is NULL before the module is
  initialized. */
@@ -90,7 +91,7 @@
  
  #ifdef UNIV_DEBUG
  /** Try fil_validate() every this many times */
-@@ -346,7 +346,7 @@
+@@ -349,7 +349,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -99,7 +100,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -671,7 +671,7 @@
+@@ -674,7 +674,7 @@
  Opens a the file of a node of a tablespace. The caller must own the fil_system
  mutex. */
  static
@@ -108,7 +109,7 @@
  fil_node_open_file(
  /*===============*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -706,7 +706,17 @@
+@@ -709,7 +709,17 @@
  			OS_FILE_READ_ONLY, &success);
  		if (!success) {
  			/* The following call prints an error message */
@@ -127,7 +128,7 @@
  
  			ut_print_timestamp(stderr);
  
-@@ -767,12 +777,15 @@
+@@ -770,12 +780,15 @@
  
  		if (UNIV_UNLIKELY(space_id != space->id)) {
  			fprintf(stderr,
@@ -146,7 +147,7 @@
  		}
  
  		if (UNIV_UNLIKELY(space_id == ULINT_UNDEFINED
-@@ -796,8 +809,8 @@
+@@ -799,8 +812,8 @@
  		}
  
  		if (size_bytes >= 1024 * 1024) {
@@ -157,7 +158,7 @@
  		}
  
  		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
-@@ -848,6 +861,8 @@
+@@ -851,6 +864,8 @@
  		/* Put the node to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
@@ -166,7 +167,7 @@
  }
  
  /**********************************************************************//**
-@@ -1477,7 +1492,12 @@
+@@ -1517,7 +1532,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -180,7 +181,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1529,7 +1549,12 @@
+@@ -1586,7 +1606,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -194,7 +195,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1981,7 +2006,7 @@
+@@ -2045,7 +2070,7 @@
  	mem_free(path);
  }
  
@@ -203,7 +204,7 @@
  /********************************************************//**
  Writes a log record about an .ibd file create/rename/delete. */
  static
-@@ -2205,7 +2230,7 @@
+@@ -2269,7 +2294,7 @@
  			if (fil_create_new_single_table_tablespace(
  				    space_id, name, FALSE, flags,
  				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
@@ -212,7 +213,7 @@
  			}
  		}
  
-@@ -2372,7 +2397,7 @@
+@@ -2460,7 +2485,7 @@
  	}
  
  	if (success) {
@@ -221,16 +222,16 @@
  		/* Write a log record about the deletion of the .ibd
  		file, so that ibbackup can replay it in the
  		--apply-log phase. We use a dummy mtr and the familiar
-@@ -2673,7 +2698,7 @@
+@@ -2761,7 +2786,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
 -#ifndef UNIV_HOTBACKUP
 +#ifdef UNDEFINED
- 	if (success) {
+ 	if (success && !recv_recovery_on) {
  		mtr_t		mtr;
  
-@@ -2864,7 +2889,7 @@
+@@ -2952,7 +2977,7 @@
  
  	fil_node_create(path, size, space_id, FALSE);
  
@@ -239,7 +240,7 @@
  	{
  		mtr_t		mtr;
  
-@@ -3210,19 +3235,97 @@
+@@ -3301,19 +3326,97 @@
  		      "InnoDB: open the tablespace file ", stderr);
  		ut_print_filename(stderr, filepath);
  		fputs("!\n"
@@ -347,7 +348,7 @@
  		return(FALSE);
  	}
  
-@@ -4158,7 +4261,7 @@
+@@ -4258,7 +4361,7 @@
  	cannot be ok. */
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
@@ -356,7 +357,7 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -4288,7 +4391,51 @@
+@@ -4388,7 +4491,51 @@
  
  	fil_node_create(filepath, 0, space_id, FALSE);
  func_exit:
@@ -409,7 +410,7 @@
  	ut_free(buf2);
  	mem_free(filepath);
  }
-@@ -4299,7 +4446,7 @@
+@@ -4399,7 +4546,7 @@
  idea is to read as much good data as we can and jump over bad data.
  @return 0 if ok, -1 if error even after the retries, 1 if at the end
  of the directory */
@@ -418,7 +419,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4343,7 +4490,7 @@
+@@ -4443,7 +4590,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  ulint
@@ -427,7 +428,7 @@
  /*===================================*/
  {
  	int		ret;
-@@ -4399,7 +4546,9 @@
+@@ -4499,7 +4646,9 @@
  			dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -438,7 +439,7 @@
  
  		if (dbdir != NULL) {
  			/* printf("Opened dir %s\n", dbinfo.name); */
-@@ -4425,8 +4574,11 @@
+@@ -4525,8 +4674,11 @@
  						   ".ibd")) {
  					/* The name ends in .ibd; try opening
  					the file */
@@ -451,7 +452,7 @@
  				}
  next_file_item:
  				ret = fil_file_readdir_next_file(&err,
-@@ -4598,15 +4750,97 @@
+@@ -4698,15 +4850,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -557,7 +558,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -5005,7 +5239,7 @@
+@@ -5129,7 +5363,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -566,7 +567,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -5025,10 +5259,13 @@
+@@ -5149,10 +5383,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -581,7 +582,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -5041,6 +5278,8 @@
+@@ -5165,6 +5402,8 @@
  	}
  
  	node->n_pending++;
@@ -590,7 +591,7 @@
  }
  
  /********************************************************************//**
-@@ -5240,6 +5479,16 @@
+@@ -5350,6 +5589,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -607,9 +608,28 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
+@@ -6028,6 +6277,12 @@
+ 	const char*	tmp_name)	/*!< in: temp table name used while
+ 					swapping */
+ {
++	(void)old_space_id;
++	(void)old_name;
++	(void)new_space_id;
++	(void)new_name;
++	(void)tmp_name;
++#ifdef UNDEFINED
+ 	mtr_t           mtr;
+ 	mtr_start(&mtr);
+ 	fil_op_write_log(MLOG_FILE_RENAME, old_space_id,
+@@ -6035,4 +6290,5 @@
+ 	fil_op_write_log(MLOG_FILE_RENAME, new_space_id,
+ 			 0, 0, new_name, old_name, &mtr);
+ 	mtr_commit(&mtr);
++#endif
+ }
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -482,12 +482,6 @@
+@@ -514,12 +514,6 @@
    "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.",
    NULL, NULL, 50, 1, 1024 * 1024 * 1024, 0);
  
@@ -622,7 +642,7 @@
  static MYSQL_THDVAR_BOOL(fake_changes, PLUGIN_VAR_OPCMDARG,
    "In the transaction after enabled, UPDATE, INSERT and DELETE only move the cursor to the records "
    "and do nothing other operations (no changes, no ibuf, no undo, no transaction log) in the transaction. "
-@@ -989,17 +983,6 @@
+@@ -1038,17 +1032,6 @@
  }
  
  /******************************************************************//**
@@ -640,7 +660,7 @@
  Returns true if expand_fast_index_creation is enabled for the current
  session.
  @return	the value of the server's expand_fast_index_creation variable */
-@@ -11806,17 +11789,12 @@
+@@ -12637,17 +12620,12 @@
    innodb_file_format_max_update, "Antelope");
  
  /* Changed to the THDVAR */
@@ -664,7 +684,7 @@
  
  static MYSQL_SYSVAR_STR(flush_method, innobase_file_flush_method,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -12294,7 +12272,6 @@
+@@ -13234,7 +13212,6 @@
    MYSQL_SYSVAR(file_format_check),
    MYSQL_SYSVAR(file_format_max),
    MYSQL_SYSVAR(flush_log_at_trx_commit),
@@ -674,7 +694,7 @@
    MYSQL_SYSVAR(large_prefix),
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
-@@ -1190,6 +1190,9 @@
+@@ -1199,6 +1199,9 @@
  	ut_ad(!recv_no_ibuf_operations);
  	ut_ad(x_latch || mtr == NULL);
  
@@ -684,7 +704,7 @@
  	if (ibuf_fixed_addr_page(space, zip_size, page_no)) {
  
  		return(TRUE);
-@@ -2757,6 +2760,9 @@
+@@ -2771,6 +2774,9 @@
  	ulint	n_bytes;
  	ulint	n_pag2;
  
@@ -694,9 +714,20 @@
  	while (sum_pages < n_pages) {
  		n_bytes = ibuf_contract_ext(&n_pag2, sync);
  
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
+@@ -1594,6 +1594,8 @@
+ 					frees a page in buffer pool */
+ # endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
+ #endif /* !UNIV_HOTBACKUP */
++	ibool		is_compacted;	/*!< TRUE if the page was skipped in
++					compact backups */
+ };
+ 
+ /** The buffer control block structure */
 --- a/storage/innobase/include/fil0fil.h
 +++ b/storage/innobase/include/fil0fil.h
-@@ -506,7 +506,7 @@
+@@ -518,7 +518,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  ulint
@@ -723,7 +754,7 @@
  Get the current setting of the lower_case_table_names global parameter from
 --- a/storage/innobase/include/log0recv.h
 +++ b/storage/innobase/include/log0recv.h
-@@ -444,7 +444,7 @@
+@@ -481,7 +481,7 @@
  /* defined in os0file.c */
  #define OS_AIO_MERGE_N_CONSECUTIVE	64
  /* defined in log0recv.c */
@@ -734,7 +765,7 @@
  
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -145,8 +145,7 @@
+@@ -159,8 +159,7 @@
  extern ulint	srv_n_log_files;
  extern ulint	srv_log_file_size;
  extern ulint	srv_log_buffer_size;
@@ -743,19 +774,19 @@
 +extern ulong	srv_flush_log_at_trx_commit;
  extern char	srv_adaptive_flushing;
  
- 
-@@ -247,6 +246,11 @@
- extern ulint	srv_dict_size_limit;
- 
- extern ulint	srv_lazy_drop_table;
-+
+ /* If this flag is TRUE, then we will load the indexes' (and tables') metadata
+@@ -271,6 +270,11 @@
+ extern ulint	srv_expand_import;
+ extern ulint	srv_pass_corrupt_table;
+ 
 +extern ibool	srv_read_only;
 +extern ibool	srv_fake_write;
 +extern ibool	srv_apply_log_only;
 +extern ibool	srv_backup_mode;
- /*-------------------------------------------*/
- 
- extern ulint	srv_n_rows_inserted;
++
+ /* Helper macro to support srv_pass_corrupt_table checks. If 'cond' is FALSE,
+ execute 'code' if srv_pass_corrupt_table is non-zero, or trigger a fatal error
+ otherwise. The break statement in 'code' will obviously not work as expected. */
 --- a/storage/innobase/include/srv0start.h
 +++ b/storage/innobase/include/srv0start.h
 @@ -91,6 +91,8 @@
@@ -769,7 +800,7 @@
  extern	ibool	srv_have_fullfsync;
 --- a/storage/innobase/log/log0log.c
 +++ b/storage/innobase/log/log0log.c
-@@ -1154,7 +1154,7 @@
+@@ -1237,7 +1237,7 @@
  	if (srv_unix_file_flush_method != SRV_UNIX_O_DSYNC
  	    && srv_unix_file_flush_method != SRV_UNIX_ALL_O_DIRECT
  	    && srv_unix_file_flush_method != SRV_UNIX_NOSYNC
@@ -778,7 +809,7 @@
  
  		fil_flush(group->space_id, FALSE);
  	}
-@@ -1389,7 +1389,7 @@
+@@ -1472,7 +1472,7 @@
  #endif /* UNIV_DEBUG */
  	ulint		unlock;
  
@@ -787,7 +818,7 @@
  		/* Recovery is running and no operations on the log files are
  		allowed yet (the variable name .._no_ibuf_.. is misleading) */
  
-@@ -2051,7 +2051,7 @@
+@@ -2140,7 +2140,7 @@
  		return(TRUE);
  	}
  
@@ -796,16 +827,16 @@
  
  	if (log_sys->n_pending_checkpoint_writes > 0) {
  		/* A checkpoint write is running */
-@@ -3151,6 +3151,7 @@
+@@ -3277,6 +3277,7 @@
  	shutdown, because the InnoDB layer may have committed or
  	prepared transactions and we don't want to lose them. */
  
 +	if (!srv_apply_log_only) {
  	server_busy = trx_n_mysql_transactions > 0
  		|| UT_LIST_GET_LEN(trx_sys->trx_list) > trx_n_prepared;
- 	mutex_exit(&kernel_mutex);
-@@ -3158,6 +3159,9 @@
- 	if (server_busy || srv_is_any_background_thread_active()) {
+ 
+@@ -3329,6 +3330,9 @@
+ 
  		goto loop;
  	}
 +	} else {
@@ -867,16 +898,7 @@
  ulint
  recv_find_max_checkpoint(
  /*=====================*/
-@@ -850,7 +851,7 @@
- InnoDB-3.23.52 where the checksum field contains the log block number.
- @return TRUE if ok, or if the log block may be in the format of InnoDB
- version predating 3.23.52 */
--static
-+//static
- ibool
- log_block_checksum_is_ok_or_old_format(
- /*===================================*/
-@@ -1639,9 +1640,16 @@
+@@ -1645,9 +1646,16 @@
  			if (page_zip) {
  				memset(FIL_PAGE_LSN + page_zip->data, 0, 8);
  			}
@@ -894,7 +916,7 @@
  
  			ib_uint64_t	end_lsn;
  
-@@ -1842,6 +1850,18 @@
+@@ -1848,6 +1856,18 @@
  			ulint	zip_size = fil_space_get_zip_size(space);
  			ulint	page_no = recv_addr->page_no;
  
@@ -913,7 +935,7 @@
  			if (recv_addr->state == RECV_NOT_PROCESSED) {
  				if (!has_printed) {
  					ut_print_timestamp(stderr);
-@@ -1875,7 +1895,7 @@
+@@ -1881,7 +1901,7 @@
  
  				mutex_enter(&(recv_sys->mutex));
  			}
@@ -922,7 +944,7 @@
  			recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
  		}
  
-@@ -2380,7 +2400,7 @@
+@@ -2386,7 +2406,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -931,7 +953,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2403,7 +2423,7 @@
+@@ -2409,7 +2429,7 @@
  					ut_error;
  				}
  			}
@@ -940,7 +962,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2820,8 +2840,11 @@
+@@ -2826,8 +2846,11 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -954,7 +976,7 @@
  		}
  	}
  
-@@ -2926,7 +2949,7 @@
+@@ -2932,7 +2955,7 @@
  		"InnoDB: Reading tablespace information"
  		" from the .ibd files...\n");
  
@@ -963,7 +985,7 @@
  
  	/* If we are using the doublewrite method, we will
  	check if there are half-written pages in data files,
-@@ -2935,12 +2958,14 @@
+@@ -2941,12 +2964,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -979,7 +1001,7 @@
  	}
  }
  
-@@ -3109,6 +3134,7 @@
+@@ -3115,6 +3140,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -987,7 +1009,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3474,6 +3500,7 @@
+@@ -3480,6 +3506,7 @@
  	that the data dictionary tables will be free of any locks.
  	The data dictionary latch should guarantee that there is at
  	most one data dictionary transaction active at a time. */
@@ -995,9 +1017,52 @@
  	trx_rollback_or_clean_recovered(FALSE);
  }
  
+--- a/storage/innobase/mem/mem0dbg.c
++++ b/storage/innobase/mem/mem0dbg.c
+@@ -282,18 +282,10 @@
+ 	byte*	buf,	/*!< in: pointer to buffer */
+ 	ulint	 n)	/*!< in: length of buffer */
+ {
+-	byte*	ptr;
+-
+ 	UNIV_MEM_ASSERT_W(buf, n);
+ 
+-	for (ptr = buf; ptr < buf + n; ptr++) {
+-
+-		if (ut_rnd_gen_ibool()) {
+-			*ptr = 0xBA;
+-		} else {
+-			*ptr = 0xBE;
+-		}
+-	}
++	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
++	memset(buf, 0xBA, n);
+ 
+ 	UNIV_MEM_INVALID(buf, n);
+ }
+@@ -308,17 +300,10 @@
+ 	byte*	buf,	/*!< in: pointer to buffer */
+ 	ulint	n)	/*!< in: length of buffer */
+ {
+-	byte*	ptr;
+-
+ 	UNIV_MEM_ASSERT_W(buf, n);
+ 
+-	for (ptr = buf; ptr < buf + n; ptr++) {
+-		if (ut_rnd_gen_ibool()) {
+-			*ptr = 0xDE;
+-		} else {
+-			*ptr = 0xAD;
+-		}
+-	}
++	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
++	memset(buf, 0xDE, n);
+ 
+ 	UNIV_MEM_FREE(buf, n);
+ }
 --- a/storage/innobase/os/os0file.c
 +++ b/storage/innobase/os/os0file.c
-@@ -660,7 +660,7 @@
+@@ -670,7 +670,7 @@
  }
  
  #undef USE_FILE_LOCK
@@ -1006,7 +1071,7 @@
  #if defined(UNIV_HOTBACKUP) || defined(__WIN__)
  /* InnoDB Hot Backup does not lock the data files.
   * On Windows, mandatory locking is used.
-@@ -1428,7 +1428,7 @@
+@@ -1474,7 +1474,7 @@
  #endif
  #ifdef UNIV_NON_BUFFERED_IO
  # ifndef UNIV_HOTBACKUP
@@ -1015,7 +1080,7 @@
  			/* Do not use unbuffered i/o to log files because
  			value 2 denotes that we do not flush the log at every
  			commit, but only once per second */
-@@ -1444,7 +1444,7 @@
+@@ -1490,7 +1490,7 @@
  		attributes = 0;
  #ifdef UNIV_NON_BUFFERED_IO
  # ifndef UNIV_HOTBACKUP
@@ -1024,7 +1089,7 @@
  			/* Do not use unbuffered i/o to log files because
  			value 2 denotes that we do not flush the log at every
  			commit, but only once per second */
-@@ -1460,8 +1460,9 @@
+@@ -1506,8 +1506,9 @@
  		attributes = 0;
  		ut_error;
  	}
@@ -1035,7 +1100,7 @@
  			  GENERIC_READ | GENERIC_WRITE, /* read and write
  							access */
  			  share_mode,	/* File can be read also by other
-@@ -1520,7 +1521,11 @@
+@@ -1572,7 +1573,11 @@
  	if (create_mode == OS_FILE_OPEN || create_mode == OS_FILE_OPEN_RAW
  	    || create_mode == OS_FILE_OPEN_RETRY) {
  		mode_str = "OPEN";
@@ -1048,7 +1113,7 @@
  	} else if (create_mode == OS_FILE_CREATE) {
  		mode_str = "CREATE";
  		create_flag = O_RDWR | O_CREAT | O_EXCL;
-@@ -2791,6 +2796,9 @@
+@@ -2888,6 +2893,9 @@
  	ut_a((offset & 0xFFFFFFFFUL) == offset);
  	ut_a((n & 0xFFFFFFFFUL) == n);
  
@@ -1058,7 +1123,7 @@
  	os_n_file_writes++;
  
  	ut_ad(file);
-@@ -2915,6 +2923,9 @@
+@@ -3012,6 +3020,9 @@
  #else
  	ssize_t	ret;
  
@@ -1089,19 +1154,20 @@
  }
 --- a/storage/innobase/srv/srv0srv.c
 +++ b/storage/innobase/srv/srv0srv.c
-@@ -87,11 +87,6 @@
+@@ -90,12 +90,6 @@
  #include "mysql/plugin.h"
  #include "mysql/service_thd_wait.h"
  
 -/* prototypes of new functions added to ha_innodb.cc for kill_idle_transaction */
 -ibool		innobase_thd_is_idle(const void* thd);
 -ib_int64_t	innobase_thd_get_start_time(const void* thd);
--void		innobase_thd_kill(void* thd);
+-void		innobase_thd_kill(ulong thd_id);
+-ulong		innobase_thd_get_thread_id(const void* thd);
 -
  /* prototypes for new functions added to ha_innodb.cc */
  ibool	innobase_get_slow_log();
  
-@@ -198,8 +193,7 @@
+@@ -212,8 +206,7 @@
  UNIV_INTERN ulint	srv_log_file_size	= ULINT_MAX;
  /* size in database pages */
  UNIV_INTERN ulint	srv_log_buffer_size	= ULINT_MAX;
@@ -1111,10 +1177,10 @@
  
  /* Try to flush dirty pages so as to avoid IO bursts at
  the checkpoints. */
-@@ -457,6 +451,11 @@
+@@ -435,6 +428,11 @@
+ UNIV_INTERN ulint	srv_pass_corrupt_table = 0; /* 0:disable 1:enable */
+ 
  UNIV_INTERN ulint	srv_dict_size_limit = 0;
- 
- UNIV_INTERN ulint	srv_lazy_drop_table = 0;
 +
 +UNIV_INTERN ibool	srv_read_only   = FALSE;
 +UNIV_INTERN ibool	srv_fake_write  = FALSE;
@@ -1123,7 +1189,7 @@
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -1137,7 +1136,7 @@
+@@ -1185,7 +1183,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -1132,7 +1198,7 @@
  }
  
  /*********************************************************************//**
-@@ -1148,6 +1147,7 @@
+@@ -1196,6 +1194,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -1140,7 +1206,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1161,6 +1161,7 @@
+@@ -1209,6 +1208,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -1148,7 +1214,7 @@
  }
  
  /*********************************************************************//**
-@@ -1886,7 +1887,7 @@
+@@ -1938,7 +1938,7 @@
  		}
  
  		/* Record the lock wait time for this thread */
@@ -1157,7 +1223,7 @@
  	}
  
  	if (trx->was_chosen_as_deadlock_victim) {
-@@ -2842,36 +2843,6 @@
+@@ -2946,36 +2946,6 @@
  		old_sema = sema;
  	}
  
@@ -1169,12 +1235,12 @@
 -		mutex_enter(&kernel_mutex);
 -		trx = UT_LIST_GET_FIRST(trx_sys->mysql_trx_list);
 -		while (trx) {
--			if (trx->conc_state == TRX_ACTIVE
+-			if (trx->state == TRX_ACTIVE
 -			    && trx->mysql_thd
 -			    && innobase_thd_is_idle(trx->mysql_thd)) {
--				ib_int64_t	start_time; /* as stmt ID */
+-				ib_int64_t	start_time = innobase_thd_get_start_time(trx->mysql_thd);
+-				ulong		thd_id = innobase_thd_get_thread_id(trx->mysql_thd);
 -
--				start_time = innobase_thd_get_start_time(trx->mysql_thd);
 -				if (trx->last_stmt_start != start_time) {
 -					trx->idle_start = now;
 -					trx->last_stmt_start = start_time;
@@ -1182,7 +1248,7 @@
 -					   > srv_kill_idle_transaction) {
 -					/* kill the session */
 -					mutex_exit(&kernel_mutex);
--					innobase_thd_kill(trx->mysql_thd);
+-					innobase_thd_kill(thd_id);
 -					goto rescan_idle;
 -				}
 -			}
@@ -1196,7 +1262,7 @@
  
 --- a/storage/innobase/srv/srv0start.c
 +++ b/storage/innobase/srv/srv0start.c
-@@ -62,6 +62,7 @@
+@@ -63,6 +63,7 @@
  #include "ibuf0ibuf.h"
  #include "srv0start.h"
  #include "srv0srv.h"
@@ -1204,7 +1270,7 @@
  #ifndef UNIV_HOTBACKUP
  # include "os0proc.h"
  # include "sync0sync.h"
-@@ -94,6 +95,8 @@
+@@ -95,6 +96,8 @@
  /** Log sequence number at shutdown */
  UNIV_INTERN ib_uint64_t	srv_shutdown_lsn;
  
@@ -1213,7 +1279,7 @@
  #ifdef HAVE_DARWIN_THREADS
  # include <sys/utsname.h>
  /** TRUE if the F_FULLFSYNC option is available */
-@@ -549,7 +552,7 @@
+@@ -551,7 +554,7 @@
  /*********************************************************************//**
  Creates or opens the log files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1222,7 +1288,7 @@
  ulint
  open_or_create_log_file(
  /*====================*/
-@@ -709,7 +712,7 @@
+@@ -711,7 +714,7 @@
  /*********************************************************************//**
  Creates or opens database data files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1231,7 +1297,7 @@
  ulint
  open_or_create_data_files(
  /*======================*/
-@@ -1875,6 +1878,10 @@
+@@ -1934,6 +1937,10 @@
  		are initialized in trx_sys_init_at_db_start(). */
  
  		recv_recovery_from_checkpoint_finish();
@@ -1242,7 +1308,7 @@
  		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
-@@ -2054,6 +2061,17 @@
+@@ -2119,6 +2126,17 @@
  	if (!srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes != tablespace_size_in_header) {
  
@@ -1260,7 +1326,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: tablespace size"
-@@ -2133,6 +2151,7 @@
+@@ -2198,6 +2216,7 @@
  
  			return(DB_ERROR);
  		}
@@ -1268,7 +1334,7 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -2157,6 +2176,10 @@
+@@ -2222,6 +2241,10 @@
  
  	os_fast_mutex_free(&srv_os_test_mutex);
  
@@ -1279,7 +1345,7 @@
  	if (!srv_file_per_table_original_value
  	    && srv_pass_corrupt_table) {
  		fprintf(stderr, "InnoDB: Warning:"
-@@ -2252,6 +2275,7 @@
+@@ -2317,6 +2340,7 @@
  		ibuf_update_max_tablespace_id();
  	}
  
@@ -1287,9 +1353,33 @@
  	srv_file_per_table = srv_file_per_table_original_value;
  
  	srv_was_started = TRUE;
+--- a/storage/innobase/sync/sync0arr.c
++++ b/storage/innobase/sync/sync0arr.c
+@@ -41,6 +41,7 @@
+ #include "os0file.h"
+ #include "srv0srv.h"
+ #include "ha_prototypes.h"
++#include "xb0xb.h"
+ 
+ /*
+ 			WAIT ARRAY
+@@ -927,6 +928,13 @@
+ 		return(FALSE);
+ 	}
+ 
++	if (srv_rebuild_indexes) {
++
++		/* Avoid long semaphore warnings when rebuilding indexes */
++
++		return(FALSE);
++	}
++
+ #ifdef UNIV_DEBUG_VALGRIND
+ 	/* Increase the timeouts if running under valgrind because it executes
+ 	extremely slowly. UNIV_DEBUG_VALGRIND does not necessary mean that
 --- a/storage/innobase/trx/trx0purge.c
 +++ b/storage/innobase/trx/trx0purge.c
-@@ -1129,6 +1129,9 @@
+@@ -1149,6 +1149,9 @@
  	que_thr_t*	thr;
  	ulint		old_pages_handled;
  
@@ -1315,7 +1405,7 @@
  
 --- a/storage/innobase/trx/trx0sys.c
 +++ b/storage/innobase/trx/trx0sys.c
-@@ -1952,12 +1952,14 @@
+@@ -2000,12 +2000,14 @@
  	mem_free(trx_doublewrite);
  	trx_doublewrite = NULL;
  
@@ -1330,7 +1420,7 @@
  
  	/* There can't be any active transactions. */
  	rseg = UT_LIST_GET_FIRST(trx_sys->rseg_list);
-@@ -1983,10 +1985,12 @@
+@@ -2031,10 +2033,12 @@
  		UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
  	}
  
@@ -1341,36 +1431,36 @@
  	ut_a(UT_LIST_GET_LEN(trx_sys->mysql_trx_list) == 0);
 +	}
  
- 	mem_free(trx_sys);
- 
+ 	ut_ad(trx_sys->descr_n_used == 0);
+ 	ut_free(trx_sys->descriptors);
 --- a/storage/innobase/trx/trx0trx.c
 +++ b/storage/innobase/trx/trx0trx.c
-@@ -563,9 +563,8 @@
- 						(ullint) trx->id);
+@@ -692,8 +692,8 @@
  
  					if (srv_force_recovery == 0) {
--
--						trx->conc_state = TRX_PREPARED;
+ 
+-						trx->state = TRX_PREPARED;
 -						trx_n_prepared++;
-+						/* xtrabackup should rollback it */
-+						trx->conc_state = TRX_ACTIVE;
++ 						/* xtrabackup should rollback it */
++ 						trx->state = TRX_ACTIVE;
  					} else {
  						fprintf(stderr,
  							"InnoDB: Since"
-@@ -639,10 +638,9 @@
- 							(ullint) trx->id);
+@@ -772,9 +772,11 @@
  
  						if (srv_force_recovery == 0) {
--
-+							/* xtrabackup should rollback it */
- 							trx->conc_state
+ 
++							/* xtrabackup should
++							rollback it */
+ 							trx->state
 -								= TRX_PREPARED;
 -							trx_n_prepared++;
 +								= TRX_ACTIVE;
++							trx_reserve_descriptor(trx);
  						} else {
  							fprintf(stderr,
  								"InnoDB: Since"
-@@ -1051,7 +1049,6 @@
+@@ -1211,7 +1213,6 @@
  	trx->read_view = NULL;
  
  	if (lsn) {
@@ -1378,7 +1468,7 @@
  
  		mutex_exit(&kernel_mutex);
  
-@@ -1060,12 +1057,6 @@
+@@ -1220,12 +1221,6 @@
  			trx_undo_insert_cleanup(trx);
  		}
  
@@ -1391,7 +1481,7 @@
  		/* NOTE that we could possibly make a group commit more
  		efficient here: call os_thread_yield here to allow also other
  		trxs to come to commit! */
-@@ -1097,9 +1088,9 @@
+@@ -1257,9 +1252,9 @@
  		if (trx->flush_log_later) {
  			/* Do nothing yet */
  			trx->must_flush_log_later = TRUE;
@@ -1403,7 +1493,7 @@
  			if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
  				/* Write the log but do not flush it to disk */
  
-@@ -1111,7 +1102,7 @@
+@@ -1271,7 +1266,7 @@
  
  				log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
  			}
@@ -1412,7 +1502,7 @@
  
  			/* Write the log but do not flush it to disk */
  
-@@ -1791,23 +1782,16 @@
+@@ -1956,23 +1951,16 @@
  	trx_t*	trx)	/*!< in: trx handle */
  {
  	ib_uint64_t	lsn	= trx->commit_lsn;
@@ -1438,7 +1528,7 @@
  		if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
  			/* Write the log but do not flush it to disk */
  
-@@ -1818,7 +1802,7 @@
+@@ -1983,7 +1971,7 @@
  
  			log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
  		}
@@ -1447,7 +1537,7 @@
  
  		/* Write the log but do not flush it to disk */
  
-@@ -2066,7 +2050,6 @@
+@@ -2252,7 +2240,6 @@
  	/*--------------------------------------*/
  
  	if (lsn) {
@@ -1455,7 +1545,7 @@
  
  		/* Depending on the my.cnf options, we may now write the log
  		buffer to the log files, making the prepared state of the
-@@ -2087,15 +2070,9 @@
+@@ -2273,15 +2260,9 @@
  
  		mutex_exit(&kernel_mutex);
  
@@ -1473,7 +1563,7 @@
  			if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
  				/* Write the log but do not flush it to disk */
  
-@@ -2107,7 +2084,7 @@
+@@ -2293,7 +2274,7 @@
  
  				log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
  			}
@@ -1482,94 +1572,14 @@
  
  			/* Write the log but do not flush it to disk */
  
---- a/configure.cmake
-+++ b/configure.cmake
-@@ -149,7 +149,9 @@
-   SET(CMAKE_REQUIRED_LIBRARIES 
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
- 
--  LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
-+  IF(CMAKE_REQUIRED_LIBRARIES)
-+    LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
-+  ENDIF()
-   LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
-   
-   OPTION(WITH_LIBWRAP "Compile with tcp wrappers support" OFF)
---- a/storage/innobase/sync/sync0arr.c
-+++ b/storage/innobase/sync/sync0arr.c
-@@ -41,6 +41,7 @@
- #include "os0file.h"
- #include "srv0srv.h"
- #include "ha_prototypes.h"
-+#include "xb0xb.h"
- 
- /*
- 			WAIT ARRAY
-@@ -926,6 +927,13 @@
- 	ibool		fatal = FALSE;
- 	double		longest_diff = 0;
- 
-+	if (srv_rebuild_indexes) {
-+
-+		/* Avoid long semaphore warnings when rebuilding indexes */
-+
-+		return(FALSE);
-+	}
-+
- #ifdef UNIV_DEBUG_VALGRIND
- 	/* Increase the timeouts if running under valgrind because it executes
- 	extremely slowly. UNIV_DEBUG_VALGRIND does not necessary mean that
---- a/storage/innobase/include/buf0buf.h
-+++ b/storage/innobase/include/buf0buf.h
-@@ -1509,6 +1509,8 @@
- 					frees a page in buffer pool */
- # endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
- #endif /* !UNIV_HOTBACKUP */
-+	ibool		is_compacted;	/*!< TRUE if the page was skipped in
-+					compact backups */
- };
- 
- /** The buffer control block structure */
---- a/storage/innobase/mem/mem0dbg.c
-+++ b/storage/innobase/mem/mem0dbg.c
-@@ -280,18 +280,10 @@
- 	byte*	buf,	/*!< in: pointer to buffer */
- 	ulint	 n)	/*!< in: length of buffer */
- {
--	byte*	ptr;
--
- 	UNIV_MEM_ASSERT_W(buf, n);
- 
--	for (ptr = buf; ptr < buf + n; ptr++) {
--
--		if (ut_rnd_gen_ibool()) {
--			*ptr = 0xBA;
--		} else {
--			*ptr = 0xBE;
--		}
--	}
-+	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
-+	memset(buf, 0xBA, n);
- 
- 	UNIV_MEM_INVALID(buf, n);
- }
-@@ -306,17 +298,10 @@
- 	byte*	buf,	/*!< in: pointer to buffer */
- 	ulint	n)	/*!< in: length of buffer */
- {
--	byte*	ptr;
--
- 	UNIV_MEM_ASSERT_W(buf, n);
- 
--	for (ptr = buf; ptr < buf + n; ptr++) {
--		if (ut_rnd_gen_ibool()) {
--			*ptr = 0xDE;
--		} else {
--			*ptr = 0xAD;
--		}
--	}
-+	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
-+	memset(buf, 0xDE, n);
- 
- 	UNIV_MEM_FREE(buf, n);
- }
+--- a/storage/innobase/row/row0merge.c
++++ b/storage/innobase/row/row0merge.c
+@@ -2774,7 +2774,7 @@
+ 	ut_ad(indexes);
+ 	ut_ad(n_indexes);
+ 
+-	merge_sort_block_size = thd_merge_sort_block_size(trx->mysql_thd);
++	merge_sort_block_size = 1UL << 20;
+ 
+ 	trx_start_if_not_started(trx);
+ 
 
=== modified file 'src/Makefile'
--- src/Makefile	2013-05-18 03:04:06 +0000
+++ src/Makefile	2013-07-22 14:01:36 +0000
@@ -183,7 +183,7 @@
 	usr0sess.o ut0byte.o ut0dbg.o \
 	ut0list.o ut0mem.o ut0rnd.o \
 	ut0ut.o ut0vec.o ut0wqueue.o \
-	ut0rbt.o)
+	ut0rbt.o log0online.o)
 xtradb: MYSQLOBJS = $(addprefix $(MYSQL_ROOT_DIR)/, mysys/libmysys.a \
 	strings/libmystrings.a zlib/.libs/libzlt.a dbug/libdbug.a)
 xtradb: DEFS += -DXTRADB_BASED 
 
=== modified file 'src/compact.cc'
--- src/compact.cc	2013-05-03 05:17:03 +0000
+++ src/compact.cc	2013-07-22 14:01:36 +0000
@@ -815,7 +815,7 @@
 		index->to_be_dropped = 1;
 
 		/* Patch up any FK referencing this index with NULL */
-		dict_foreign_replace_index(table, index, trx);
+		dict_foreign_replace_index(table, NULL, index);
 
 		dict_index_remove_from_cache(table, index);
 
 
=== modified file 'src/innodb_int.cc'
--- src/innodb_int.cc	2013-04-27 12:08:11 +0000
+++ src/innodb_int.cc	2013-07-22 14:01:36 +0000
@@ -47,6 +47,25 @@
 
 long innobase_mirrored_log_groups = 1;
 
+/******************************************************//**
+Reads a specified log segment to a buffer. */
+UNIV_INTERN
+void
+xb_log_group_read_log_seg(
+/*===================*/
+	ulint		type,		/*!< in: LOG_ARCHIVE or LOG_RECOVER */
+	byte*		buf,		/*!< in: buffer where to read */
+	log_group_t*	group,		/*!< in: log group */
+	ib_uint64_t	start_lsn,	/*!< in: read area start */
+	ib_uint64_t	end_lsn)	/*!< in: read area end */
+{
+#if defined(XTRADB_BASED) && !defined(XTRADB55)
+	log_group_read_log_seg(type, buf, group, start_lsn, end_lsn, FALSE);
+#else
+	log_group_read_log_seg(type, buf, group, start_lsn, end_lsn);
+#endif
+}
+
 /****************************************************************//**
 A simple function to open or create a file.
 @return own: handle to the file, not defined if error, error number
@@ -244,7 +263,7 @@
 	if (!ret) {
 		msg("xtrabackup: cannot set size for file %s\n", path);
 		os_file_close(*file);
-		os_file_delete(path);
+		xb_file_delete(path);
 		return ret;
 	}
 
@@ -289,7 +308,7 @@
 		msg("xtrabackup: could not write the first page to %s\n",
 		    path);
 		os_file_close(*file);
-		os_file_delete(path);
+		xb_file_delete(path);
 		return ret;
 	}
 
@@ -334,6 +353,43 @@
 	/* do nothing */
 }
 
+my_bool
+innobase_check_identifier_length(
+/*=============================*/
+	const char*	id __attribute__((unused)))
+{
+	msg("xtrabackup: innobase_check_identifier_length() called.\n");
+	ut_a(0);
+	return(false);
+}
+
+uint
+innobase_convert_to_filename_charset(
+/*=================================*/
+	char*		to __attribute__((unused)),
+	const char*	from __attribute__((unused)),
+	ulint		len __attribute__((unused)))
+{
+	msg("xtrabackup: innobase_convert_to_filename_charset() called.\n");
+	ut_a(0);
+
+	return(0);
+}
+
+uint
+innobase_convert_to_system_charset(
+/*=================================*/
+	char*		to __attribute__((unused)),
+	const char*	from __attribute__((unused)),
+	ulint		len __attribute__((unused)),
+	uint*		errors __attribute__((unused)))
+{
+	msg("xtrabackup: innobase_convert_to__charset() called.\n");
+	ut_a(0);
+
+	return(0);
+}
+
 #if MYSQL_VERSION_ID >= 50500
 
 /**********************************************************************//**
 
=== modified file 'src/innodb_int.h'
--- src/innodb_int.h	2013-05-04 05:26:19 +0000
+++ src/innodb_int.h	2013-07-22 14:01:36 +0000
@@ -144,6 +144,8 @@
 	fil_rename_tablespace(old_name_in, id, new_name, new_path)
 #  define xb_btr_root_block_get(index, mode, mtr) \
 	btr_root_block_get(index, mode, mtr)
+#  define xb_file_delete(path) \
+	os_file_delete_func(path)
    typedef ib_mutex_t	mutex_t;
 #  define INNODB_LOG_DIR srv_log_group_home_dir
 #  define DEFAULT_LOG_FILE_SIZE 48*1024*1024
@@ -154,6 +156,7 @@
 #  define xb_os_event_create(name) os_event_create()
 #else /* MYSQL_VERSION_ID >= 50600 */
    /* MySQL and Percona Server 5.1 and 5.5 */
+#  define xb_file_delete(path) os_file_delete(path)
 #  define xb_buf_page_is_corrupted(page, zip_size)	\
 	buf_page_is_corrupted(page, zip_size)
 #  define xb_os_event_create(name) os_event_create(name)
@@ -360,6 +363,7 @@
 				.ibd file of tablespace and want to
 				stop temporarily posting of new i/o
 				requests on the file */
+#if MYSQL_VERSION_ID < 50500
 	ibool		stop_ibuf_merges;
 				/*!< we set this TRUE when we start
 				deleting a single-table tablespace */
@@ -370,6 +374,20 @@
 				or flush requests can be placed on this space,
 				though there may be such requests still being
 				processed on this space */
+#else
+	ibool		stop_new_ops;
+				/*!< we set this TRUE when we start
+				deleting a single-table tablespace.
+				When this is set following new ops
+				are not allowed:
+				* read IO request
+				* ibuf merge
+				* file flush
+				Note that we can still possibly have
+				new write operations because we don't
+				check this flag when doing flush
+				batches. */
+#endif
 	ulint		purpose;/*!< FIL_TABLESPACE, FIL_LOG, or
 				FIL_ARCH_LOG */
 	UT_LIST_BASE_NODE_T(fil_node_t) chain;
@@ -746,14 +764,14 @@
 	lsn_t*	max_flushed_lsn,/* out: */
 	ulint*	sum_of_new_sizes);/* out: sum of sizes of the new files added
 				*/
-
+#ifndef XTRADB_BASED
 ibool
 log_block_checksum_is_ok_or_old_format(
 /*===================================*/
 			/* out: TRUE if ok, or if the log block may be in the
 			format of InnoDB version < 3.23.52 */
 	byte*	block);	/* in: pointer to a log block */
-
+#endif /* XTRADB_BASED */
 #endif /* MYSQL_VERSION_ID >= 50600 */
 
 buf_block_t*
@@ -801,6 +819,18 @@
 } /* extern "C" */
 #endif
 
+/******************************************************//**
+Reads a specified log segment to a buffer. */
+UNIV_INTERN
+void
+xb_log_group_read_log_seg(
+/*===================*/
+	ulint		type,		/*!< in: LOG_ARCHIVE or LOG_RECOVER */
+	byte*		buf,		/*!< in: buffer where to read */
+	log_group_t*	group,		/*!< in: log group */
+	ib_uint64_t	start_lsn,	/*!< in: read area start */
+	ib_uint64_t	end_lsn);	/*!< in: read area end */
+
 /****************************************************************//**
 A simple function to open or create a file.
 @return own: handle to the file, not defined if error, error number
@@ -967,6 +997,26 @@
 
 #if MYSQL_VERSION_ID < 50600
 
+my_bool
+innobase_check_identifier_length(
+/*=============================*/
+	const char*	id);
+
+uint
+innobase_convert_to_filename_charset(
+/*=================================*/
+	char*		to,
+	const char*	from,
+	ulint		len);
+
+uint
+innobase_convert_to_system_charset(
+/*=================================*/
+	char*		to,
+	const char*	from,
+	ulint		len,
+	uint*		errors);
+
 void
 innobase_invalidate_query_cache(
 	trx_t*	trx,
 
=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2013-07-10 12:29:40 +0000
+++ src/xtrabackup.cc	2013-07-22 14:01:36 +0000
@@ -1367,6 +1367,11 @@
 	}
 #endif
 
+#ifdef XTRADB_BASED
+	/* Workaround for LP #1203308. */
+	srv_track_changed_pages = FALSE;
+#endif
+
 	return(FALSE);
 
 error:
@@ -2056,8 +2061,8 @@
 
 		mutex_enter(&log_sys->mutex);
 
-		log_group_read_log_seg(LOG_RECOVER, log_sys->buf,
-						group, start_lsn, end_lsn);
+		xb_log_group_read_log_seg(LOG_RECOVER, log_sys->buf,
+					  group, start_lsn, end_lsn);
 
 
 		/* reference recv_scan_log_recs() */
@@ -3487,11 +3492,7 @@
 					for (;;) {
 						mtr_start(&local_mtr);
 
-#if (MYSQL_VERSION_ID < 50517)
-						local_block = btr_block_get(space_id, zip_size, page_no, RW_S_LATCH, &local_mtr);
-#else
 						local_block = btr_block_get(space_id, zip_size, page_no, RW_S_LATCH, index, &local_mtr);
-#endif
 						local_page = buf_block_get_frame(local_block);
 						blob_header = local_page + offset;
 #define BTR_BLOB_HDR_PART_LEN		0
@@ -3532,13 +3533,8 @@
 	mtr_commit(&mtr);
 	if (right_page_no != FIL_NULL) {
 		mtr_start(&mtr);
-#if (MYSQL_VERSION_ID < 50517)
-		block = btr_block_get(space, zip_size, right_page_no,
-				      RW_X_LATCH, &mtr);
-#else
 		block = btr_block_get(space, zip_size, right_page_no,
 				      RW_X_LATCH, index, &mtr);
-#endif
 		page = buf_block_get_frame(block);
 		goto loop;
 	}
@@ -4565,7 +4561,7 @@
 	if (!table) {
 		snprintf(name, FN_REFLEN, "%s/%s/%s", data_home_dir,
 						      db_name, file_name);
-		return os_file_delete(name);
+		return xb_file_delete(name);
 	}
 
 	return(TRUE);
 
=== modified file 'utils/build.sh'
--- utils/build.sh	2013-06-05 08:39:54 +0000
+++ utils/build.sh	2013-07-22 14:01:36 +0000
@@ -2,9 +2,9 @@
 
 set -e
 
-MYSQL_51_VERSION=5.1.59
-MYSQL_55_VERSION=5.5.17
-MYSQL_56_VERSION=5.6.10
+MYSQL_51_VERSION=5.1.70
+MYSQL_55_VERSION=5.5.31
+MYSQL_56_VERSION=5.6.11
 PS_51_VERSION=5.1.59-13.0
 PS_55_VERSION=5.5.16-22.0
 
@@ -125,10 +125,11 @@
 ################################################################################
 function unpack_and_patch()
 {
+    local dirname=`basename "$1" ".tar.gz"`
     tar xzf $top_dir/$1
-    cd `basename "$1" ".tar.gz"`
+    cd $dirname
     patch -p1 < $top_dir/patches/$2
-    cd ..
+    cd -
 }
 
 ################################################################################
@@ -215,8 +216,8 @@
 {
     local type=$1
     local mysql_version_short=${mysql_version:0:3}
-    server_dir=$top_dir/mysql-$mysql_version_short
-    server_tarball=mysql-$mysql_version.tar.gz
+    local dirname=`basename "$server_tarball" ".tar.gz"`
+
     innodb_dir=$server_dir/storage/$innodb_name
 
     echo "Downloading sources"
@@ -226,7 +227,7 @@
 
     echo "Preparing sources"
     unpack_and_patch $server_tarball $server_patch
-    mv $top_dir/mysql-$mysql_version $server_dir
+    mv $top_dir/$dirname $server_dir
 
     build_server $type
 
@@ -241,10 +242,12 @@
 
 case "$type" in
 "innodb51")
+       server_dir=$top_dir/mysql-5.1
        mysql_version=$MYSQL_51_VERSION
        server_patch=innodb51.patch
        innodb_name=innodb_plugin
        xtrabackup_target=plugin
+       server_tarball=mysql-5.1.70.tar.gz
        configure_cmd="./configure --enable-local-infile \
            --enable-thread-safe-client \
            --with-plugins=innodb_plugin \
@@ -255,10 +258,12 @@
        build_all $type
        ;;
 "innodb55")
+        server_dir=$top_dir/mysql-5.5
 	mysql_version=$MYSQL_55_VERSION
 	server_patch=innodb55.patch
 	innodb_name=innobase
 	xtrabackup_target=5.5
+        server_tarball=mysql-5.5.31.tar.gz
 	# We need to build with partitioning due to MySQL bug #58632
 	configure_cmd="cmake . \
 		-DENABLED_LOCAL_INFILE=ON \
@@ -272,10 +277,12 @@
 	;;
 
 "innodb56" )
+        server_dir=$top_dir/mysql-5.6
         mysql_version=$MYSQL_56_VERSION
         server_patch=innodb56.patch
         innodb_name=innobase
         xtrabackup_target=5.6
+        server_tarball=mysql-5.6.11.tar.gz
         configure_cmd="cmake . \
                 -DWITH_INNOBASE_STORAGE_ENGINE=ON \
                 -DWITH_ZLIB=bundled \
@@ -288,8 +295,10 @@
 "xtradb51" )
 	server_dir=$top_dir/Percona-Server
 	branch_dir=percona-server-5.1-xtrabackup
-	innodb_dir=$server_dir/storage/innodb_plugin
-	xtrabackup_target=xtradb
+        innodb_name=innodb_plugin
+        xtrabackup_target=xtradb
+        server_patch=xtradb51.patch
+        server_tarball=Percona-Server-5.1.70-rel14.8.tar.gz
 	configure_cmd="./configure --enable-local-infile \
 	    --enable-thread-safe-client \
 	    --with-plugins=innodb_plugin \
@@ -301,42 +310,15 @@
 		configure_cmd="LIBS=-lrt $configure_cmd"
 	fi
 
-
-	echo "Downloading sources"
-	
-	# Get Percona Server
-	if [ -d $branch_dir ]
-	then
-	    rm -rf $branch_dir
-	fi
-
-        if [ ! -f Percona-Server-XtraBackup-$PS_51_VERSION.tar.gz ]
-        then
-	    make ps51source
-	fi
-
-	rm -rf $branch_dir
-	tar xfz Percona-Server-XtraBackup-$PS_51_VERSION.tar.gz
-	cd $branch_dir
-	$MAKE_CMD main
-	cd $top_dir
-	rm -rf $server_dir
-	ln -s $branch_dir/Percona-Server $server_dir
-
-	# Patch Percona Server
-	cd $server_dir
-	patch -p1 < $top_dir/patches/xtradb51.patch
-
-	build_server $type
-
-	build_xtrabackup
-
+        build_all $type
 	;;
 "xtradb55" )
 	server_dir=$top_dir/Percona-Server-5.5
 	branch_dir=percona-server-5.5-xtrabackup
-	innodb_dir=$server_dir/storage/innobase
-	xtrabackup_target=xtradb55
+        innodb_name=innobase
+        xtrabackup_target=xtradb55
+        server_patch=xtradb55.patch
+        server_tarball=Percona-Server-5.5.31-rel30.3.tar.gz
 	# We need to build with partitioning due to MySQL bug #58632
 	configure_cmd="cmake . \
 		-DENABLED_LOCAL_INFILE=ON \
@@ -350,37 +332,7 @@
 		configure_cmd="LIBS=-lrt $configure_cmd"
 	fi
 
-
-	echo "Downloading sources"
-	
-	# Get Percona Server
-	if [ -d $branch_dir ]
-	then
-	    rm -rf $branch_dir
-	fi
-
-        if [ ! -f Percona-Server-XtraBackup-$PS_55_VERSION.tar.gz ]
-        then
-	    make ps55source
-	fi
-
-	rm -rf $branch_dir
-	tar xfz Percona-Server-XtraBackup-$PS_55_VERSION.tar.gz
-	cd $branch_dir
-
-	$MAKE_CMD PERCONA_SERVER=Percona-Server-5.5 main
-	cd $top_dir
-	rm -rf $server_dir
-	ln -s $branch_dir/Percona-Server $server_dir
-
-	# Patch Percona Server
-	cd $server_dir
-	patch -p1 < $top_dir/patches/xtradb55.patch
-
-	build_server $type
-
-	build_xtrabackup
-
+        build_all $type
 	;;
 *)
 	usage