Merge lp:~akopytov/percona-xtrabackup/update-versions-1.6 into lp:percona-xtrabackup/1.6

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

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

[Stewart Smith (stewart)]

review: Approve

=== modified file 'patches/innodb51_builtin.patch'
--- patches/innodb51_builtin.patch	2011-09-14 12:48:27 +0000
+++ patches/innodb51_builtin.patch	2011-11-27 06:47:26 +0000
@@ -727,15 +727,15 @@
  		/* Recovery is running and no operations on the log files are
  		allowed yet (the variable name .._no_ibuf_.. is misleading) */
  
-@@ -3056,6 +3058,7 @@
- 	for the 'very fast' shutdown, because the InnoDB layer may have
- 	committed or prepared transactions and we don't want to lose them. */
+@@ -3057,6 +3059,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) {
  	if (trx_n_mysql_transactions > 0
- 	    || UT_LIST_GET_LEN(trx_sys->trx_list) > 0) {
+ 	    || UT_LIST_GET_LEN(trx_sys->trx_list) > trx_n_prepared) {
  
-@@ -3063,6 +3066,7 @@
+@@ -3064,6 +3067,7 @@
  
  		goto loop;
  	}
@@ -1262,18 +1262,19 @@
  	if (purge_sys->trx->n_active_thrs > 0) {
 --- a/storage/innobase/trx/trx0trx.c
 +++ b/storage/innobase/trx/trx0trx.c
-@@ -478,8 +478,8 @@
+@@ -481,9 +481,8 @@
  						ut_dulint_get_low(trx->id));
  
  					if (srv_force_recovery == 0) {
 -
 -						trx->conc_state = TRX_PREPARED;
+-						trx_n_prepared++;
 +						/* xtrabackup should rollback it */
 +						trx->conc_state = TRX_ACTIVE;
  					} else {
  						fprintf(stderr,
  							"InnoDB: Since"
-@@ -555,9 +555,9 @@
+@@ -559,10 +558,9 @@
  								trx->id));
  
  						if (srv_force_recovery == 0) {
@@ -1281,6 +1282,7 @@
 +							/* xtrabackup should rollback it */
  							trx->conc_state
 -								= TRX_PREPARED;
+-							trx_n_prepared++;
 +								= TRX_ACTIVE;
  						} else {
  							fprintf(stderr,
 
=== modified file 'patches/innodb55.patch'
--- patches/innodb55.patch	2011-09-14 12:48:27 +0000
+++ patches/innodb55.patch	2011-11-27 06:47:26 +0000
@@ -1,6 +1,6 @@
 --- a/storage/innobase/btr/btr0btr.c
 +++ b/storage/innobase/btr/btr0btr.c
-@@ -120,7 +120,7 @@
+@@ -674,7 +674,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(
  /*===============*/
-@@ -566,7 +566,7 @@
+@@ -1123,7 +1123,7 @@
  /************************************************************//**
  Returns the child page of a node pointer and x-latches it.
  @return	child page, x-latched */
@@ -20,7 +20,7 @@
  /*===================*/
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -517,7 +517,7 @@
+@@ -518,7 +518,7 @@
  		return(TRUE);
  	}
  
@@ -29,7 +29,7 @@
  	if (recv_lsn_checks_on) {
  		ib_uint64_t	current_lsn;
  
-@@ -4056,7 +4056,7 @@
+@@ -3668,7 +3668,7 @@
  			recv_recover_page(TRUE, (buf_block_t*) bpage);
  		}
  
@@ -40,7 +40,7 @@
  				bpage->offset, buf_page_get_zip_size(bpage),
 --- a/storage/innobase/buf/buf0rea.c
 +++ b/storage/innobase/buf/buf0rea.c
-@@ -122,6 +122,45 @@
+@@ -124,6 +124,45 @@
  	bpage = buf_page_init_for_read(err, mode, space, zip_size, unzip,
  				       tablespace_version, offset);
  	if (bpage == NULL) {
@@ -86,7 +86,7 @@
  
  		return(0);
  	}
-@@ -604,6 +643,50 @@
+@@ -768,6 +807,50 @@
  		/* It is a single table tablespace and the .ibd file is
  		missing: do nothing */
  
@@ -233,7 +233,7 @@
  }
  
  /**********************************************************************//**
-@@ -1463,7 +1480,12 @@
+@@ -1464,7 +1481,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -247,7 +247,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1515,7 +1537,12 @@
+@@ -1516,7 +1538,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -261,7 +261,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -2180,7 +2207,7 @@
+@@ -2181,7 +2208,7 @@
  			if (fil_create_new_single_table_tablespace(
  				    space_id, name, FALSE, flags,
  				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
@@ -270,7 +270,7 @@
  			}
  		}
  
-@@ -2343,7 +2370,7 @@
+@@ -2344,7 +2371,7 @@
  	}
  
  	if (success) {
@@ -279,7 +279,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
-@@ -2644,7 +2671,7 @@
+@@ -2645,7 +2672,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
@@ -288,7 +288,7 @@
  	if (success) {
  		mtr_t		mtr;
  
-@@ -2835,7 +2862,7 @@
+@@ -2836,7 +2863,7 @@
  
  	fil_node_create(path, size, space_id, FALSE);
  
@@ -297,7 +297,7 @@
  	{
  		mtr_t		mtr;
  
-@@ -3090,19 +3117,97 @@
+@@ -3091,19 +3118,97 @@
  		      "InnoDB: open the tablespace file ", stderr);
  		ut_print_filename(stderr, filepath);
  		fputs("!\n"
@@ -405,7 +405,7 @@
  		return(FALSE);
  	}
  
-@@ -3334,7 +3439,7 @@
+@@ -3335,7 +3440,7 @@
  	cannot be ok. */
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
@@ -414,7 +414,7 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3475,7 +3580,7 @@
+@@ -3476,7 +3581,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 */
@@ -423,7 +423,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -3774,15 +3879,97 @@
+@@ -3775,15 +3880,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -529,7 +529,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4171,7 +4358,7 @@
+@@ -4172,7 +4359,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -538,7 +538,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4191,10 +4378,13 @@
+@@ -4192,10 +4379,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -553,7 +553,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4207,6 +4397,8 @@
+@@ -4208,6 +4398,8 @@
  	}
  
  	node->n_pending++;
@@ -562,7 +562,7 @@
  }
  
  /********************************************************************//**
-@@ -4391,6 +4583,16 @@
+@@ -4390,6 +4582,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -581,7 +581,7 @@
  	for (;;) {
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
-@@ -1160,6 +1160,9 @@
+@@ -1148,6 +1148,9 @@
  	ut_ad(!recv_no_ibuf_operations);
  	ut_ad(x_latch || mtr == NULL);
  
@@ -591,7 +591,7 @@
  	if (ibuf_fixed_addr_page(space, zip_size, page_no)) {
  
  		return(TRUE);
-@@ -2674,6 +2677,9 @@
+@@ -2715,6 +2718,9 @@
  	ulint	n_bytes;
  	ulint	n_pag2;
  
@@ -603,7 +603,7 @@
  
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -216,6 +216,10 @@
+@@ -218,6 +218,10 @@
  extern ulong	srv_max_purge_lag;
  
  extern ulong	srv_replication_delay;
@@ -647,21 +647,24 @@
  		allowed yet (the variable name .._no_ibuf_.. is misleading) */
  
 @@ -3114,6 +3116,7 @@
- 	for the 'very fast' shutdown, because the InnoDB layer may have
- 	committed or prepared transactions and we don't want to lose them. */
+ 	shutdown, because the InnoDB layer may have committed or
+ 	prepared transactions and we don't want to lose them. */
  
 +	if (!srv_apply_log_only) {
- 	if (trx_n_mysql_transactions > 0
- 	    || UT_LIST_GET_LEN(trx_sys->trx_list) > 0) {
- 
-@@ -3121,6 +3124,7 @@
- 
+ 	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()) {
  		goto loop;
  	}
 +	}
++	else {
++		mutex_exit(&kernel_mutex);
++	}
  
- 	if (srv_fast_shutdown == 2) {
- 		/* In this fastest shutdown we do not flush the buffer pool:
+ 	mutex_enter(&log_sys->mutex);
+ 	server_busy = log_sys->n_pending_checkpoint_writes
 --- a/storage/innobase/log/log0recv.c
 +++ b/storage/innobase/log/log0recv.c
 @@ -42,27 +42,27 @@
@@ -870,7 +873,7 @@
  	if ((ulint)ret == n) {
 --- a/storage/innobase/os/os0thread.c
 +++ b/storage/innobase/os/os0thread.c
-@@ -266,12 +266,17 @@
+@@ -251,11 +251,16 @@
  #ifdef __WIN__
  	Sleep((DWORD) tm / 1000);
  #else
@@ -887,7 +890,6 @@
 +*/
  #endif
  }
- 
 --- a/storage/innobase/row/row0merge.c
 +++ b/storage/innobase/row/row0merge.c
 @@ -459,7 +459,9 @@
@@ -914,7 +916,7 @@
  				mem_heap_free(heap);
  				return(DB_DUPLICATE_KEY);
  			}
-@@ -2628,7 +2632,9 @@
+@@ -2627,7 +2631,9 @@
  
  	/* Reset the MySQL row buffer that is used when reporting
  	duplicate keys. */
@@ -927,7 +929,7 @@
  	secondary index entries for merge sort */
 --- a/storage/innobase/srv/srv0srv.c
 +++ b/storage/innobase/srv/srv0srv.c
-@@ -401,6 +401,9 @@
+@@ -399,6 +399,9 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
@@ -937,7 +939,7 @@
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -1099,7 +1102,7 @@
+@@ -1078,7 +1081,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -946,7 +948,7 @@
  }
  
  /*********************************************************************//**
-@@ -1110,6 +1113,7 @@
+@@ -1089,6 +1092,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -954,7 +956,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1123,6 +1127,7 @@
+@@ -1102,6 +1106,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -962,7 +964,7 @@
  }
  
  /*********************************************************************//**
-@@ -1718,7 +1723,7 @@
+@@ -1717,7 +1722,7 @@
  		}
  
  		/* Record the lock wait time for this thread */
@@ -973,7 +975,7 @@
  	if (trx->was_chosen_as_deadlock_victim) {
 --- a/storage/innobase/srv/srv0start.c
 +++ b/storage/innobase/srv/srv0start.c
-@@ -94,6 +94,8 @@
+@@ -93,6 +93,8 @@
  /** Log sequence number at shutdown */
  UNIV_INTERN ib_uint64_t	srv_shutdown_lsn;
  
@@ -982,7 +984,7 @@
  #ifdef HAVE_DARWIN_THREADS
  # include <sys/utsname.h>
  /** TRUE if the F_FULLFSYNC option is available */
-@@ -549,7 +551,7 @@
+@@ -548,7 +550,7 @@
  /*********************************************************************//**
  Creates or opens the log files and closes them.
  @return	DB_SUCCESS or error code */
@@ -991,7 +993,7 @@
  ulint
  open_or_create_log_file(
  /*====================*/
-@@ -709,7 +711,7 @@
+@@ -708,7 +710,7 @@
  /*********************************************************************//**
  Creates or opens database data files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1000,7 +1002,7 @@
  ulint
  open_or_create_data_files(
  /*======================*/
-@@ -1414,7 +1416,7 @@
+@@ -1419,7 +1421,7 @@
  	}
  #endif /* UNIV_LOG_ARCHIVE */
  
@@ -1009,7 +1011,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: combined size of log files"
-@@ -1709,6 +1711,10 @@
+@@ -1714,6 +1716,10 @@
  		are initialized in trx_sys_init_at_db_start(). */
  
  		recv_recovery_from_checkpoint_finish();
@@ -1020,7 +1022,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
-@@ -1868,6 +1874,17 @@
+@@ -1873,6 +1879,17 @@
  	if (!srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes != tablespace_size_in_header) {
  
@@ -1038,7 +1040,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: tablespace size"
-@@ -1947,6 +1964,7 @@
+@@ -1952,6 +1969,7 @@
  
  			return(DB_ERROR);
  		}
@@ -1046,7 +1048,7 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -2059,6 +2077,7 @@
+@@ -2064,6 +2082,7 @@
  		ibuf_update_max_tablespace_id();
  	}
  
@@ -1054,18 +1056,6 @@
  	srv_file_per_table = srv_file_per_table_original_value;
  
  	srv_was_started = TRUE;
---- a/storage/innobase/trx/trx0purge.c
-+++ b/storage/innobase/trx/trx0purge.c
-@@ -1100,6 +1100,9 @@
- 	/*	que_thr_t*	thr2; */
- 	ulint		old_pages_handled;
- 
-+	if (srv_fake_write)
-+		return(0);
-+
- 	mutex_enter(&(purge_sys->mutex));
- 
- 	if (purge_sys->trx->n_active_thrs > 0) {
 --- a/storage/innobase/trx/trx0rseg.c
 +++ b/storage/innobase/trx/trx0rseg.c
 @@ -140,9 +140,11 @@
@@ -1082,7 +1072,7 @@
  
 --- a/storage/innobase/trx/trx0sys.c
 +++ b/storage/innobase/trx/trx0sys.c
-@@ -1641,10 +1641,12 @@
+@@ -1686,10 +1686,12 @@
  		UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
  	}
  
@@ -1097,18 +1087,19 @@
  
 --- a/storage/innobase/trx/trx0trx.c
 +++ b/storage/innobase/trx/trx0trx.c
-@@ -469,8 +469,8 @@
+@@ -522,9 +522,8 @@
  						(ullint) trx->id);
  
  					if (srv_force_recovery == 0) {
 -
 -						trx->conc_state = TRX_PREPARED;
+-						trx_n_prepared++;
 +						/* xtrabackup should rollback it */
 +						trx->conc_state = TRX_ACTIVE;
  					} else {
  						fprintf(stderr,
  							"InnoDB: Since"
-@@ -544,9 +544,9 @@
+@@ -598,10 +597,9 @@
  							(ullint) trx->id);
  
  						if (srv_force_recovery == 0) {
@@ -1116,7 +1107,20 @@
 +							/* xtrabackup should rollback it */
  							trx->conc_state
 -								= TRX_PREPARED;
+-							trx_n_prepared++;
 +								= TRX_ACTIVE;
  						} else {
  							fprintf(stderr,
  								"InnoDB: Since"
+--- a/storage/innobase/trx/trx0purge.c
++++ b/storage/innobase/trx/trx0purge.c
+@@ -1129,6 +1129,9 @@
+ 	que_thr_t*	thr;
+ 	ulint		old_pages_handled;
+ 
++	if (srv_fake_write)
++		return(0);
++
+ 	ut_a(purge_sys->trx->n_active_thrs == 0);
+ 
+ 	rw_lock_x_lock(&purge_sys->latch);
 
=== modified file 'patches/xtradb51.patch'
--- patches/xtradb51.patch	2011-09-14 12:48:27 +0000
+++ patches/xtradb51.patch	2011-11-27 06:47:26 +0000
@@ -1,6 +1,6 @@
 --- a/storage/innodb_plugin/btr/btr0btr.c
 +++ b/storage/innodb_plugin/btr/btr0btr.c
-@@ -120,7 +120,7 @@
+@@ -674,7 +674,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(
  /*===============*/
-@@ -578,7 +578,7 @@
+@@ -1134,7 +1134,7 @@
  /************************************************************//**
  Returns the child page of a node pointer and x-latches it.
  @return	child page, x-latched */
@@ -20,7 +20,7 @@
  /*===================*/
 --- a/storage/innodb_plugin/buf/buf0buf.c
 +++ b/storage/innodb_plugin/buf/buf0buf.c
-@@ -440,7 +440,7 @@
+@@ -412,7 +412,7 @@
  		return(TRUE);
  	}
  
@@ -29,7 +29,7 @@
  	if (recv_lsn_checks_on) {
  		ib_uint64_t	current_lsn;
  
-@@ -4030,7 +4030,7 @@
+@@ -3302,7 +3302,7 @@
  			recv_recover_page(TRUE, (buf_block_t*) bpage);
  		}
  
@@ -40,7 +40,7 @@
  				(srv_pass_corrupt_table && bpage->is_corrupt) ? NULL :
 --- a/storage/innodb_plugin/fil/fil0fil.c
 +++ b/storage/innodb_plugin/fil/fil0fil.c
-@@ -294,7 +294,7 @@
+@@ -297,7 +297,7 @@
  
  /** The tablespace memory cache. This variable is NULL before the module is
  initialized. */
@@ -49,7 +49,7 @@
  
  
  /********************************************************************//**
-@@ -305,7 +305,7 @@
+@@ -308,7 +308,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -58,7 +58,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -630,7 +630,7 @@
+@@ -633,7 +633,7 @@
  Opens a the file of a node of a tablespace. The caller must own the fil_system
  mutex. */
  static
@@ -67,7 +67,7 @@
  fil_node_open_file(
  /*===============*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -664,7 +664,17 @@
+@@ -667,7 +667,17 @@
  			node->name, OS_FILE_OPEN, OS_FILE_READ_ONLY, &success);
  		if (!success) {
  			/* The following call prints an error message */
@@ -86,7 +86,7 @@
  
  			ut_print_timestamp(stderr);
  
-@@ -725,12 +735,14 @@
+@@ -728,12 +738,14 @@
  
  		if (UNIV_UNLIKELY(space_id != space->id)) {
  			fprintf(stderr,
@@ -105,7 +105,7 @@
  		}
  
  		if (UNIV_UNLIKELY(space_id == ULINT_UNDEFINED
-@@ -754,8 +766,8 @@
+@@ -757,8 +769,8 @@
  		}
  
  		if (size_bytes >= 1024 * 1024) {
@@ -116,7 +116,7 @@
  		}
  
  		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
-@@ -800,6 +812,8 @@
+@@ -803,6 +815,8 @@
  		/* Put the node to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
@@ -125,7 +125,7 @@
  }
  
  /**********************************************************************//**
-@@ -1428,7 +1442,12 @@
+@@ -1431,7 +1445,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -139,7 +139,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1480,7 +1499,12 @@
+@@ -1483,7 +1502,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -153,7 +153,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -2153,7 +2177,7 @@
+@@ -2157,7 +2181,7 @@
  			if (fil_create_new_single_table_tablespace(
  				    space_id, name, FALSE, flags,
  				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
@@ -162,7 +162,7 @@
  			}
  		}
  
-@@ -2316,7 +2340,7 @@
+@@ -2324,7 +2348,7 @@
  	}
  
  	if (success) {
@@ -171,7 +171,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
-@@ -2617,7 +2641,7 @@
+@@ -2625,7 +2649,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
@@ -180,7 +180,7 @@
  	if (success) {
  		mtr_t		mtr;
  
-@@ -2807,7 +2831,7 @@
+@@ -2815,7 +2839,7 @@
  
  	fil_node_create(path, size, space_id, FALSE);
  
@@ -189,7 +189,7 @@
  	{
  		mtr_t		mtr;
  
-@@ -3060,19 +3084,97 @@
+@@ -3159,19 +3183,97 @@
  		      "InnoDB: open the tablespace file ", stderr);
  		ut_print_filename(stderr, filepath);
  		fputs("!\n"
@@ -297,7 +297,7 @@
  		return(FALSE);
  	}
  
-@@ -3777,7 +3879,7 @@
+@@ -4106,7 +4208,7 @@
  	cannot be ok. */
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
@@ -306,7 +306,7 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3918,7 +4020,7 @@
+@@ -4247,7 +4349,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 */
@@ -315,7 +315,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4217,15 +4319,97 @@
+@@ -4546,15 +4648,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -421,7 +421,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4614,7 +4798,7 @@
+@@ -4953,7 +5137,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -430,7 +430,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4634,10 +4818,13 @@
+@@ -4973,10 +5157,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -445,7 +445,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4650,6 +4837,8 @@
+@@ -4989,6 +5176,8 @@
  	}
  
  	node->n_pending++;
@@ -454,7 +454,7 @@
  }
  
  /********************************************************************//**
-@@ -4835,6 +5024,16 @@
+@@ -5190,6 +5379,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -473,7 +473,7 @@
  	for (;;) {
 --- a/storage/innodb_plugin/handler/ha_innodb.cc
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -343,12 +343,6 @@
+@@ -365,12 +365,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);
  
@@ -483,14 +483,13 @@
 -  "The value 3 regards innodb_flush_log_at_trx_commit (default).",
 -  NULL, NULL, 3, 0, 3, 0);
 -
- 
- static handler *innobase_create_handler(handlerton *hton,
-                                         TABLE_SHARE *table,
-@@ -729,17 +723,6 @@
- 	return(THDVAR((THD*) thd, lock_wait_timeout));
+ 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 @@
  }
  
--/******************************************************************//**
+ /******************************************************************//**
 -*/
 -extern "C" UNIV_INTERN
 -ulong
@@ -501,10 +500,11 @@
 -	return(THDVAR((THD*) thd, flush_log_at_trx_commit_session));
 -}
 -
- /********************************************************************//**
- Obtain the InnoDB transaction of a MySQL thread.
- @return	reference to transaction pointer */
-@@ -11775,7 +11758,6 @@
+-/******************************************************************//**
+ 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 @@
    MYSQL_SYSVAR(flush_neighbor_pages),
    MYSQL_SYSVAR(read_ahead),
    MYSQL_SYSVAR(adaptive_checkpoint),
@@ -536,11 +536,10 @@
  
 --- a/storage/innodb_plugin/include/ha_prototypes.h
 +++ b/storage/innodb_plugin/include/ha_prototypes.h
-@@ -268,12 +268,4 @@
- 	void*	thd);	/*!< in: thread handle (THD*), or NULL to query
+@@ -269,14 +269,6 @@
  			the global innodb_lock_wait_timeout */
  
--/******************************************************************//**
+ /******************************************************************//**
 -*/
 -
 -ulong
@@ -548,10 +547,13 @@
 -/*================================*/
 -	void*	thd);
 -
- #endif
+-/******************************************************************//**
+ Returns true if innodb_expand_fast_index_creation is enabled for the current
+ session.
+ @return	the value of the server's innodb_expand_fast_index_creation variable */
 --- a/storage/innodb_plugin/include/srv0srv.h
 +++ b/storage/innodb_plugin/include/srv0srv.h
-@@ -228,6 +228,10 @@
+@@ -226,6 +226,10 @@
  
  extern ulong	srv_replication_delay;
  
@@ -575,14 +577,14 @@
  #endif
 --- a/storage/innodb_plugin/include/trx0trx.h
 +++ b/storage/innodb_plugin/include/trx0trx.h
-@@ -497,7 +497,6 @@
+@@ -508,7 +508,6 @@
  					FALSE, one can save CPU time and about
  					150 bytes in the undo log size as then
  					we skip XA steps */
 -	ulint		flush_log_at_trx_commit_session;
+ 	ulint		fake_changes;
  	ulint		flush_log_later;/* In 2PC, we hold the
  					prepare_commit mutex across
- 					both phases. In that case, we
 --- a/storage/innodb_plugin/include/ut0byte.ic
 +++ b/storage/innodb_plugin/include/ut0byte.ic
 @@ -168,6 +168,14 @@
@@ -637,15 +639,15 @@
  		/* Recovery is running and no operations on the log files are
  		allowed yet (the variable name .._no_ibuf_.. is misleading) */
  
-@@ -3126,6 +3126,7 @@
- 	for the 'very fast' shutdown, because the InnoDB layer may have
- 	committed or prepared transactions and we don't want to lose them. */
+@@ -3127,6 +3127,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) {
  	if (trx_n_mysql_transactions > 0
- 	    || UT_LIST_GET_LEN(trx_sys->trx_list) > 0) {
+ 	    || UT_LIST_GET_LEN(trx_sys->trx_list) > trx_n_prepared) {
  
-@@ -3133,6 +3134,7 @@
+@@ -3134,6 +3135,7 @@
  
  		goto loop;
  	}
@@ -746,7 +748,7 @@
  		}
  	}
  
-@@ -2923,12 +2926,14 @@
+@@ -2922,12 +2925,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -762,7 +764,7 @@
  	}
  }
  
-@@ -3096,6 +3101,7 @@
+@@ -3095,6 +3100,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -770,7 +772,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3454,6 +3460,7 @@
+@@ -3453,6 +3459,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. */
@@ -780,7 +782,7 @@
  
 --- a/storage/innodb_plugin/os/os0file.c
 +++ b/storage/innodb_plugin/os/os0file.c
-@@ -554,7 +554,7 @@
+@@ -555,7 +555,7 @@
  }
  
  #undef USE_FILE_LOCK
@@ -789,7 +791,7 @@
  #if defined(UNIV_HOTBACKUP) || defined(__WIN__) || defined(__NETWARE__)
  /* InnoDB Hot Backup does not lock the data files.
   * On Windows, mandatory locking is used.
-@@ -1356,8 +1356,9 @@
+@@ -1357,8 +1357,9 @@
  		attributes = 0;
  		ut_error;
  	}
@@ -800,7 +802,7 @@
  			  GENERIC_READ | GENERIC_WRITE, /* read and write
  							access */
  			  share_mode,	/* File can be read also by other
-@@ -1416,7 +1417,11 @@
+@@ -1417,7 +1418,11 @@
  	if (create_mode == OS_FILE_OPEN || create_mode == OS_FILE_OPEN_RAW
  	    || create_mode == OS_FILE_OPEN_RETRY) {
  		mode_str = "OPEN";
@@ -813,7 +815,7 @@
  	} else if (create_mode == OS_FILE_CREATE) {
  		mode_str = "CREATE";
  		create_flag = O_RDWR | O_CREAT | O_EXCL;
-@@ -2622,6 +2627,9 @@
+@@ -2682,6 +2687,9 @@
  	ut_a((offset & 0xFFFFFFFFUL) == offset);
  	ut_a((n & 0xFFFFFFFFUL) == n);
  
@@ -823,7 +825,7 @@
  	os_n_file_writes++;
  
  	ut_ad(file);
-@@ -2746,6 +2754,9 @@
+@@ -2806,6 +2814,9 @@
  #else
  	ssize_t	ret;
  
@@ -855,7 +857,7 @@
  
 --- a/storage/innodb_plugin/row/row0merge.c
 +++ b/storage/innodb_plugin/row/row0merge.c
-@@ -453,7 +453,9 @@
+@@ -454,7 +454,9 @@
  	rec = rec_convert_dtuple_to_rec(*buf, index, tuple, n_ext);
  	offsets = rec_get_offsets(rec, index, NULL, ULINT_UNDEFINED, &heap);
  
@@ -866,7 +868,7 @@
  
  	mem_heap_free(heap);
  }
-@@ -1464,8 +1466,10 @@
+@@ -1465,8 +1467,10 @@
  		case 0:
  			if (UNIV_UNLIKELY
  			    (dict_index_is_unique(index) && !null_eq)) {
@@ -879,7 +881,7 @@
  				mem_heap_free(heap);
  				return(DB_DUPLICATE_KEY);
  			}
-@@ -2593,7 +2597,9 @@
+@@ -2594,7 +2598,9 @@
  
  	/* Reset the MySQL row buffer that is used when reporting
  	duplicate keys. */
@@ -892,7 +894,19 @@
  	secondary index entries for merge sort */
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
-@@ -402,6 +402,10 @@
+@@ -86,11 +86,6 @@
+ #include "trx0i_s.h"
+ #include "os0sync.h" /* for HAVE_ATOMIC_BUILTINS */
+ 
+-/* 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);
+-
+ /* prototypes for new functions added to ha_innodb.cc */
+ ibool	innobase_get_slow_log();
+ 
+@@ -415,6 +410,10 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
@@ -903,7 +917,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;
-@@ -1050,7 +1054,7 @@
+@@ -1065,7 +1064,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -912,7 +926,7 @@
  }
  
  /*********************************************************************//**
-@@ -1061,6 +1065,7 @@
+@@ -1076,6 +1075,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -920,7 +934,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1074,6 +1079,7 @@
+@@ -1089,6 +1089,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -928,9 +942,46 @@
  }
  
  /*********************************************************************//**
+@@ -2570,36 +2571,6 @@
+ 		old_sema = sema;
+ 	}
+ 
+-	if (srv_kill_idle_transaction && trx_sys) {
+-		trx_t*	trx;
+-		time_t	now;
+-rescan_idle:
+-		now = time(NULL);
+-		mutex_enter(&kernel_mutex);
+-		trx = UT_LIST_GET_FIRST(trx_sys->mysql_trx_list);
+-		while (trx) {
+-			if (trx->conc_state == TRX_ACTIVE
+-			    && trx->mysql_thd
+-			    && innobase_thd_is_idle(trx->mysql_thd)) {
+-				ib_int64_t	start_time; /* as stmt ID */
+-
+-				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;
+-				} else if (difftime(now, trx->idle_start)
+-					   > srv_kill_idle_transaction) {
+-					/* kill the session */
+-					mutex_exit(&kernel_mutex);
+-					innobase_thd_kill(trx->mysql_thd);
+-					goto rescan_idle;
+-				}
+-			}
+-			trx = UT_LIST_GET_NEXT(mysql_trx_list, trx);
+-		}
+-		mutex_exit(&kernel_mutex);
+-	}
+-
+ 	/* Flush stderr so that a database user gets the output
+ 	to possible MySQL error file */
+ 
 --- a/storage/innodb_plugin/srv/srv0start.c
 +++ b/storage/innodb_plugin/srv/srv0start.c
-@@ -94,6 +94,8 @@
+@@ -95,6 +95,8 @@
  /** Log sequence number at shutdown */
  UNIV_INTERN ib_uint64_t	srv_shutdown_lsn;
  
@@ -939,7 +990,7 @@
  #ifdef HAVE_DARWIN_THREADS
  # include <sys/utsname.h>
  /** TRUE if the F_FULLFSYNC option is available */
-@@ -544,7 +546,7 @@
+@@ -545,7 +547,7 @@
  /*********************************************************************//**
  Creates or opens the log files and closes them.
  @return	DB_SUCCESS or error code */
@@ -948,7 +999,7 @@
  ulint
  open_or_create_log_file(
  /*====================*/
-@@ -702,7 +704,7 @@
+@@ -703,7 +705,7 @@
  /*********************************************************************//**
  Creates or opens database data files and closes them.
  @return	DB_SUCCESS or error code */
@@ -957,7 +1008,7 @@
  ulint
  open_or_create_data_files(
  /*======================*/
-@@ -1777,6 +1779,10 @@
+@@ -1782,6 +1784,10 @@
  		are initialized in trx_sys_init_at_db_start(). */
  
  		recv_recovery_from_checkpoint_finish();
@@ -968,7 +1019,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
-@@ -1952,7 +1958,18 @@
+@@ -1962,7 +1968,18 @@
  
  	if (srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes < tablespace_size_in_header) {
@@ -987,7 +1038,7 @@
  		fprintf(stderr,
  			"InnoDB: Error: tablespace size stored in header"
  			" is %lu pages, but\n"
-@@ -1977,6 +1994,7 @@
+@@ -1987,6 +2004,7 @@
  
  			return(DB_ERROR);
  		}
@@ -995,7 +1046,7 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -2079,6 +2097,7 @@
+@@ -2089,6 +2107,7 @@
  		ibuf_update_max_tablespace_id();
  	}
  
@@ -1031,7 +1082,7 @@
  
 --- a/storage/innodb_plugin/trx/trx0sys.c
 +++ b/storage/innodb_plugin/trx/trx0sys.c
-@@ -1931,10 +1931,12 @@
+@@ -1941,10 +1941,12 @@
  		UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
  	}
  
@@ -1046,27 +1097,27 @@
  
 --- a/storage/innodb_plugin/trx/trx0trx.c
 +++ b/storage/innodb_plugin/trx/trx0trx.c
-@@ -109,8 +109,6 @@
+@@ -112,8 +112,6 @@
  
  	trx->support_xa = TRUE;
  
 -	trx->flush_log_at_trx_commit_session = 3; /* means to use innodb_flush_log_at_trx_commit value */
 -
+ 	trx->fake_changes = FALSE;
+ 
  	trx->check_foreigns = TRUE;
- 	trx->check_unique_secondary = TRUE;
- 
-@@ -493,8 +491,8 @@
- 						TRX_ID_PREP_PRINTF(trx->id));
+@@ -556,8 +554,8 @@
  
  					if (srv_force_recovery == 0) {
--
+ 
 -						trx->conc_state = TRX_PREPARED;
+-						trx_n_prepared++;
 +						/* xtrabackup should rollback it */
 +						trx->conc_state = TRX_ACTIVE;
  					} else {
  						fprintf(stderr,
  							"InnoDB: Since"
-@@ -570,9 +568,9 @@
+@@ -633,10 +631,9 @@
  								trx->id));
  
  						if (srv_force_recovery == 0) {
@@ -1074,11 +1125,12 @@
 +							/* xtrabackup should rollback it */
  							trx->conc_state
 -								= TRX_PREPARED;
+-							trx_n_prepared++;
 +								= TRX_ACTIVE;
  						} else {
  							fprintf(stderr,
  								"InnoDB: Since"
-@@ -737,9 +735,6 @@
+@@ -801,9 +798,6 @@
  	generated by the same transaction, doesn't. */
  	trx->support_xa = thd_supports_xa(trx->mysql_thd);
  
@@ -1088,7 +1140,7 @@
  	mutex_enter(&kernel_mutex);
  
  	ret = trx_start_low(trx, rseg_id);
-@@ -921,7 +916,6 @@
+@@ -990,7 +984,6 @@
  	trx->read_view = NULL;
  
  	if (lsn) {
@@ -1096,7 +1148,7 @@
  
  		mutex_exit(&kernel_mutex);
  
-@@ -930,12 +924,6 @@
+@@ -999,11 +992,6 @@
  			trx_undo_insert_cleanup(trx);
  		}
  
@@ -1105,11 +1157,10 @@
 -		} else {
 -			flush_log_at_trx_commit = trx->flush_log_at_trx_commit_session;
 -		}
--
+ 
  		/* 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! */
-@@ -967,9 +955,9 @@
+@@ -1036,9 +1024,9 @@
  		if (trx->flush_log_later) {
  			/* Do nothing yet */
  			trx->must_flush_log_later = TRUE;
@@ -1121,7 +1172,7 @@
  			if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
  				/* Write the log but do not flush it to disk */
  
-@@ -981,7 +969,7 @@
+@@ -1050,7 +1038,7 @@
  
  				log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
  			}
@@ -1130,7 +1181,7 @@
  
  			/* Write the log but do not flush it to disk */
  
-@@ -1661,23 +1649,16 @@
+@@ -1730,23 +1718,16 @@
  	trx_t*	trx)	/*!< in: trx handle */
  {
  	ib_uint64_t	lsn	= trx->commit_lsn;
@@ -1156,7 +1207,7 @@
  		if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
  			/* Write the log but do not flush it to disk */
  
-@@ -1688,7 +1669,7 @@
+@@ -1757,7 +1738,7 @@
  
  			log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
  		}
@@ -1165,7 +1216,7 @@
  
  		/* Write the log but do not flush it to disk */
  
-@@ -1948,8 +1929,6 @@
+@@ -2018,8 +1999,6 @@
  	/*--------------------------------------*/
  
  	if (lsn) {
@@ -1174,7 +1225,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
-@@ -1969,15 +1948,9 @@
+@@ -2039,15 +2018,9 @@
  
  		mutex_exit(&kernel_mutex);
  
@@ -1192,7 +1243,7 @@
  			if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
  				/* Write the log but do not flush it to disk */
  
-@@ -1989,7 +1962,7 @@
+@@ -2059,7 +2032,7 @@
  
  				log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
  			}
 
=== modified file 'patches/xtradb55.patch'
--- patches/xtradb55.patch	2011-09-14 12:48:27 +0000
+++ patches/xtradb55.patch	2011-11-27 06:47:26 +0000
@@ -1,6 +1,6 @@
 --- a/storage/innobase/btr/btr0btr.c
 +++ b/storage/innobase/btr/btr0btr.c
-@@ -120,7 +120,7 @@
+@@ -674,7 +674,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(
  /*===============*/
-@@ -578,7 +578,7 @@
+@@ -1134,7 +1134,7 @@
  /************************************************************//**
  Returns the child page of a node pointer and x-latches it.
  @return	child page, x-latched */
@@ -20,7 +20,7 @@
  /*===================*/
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -609,7 +609,7 @@
+@@ -581,7 +581,7 @@
  		return(TRUE);
  	}
  
@@ -29,7 +29,7 @@
  	if (recv_lsn_checks_on) {
  		ib_uint64_t	current_lsn;
  
-@@ -4901,7 +4901,7 @@
+@@ -4064,7 +4064,7 @@
  			recv_recover_page(TRUE, (buf_block_t*) bpage);
  		}
  
@@ -40,7 +40,7 @@
  				(srv_pass_corrupt_table && bpage->is_corrupt) ? NULL :
 --- a/storage/innobase/fil/fil0fil.c
 +++ b/storage/innobase/fil/fil0fil.c
-@@ -305,7 +305,7 @@
+@@ -307,7 +307,7 @@
  
  /** The tablespace memory cache. This variable is NULL before the module is
  initialized. */
@@ -49,7 +49,7 @@
  
  #ifdef UNIV_DEBUG
  /** Try fil_validate() every this many times */
-@@ -344,7 +344,7 @@
+@@ -346,7 +346,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -58,7 +58,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -669,7 +669,7 @@
+@@ -671,7 +671,7 @@
  Opens a the file of a node of a tablespace. The caller must own the fil_system
  mutex. */
  static
@@ -67,7 +67,7 @@
  fil_node_open_file(
  /*===============*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -704,7 +704,17 @@
+@@ -706,7 +706,17 @@
  			OS_FILE_READ_ONLY, &success);
  		if (!success) {
  			/* The following call prints an error message */
@@ -86,7 +86,7 @@
  
  			ut_print_timestamp(stderr);
  
-@@ -765,12 +775,15 @@
+@@ -767,12 +777,15 @@
  
  		if (UNIV_UNLIKELY(space_id != space->id)) {
  			fprintf(stderr,
@@ -105,7 +105,7 @@
  		}
  
  		if (UNIV_UNLIKELY(space_id == ULINT_UNDEFINED
-@@ -794,8 +807,8 @@
+@@ -796,8 +809,8 @@
  		}
  
  		if (size_bytes >= 1024 * 1024) {
@@ -116,7 +116,7 @@
  		}
  
  		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
-@@ -846,6 +859,8 @@
+@@ -848,6 +861,8 @@
  		/* Put the node to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
@@ -125,7 +125,7 @@
  }
  
  /**********************************************************************//**
-@@ -1474,7 +1489,12 @@
+@@ -1477,7 +1492,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -139,7 +139,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1526,7 +1546,12 @@
+@@ -1529,7 +1549,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -153,7 +153,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -2202,7 +2227,7 @@
+@@ -2205,7 +2230,7 @@
  			if (fil_create_new_single_table_tablespace(
  				    space_id, name, FALSE, flags,
  				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
@@ -162,7 +162,7 @@
  			}
  		}
  
-@@ -2369,7 +2394,7 @@
+@@ -2372,7 +2397,7 @@
  	}
  
  	if (success) {
@@ -171,7 +171,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
-@@ -2670,7 +2695,7 @@
+@@ -2673,7 +2698,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
@@ -180,7 +180,7 @@
  	if (success) {
  		mtr_t		mtr;
  
-@@ -2861,7 +2886,7 @@
+@@ -2864,7 +2889,7 @@
  
  	fil_node_create(path, size, space_id, FALSE);
  
@@ -189,7 +189,7 @@
  	{
  		mtr_t		mtr;
  
-@@ -3116,19 +3141,97 @@
+@@ -3210,19 +3235,97 @@
  		      "InnoDB: open the tablespace file ", stderr);
  		ut_print_filename(stderr, filepath);
  		fputs("!\n"
@@ -297,7 +297,7 @@
  		return(FALSE);
  	}
  
-@@ -3836,7 +3939,7 @@
+@@ -4158,7 +4261,7 @@
  	cannot be ok. */
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
@@ -306,7 +306,7 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3977,7 +4080,7 @@
+@@ -4299,7 +4402,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 */
@@ -315,7 +315,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4276,15 +4379,97 @@
+@@ -4598,15 +4701,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -421,7 +421,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4683,7 +4868,7 @@
+@@ -5005,7 +5190,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -430,7 +430,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4703,10 +4888,13 @@
+@@ -5025,10 +5210,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -445,7 +445,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4719,6 +4907,8 @@
+@@ -5041,6 +5229,8 @@
  	}
  
  	node->n_pending++;
@@ -454,7 +454,7 @@
  }
  
  /********************************************************************//**
-@@ -4920,6 +5110,16 @@
+@@ -5240,6 +5430,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -473,7 +473,7 @@
  	for (;;) {
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -460,13 +460,6 @@
+@@ -482,12 +482,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);
  
@@ -483,15 +483,13 @@
 -  " or 2 (write at commit, flush once per second).",
 -  NULL, NULL, 1, 0, 2, 0);
 -
--
- static handler *innobase_create_handler(handlerton *hton,
-                                         TABLE_SHARE *table,
-                                         MEM_ROOT *mem_root)
-@@ -958,17 +951,6 @@
- 	}
+ 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 @@
  }
  
--/******************************************************************//**
+ /******************************************************************//**
 -*/
 -extern "C" UNIV_INTERN
 -ulong
@@ -502,14 +500,14 @@
 -	return(THDVAR((THD*) thd, flush_log_at_trx_commit));
 -}
 -
- /********************************************************************//**
- Obtain the InnoDB transaction of a MySQL thread.
- @return	reference to transaction pointer */
-@@ -11595,18 +11577,12 @@
-   innodb_file_format_max_validate,
+-/******************************************************************//**
+ 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 @@
    innodb_file_format_max_update, "Antelope");
  
--/* Changed to the THDVAR */
+ /* Changed to the THDVAR */
 -//static MYSQL_SYSVAR_ULONG(flush_log_at_trx_commit, srv_flush_log_at_trx_commit,
 -//  PLUGIN_VAR_OPCMDARG,
 -//  "Set to 0 (write and flush once per second),"
@@ -522,25 +520,25 @@
 -  "Use global innodb_flush_log_at_trx_commit value. (default: ON).",
 -  NULL, NULL, TRUE);
 +static MYSQL_SYSVAR_ULONG(flush_log_at_trx_commit, srv_flush_log_at_trx_commit,
-+  PLUGIN_VAR_OPCMDARG,
-+  "Set to 0 (write and flush once per second),"
-+  " 1 (write and flush at each commit)"
-+  " or 2 (write at commit, flush once per second).",
-+  NULL, NULL, 1, 0, 2, 0);
++ PLUGIN_VAR_OPCMDARG,
++ "Set to 0 (write and flush once per second),"
++ " 1 (write and flush at each commit)"
++ " or 2 (write at commit, flush once per second).",
++ NULL, NULL, 1, 0, 2, 0);
  
  static MYSQL_SYSVAR_STR(flush_method, innobase_file_flush_method,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -12073,7 +12049,6 @@
+@@ -12294,7 +12272,6 @@
    MYSQL_SYSVAR(file_format_check),
    MYSQL_SYSVAR(file_format_max),
    MYSQL_SYSVAR(flush_log_at_trx_commit),
 -  MYSQL_SYSVAR(use_global_flush_log_at_trx_commit),
    MYSQL_SYSVAR(flush_method),
    MYSQL_SYSVAR(force_recovery),
-   MYSQL_SYSVAR(locks_unsafe_for_binlog),
+   MYSQL_SYSVAR(large_prefix),
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
-@@ -1202,6 +1202,9 @@
+@@ -1190,6 +1190,9 @@
  	ut_ad(!recv_no_ibuf_operations);
  	ut_ad(x_latch || mtr == NULL);
  
@@ -550,7 +548,7 @@
  	if (ibuf_fixed_addr_page(space, zip_size, page_no)) {
  
  		return(TRUE);
-@@ -2733,6 +2736,9 @@
+@@ -2757,6 +2760,9 @@
  	ulint	n_bytes;
  	ulint	n_pag2;
  
@@ -562,7 +560,7 @@
  
 --- a/storage/innobase/include/ha_prototypes.h
 +++ b/storage/innobase/include/ha_prototypes.h
-@@ -275,12 +275,5 @@
+@@ -284,13 +284,6 @@
  /*===================*/
          void*   thd,	/*!< in: thread handle (THD*) */
          ulint   value);	/*!< in: time waited for the lock */
@@ -574,10 +572,11 @@
 -/*================================*/
 -	void*	thd);
  
- #endif
+ /**********************************************************************//**
+ Get the current setting of the lower_case_table_names global parameter from
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -148,8 +148,7 @@
+@@ -145,8 +145,7 @@
  extern ulint	srv_n_log_files;
  extern ulint	srv_log_file_size;
  extern ulint	srv_log_buffer_size;
@@ -587,7 +586,7 @@
  extern char	srv_adaptive_flushing;
  
  
-@@ -253,6 +252,10 @@
+@@ -247,6 +246,10 @@
  extern ulint	srv_dict_size_limit;
  
  extern ulint	srv_lazy_drop_table;
@@ -618,7 +617,7 @@
 -	    && thd_flush_log_at_trx_commit(NULL) != 2) {
 +	    && srv_flush_log_at_trx_commit != 2) {
  
- 		fil_flush(group->space_id);
+ 		fil_flush(group->space_id, FALSE);
  	}
 @@ -1389,7 +1389,7 @@
  #endif /* UNIV_DEBUG */
@@ -630,21 +629,23 @@
  		allowed yet (the variable name .._no_ibuf_.. is misleading) */
  
 @@ -3151,6 +3151,7 @@
- 	for the 'very fast' shutdown, because the InnoDB layer may have
- 	committed or prepared transactions and we don't want to lose them. */
+ 	shutdown, because the InnoDB layer may have committed or
+ 	prepared transactions and we don't want to lose them. */
  
 +	if (!srv_apply_log_only) {
- 	if (trx_n_mysql_transactions > 0
- 	    || UT_LIST_GET_LEN(trx_sys->trx_list) > 0) {
- 
-@@ -3158,6 +3159,7 @@
- 
+ 	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()) {
  		goto loop;
  	}
++	} else {
++		mutex_exit(&kernel_mutex);
 +	}
  
- 	if (srv_fast_shutdown == 2) {
- 		/* In this fastest shutdown we do not flush the buffer pool:
+ 	mutex_enter(&log_sys->mutex);
+ 	server_busy = log_sys->n_pending_checkpoint_writes
 --- a/storage/innobase/log/log0recv.c
 +++ b/storage/innobase/log/log0recv.c
 @@ -42,27 +42,27 @@
@@ -738,7 +739,7 @@
  		}
  	}
  
-@@ -2936,12 +2939,14 @@
+@@ -2935,12 +2938,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -754,7 +755,7 @@
  	}
  }
  
-@@ -3110,6 +3115,7 @@
+@@ -3109,6 +3114,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -762,7 +763,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3475,6 +3481,7 @@
+@@ -3474,6 +3480,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. */
@@ -823,7 +824,7 @@
  	} else if (create_mode == OS_FILE_CREATE) {
  		mode_str = "CREATE";
  		create_flag = O_RDWR | O_CREAT | O_EXCL;
-@@ -2732,6 +2737,9 @@
+@@ -2791,6 +2796,9 @@
  	ut_a((offset & 0xFFFFFFFFUL) == offset);
  	ut_a((n & 0xFFFFFFFFUL) == n);
  
@@ -833,7 +834,7 @@
  	os_n_file_writes++;
  
  	ut_ad(file);
-@@ -2856,6 +2864,9 @@
+@@ -2915,6 +2923,9 @@
  #else
  	ssize_t	ret;
  
@@ -845,7 +846,7 @@
  	if ((ulint)ret == n) {
 --- a/storage/innobase/os/os0thread.c
 +++ b/storage/innobase/os/os0thread.c
-@@ -266,12 +266,17 @@
+@@ -251,11 +251,16 @@
  #ifdef __WIN__
  	Sleep((DWORD) tm / 1000);
  #else
@@ -862,10 +863,9 @@
 +*/
  #endif
  }
- 
 --- a/storage/innobase/row/row0merge.c
 +++ b/storage/innobase/row/row0merge.c
-@@ -459,7 +459,9 @@
+@@ -460,7 +460,9 @@
  	rec = rec_convert_dtuple_to_rec(*buf, index, tuple, n_ext);
  	offsets = rec_get_offsets(rec, index, NULL, ULINT_UNDEFINED, &heap);
  
@@ -876,7 +876,7 @@
  
  	mem_heap_free(heap);
  }
-@@ -1485,8 +1487,10 @@
+@@ -1486,8 +1488,10 @@
  		case 0:
  			if (UNIV_UNLIKELY
  			    (dict_index_is_unique(index) && !null_eq)) {
@@ -889,7 +889,7 @@
  				mem_heap_free(heap);
  				return(DB_DUPLICATE_KEY);
  			}
-@@ -2613,7 +2617,9 @@
+@@ -2636,7 +2640,9 @@
  
  	/* Reset the MySQL row buffer that is used when reporting
  	duplicate keys. */
@@ -902,7 +902,19 @@
  	secondary index entries for merge sort */
 --- a/storage/innobase/srv/srv0srv.c
 +++ b/storage/innobase/srv/srv0srv.c
-@@ -197,8 +197,7 @@
+@@ -87,11 +87,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);
+-
+ /* prototypes for new functions added to ha_innodb.cc */
+ ibool	innobase_get_slow_log();
+ 
+@@ -198,8 +193,7 @@
  UNIV_INTERN ulint	srv_log_file_size	= ULINT_MAX;
  /* size in database pages */
  UNIV_INTERN ulint	srv_log_buffer_size	= ULINT_MAX;
@@ -912,7 +924,7 @@
  
  /* Try to flush dirty pages so as to avoid IO bursts at
  the checkpoints. */
-@@ -449,6 +448,10 @@
+@@ -457,6 +451,10 @@
  UNIV_INTERN ulint	srv_dict_size_limit = 0;
  
  UNIV_INTERN ulint	srv_lazy_drop_table = 0;
@@ -923,7 +935,7 @@
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -1148,7 +1151,7 @@
+@@ -1137,7 +1135,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -932,7 +944,7 @@
  }
  
  /*********************************************************************//**
-@@ -1159,6 +1162,7 @@
+@@ -1148,6 +1146,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -940,7 +952,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1172,6 +1176,7 @@
+@@ -1161,6 +1160,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -948,7 +960,7 @@
  }
  
  /*********************************************************************//**
-@@ -1876,7 +1881,7 @@
+@@ -1886,7 +1886,7 @@
  		}
  
  		/* Record the lock wait time for this thread */
@@ -957,6 +969,43 @@
  	}
  
  	if (trx->was_chosen_as_deadlock_victim) {
+@@ -2842,36 +2842,6 @@
+ 		old_sema = sema;
+ 	}
+ 
+-	if (srv_kill_idle_transaction && trx_sys) {
+-		trx_t*	trx;
+-		time_t	now;
+-rescan_idle:
+-		now = time(NULL);
+-		mutex_enter(&kernel_mutex);
+-		trx = UT_LIST_GET_FIRST(trx_sys->mysql_trx_list);
+-		while (trx) {
+-			if (trx->conc_state == TRX_ACTIVE
+-			    && trx->mysql_thd
+-			    && innobase_thd_is_idle(trx->mysql_thd)) {
+-				ib_int64_t	start_time; /* as stmt ID */
+-
+-				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;
+-				} else if (difftime(now, trx->idle_start)
+-					   > srv_kill_idle_transaction) {
+-					/* kill the session */
+-					mutex_exit(&kernel_mutex);
+-					innobase_thd_kill(trx->mysql_thd);
+-					goto rescan_idle;
+-				}
+-			}
+-			trx = UT_LIST_GET_NEXT(mysql_trx_list, trx);
+-		}
+-		mutex_exit(&kernel_mutex);
+-	}
+-
+ 	/* Flush stderr so that a database user gets the output
+ 	to possible MySQL error file */
+ 
 --- a/storage/innobase/srv/srv0start.c
 +++ b/storage/innobase/srv/srv0start.c
 @@ -94,6 +94,8 @@
@@ -986,7 +1035,7 @@
  ulint
  open_or_create_data_files(
  /*======================*/
-@@ -1868,6 +1870,10 @@
+@@ -1875,6 +1877,10 @@
  		are initialized in trx_sys_init_at_db_start(). */
  
  		recv_recovery_from_checkpoint_finish();
@@ -997,7 +1046,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
-@@ -2042,6 +2048,17 @@
+@@ -2054,6 +2060,17 @@
  	if (!srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes != tablespace_size_in_header) {
  
@@ -1015,7 +1064,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: tablespace size"
-@@ -2121,6 +2138,7 @@
+@@ -2133,6 +2150,7 @@
  
  			return(DB_ERROR);
  		}
@@ -1023,7 +1072,7 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -2240,6 +2258,7 @@
+@@ -2252,6 +2270,7 @@
  		ibuf_update_max_tablespace_id();
  	}
  
@@ -1033,16 +1082,16 @@
  	srv_was_started = TRUE;
 --- a/storage/innobase/trx/trx0purge.c
 +++ b/storage/innobase/trx/trx0purge.c
-@@ -1100,6 +1100,9 @@
- 	/*	que_thr_t*	thr2; */
+@@ -1129,6 +1129,9 @@
+ 	que_thr_t*	thr;
  	ulint		old_pages_handled;
  
 +	if (srv_fake_write)
 +		return(0);
 +
- 	mutex_enter(&(purge_sys->mutex));
+ 	ut_a(purge_sys->trx->n_active_thrs == 0);
  
- 	if (purge_sys->trx->n_active_thrs > 0) {
+ 	rw_lock_x_lock(&purge_sys->latch);
 --- a/storage/innobase/trx/trx0rseg.c
 +++ b/storage/innobase/trx/trx0rseg.c
 @@ -140,9 +140,11 @@
@@ -1059,7 +1108,7 @@
  
 --- a/storage/innobase/trx/trx0sys.c
 +++ b/storage/innobase/trx/trx0sys.c
-@@ -1938,10 +1938,12 @@
+@@ -1983,10 +1983,12 @@
  		UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
  	}
  
@@ -1074,18 +1123,19 @@
  
 --- a/storage/innobase/trx/trx0trx.c
 +++ b/storage/innobase/trx/trx0trx.c
-@@ -505,8 +505,8 @@
+@@ -563,9 +563,8 @@
  						(ullint) trx->id);
  
  					if (srv_force_recovery == 0) {
 -
 -						trx->conc_state = TRX_PREPARED;
+-						trx_n_prepared++;
 +						/* xtrabackup should rollback it */
 +						trx->conc_state = TRX_ACTIVE;
  					} else {
  						fprintf(stderr,
  							"InnoDB: Since"
-@@ -580,9 +580,9 @@
+@@ -639,10 +638,9 @@
  							(ullint) trx->id);
  
  						if (srv_force_recovery == 0) {
@@ -1093,11 +1143,12 @@
 +							/* xtrabackup should rollback it */
  							trx->conc_state
 -								= TRX_PREPARED;
+-							trx_n_prepared++;
 +								= TRX_ACTIVE;
  						} else {
  							fprintf(stderr,
  								"InnoDB: Since"
-@@ -925,7 +925,6 @@
+@@ -1051,7 +1049,6 @@
  	trx->read_view = NULL;
  
  	if (lsn) {
@@ -1105,7 +1156,7 @@
  
  		mutex_exit(&kernel_mutex);
  
-@@ -934,12 +933,6 @@
+@@ -1060,12 +1057,6 @@
  			trx_undo_insert_cleanup(trx);
  		}
  
@@ -1118,7 +1169,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! */
-@@ -971,9 +964,9 @@
+@@ -1097,9 +1088,9 @@
  		if (trx->flush_log_later) {
  			/* Do nothing yet */
  			trx->must_flush_log_later = TRUE;
@@ -1130,7 +1181,7 @@
  			if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
  				/* Write the log but do not flush it to disk */
  
-@@ -985,7 +978,7 @@
+@@ -1111,7 +1102,7 @@
  
  				log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
  			}
@@ -1139,7 +1190,7 @@
  
  			/* Write the log but do not flush it to disk */
  
-@@ -1665,23 +1658,16 @@
+@@ -1791,23 +1782,16 @@
  	trx_t*	trx)	/*!< in: trx handle */
  {
  	ib_uint64_t	lsn	= trx->commit_lsn;
@@ -1165,7 +1216,7 @@
  		if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
  			/* Write the log but do not flush it to disk */
  
-@@ -1692,7 +1678,7 @@
+@@ -1818,7 +1802,7 @@
  
  			log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
  		}
@@ -1174,7 +1225,7 @@
  
  		/* Write the log but do not flush it to disk */
  
-@@ -1945,7 +1931,6 @@
+@@ -2066,7 +2050,6 @@
  	/*--------------------------------------*/
  
  	if (lsn) {
@@ -1182,7 +1233,7 @@
  
  		/* Depending on the my.cnf options, we may now write the log
  		buffer to the log files, making the prepared state of the
-@@ -1966,15 +1951,9 @@
+@@ -2087,15 +2070,9 @@
  
  		mutex_exit(&kernel_mutex);
  
@@ -1200,7 +1251,7 @@
  			if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
  				/* Write the log but do not flush it to disk */
  
-@@ -1986,7 +1965,7 @@
+@@ -2107,7 +2084,7 @@
  
  				log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
  			}
 
=== modified file 'utils/build.sh'
--- utils/build.sh	2011-10-05 02:29:27 +0000
+++ utils/build.sh	2011-11-27 06:47:26 +0000
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
-MYSQL_51_VERSION=5.1.56
-MYSQL_55_VERSION=5.5.10
+MYSQL_51_VERSION=5.1.59
+MYSQL_55_VERSION=5.5.17
+PS_51_VERSION=5.1.59-13.0
+PS_55_VERSION=5.5.16-22.0
 
 AUTO_DOWNLOAD=${AUTO_DOWNLOAD:-no}
 MASTER_SITE="http://s3.amazonaws.com/percona.com/downloads/community"
@@ -216,13 +218,15 @@
 	    cd $branch_dir
 	    bzr pull
 	else
-	    bzr branch lp:~percona-dev/percona-server/$branch_dir $branch_dir
+	    bzr branch -r tag:Percona-Server-$PS_51_VERSION \
+		lp:percona-server/5.1 $branch_dir
 	    cd $branch_dir
 	fi
 
 	$MAKE_CMD main
+	cd $top_dir
 	rm -rf $server_dir
-	mv Percona-Server $top_dir
+	ln -s $branch_dir/Percona-Server $server_dir
 
 	# Patch Percona Server
 	cd $server_dir
@@ -264,13 +268,15 @@
 	    cd $branch_dir
 	    bzr pull
 	else
-	    bzr branch lp:~percona-dev/percona-server/$branch_dir $branch_dir
+	    bzr branch -r tag:Percona-Server-$PS_55_VERSION \
+		lp:percona-server $branch_dir
 	    cd $branch_dir
 	fi
 
 	$MAKE_CMD PERCONA_SERVER=Percona-Server-5.5 main
+	cd $top_dir
 	rm -rf $server_dir
-	mv Percona-Server-5.5 $top_dir
+	ln -s $branch_dir/Percona-Server $server_dir
 
 	# Patch Percona Server
 	cd $server_dir
 
=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-10-05 02:29:27 +0000
+++ xtrabackup.c	2011-11-27 06:47:26 +0000
@@ -135,7 +135,7 @@
 #include <mysql/plugin.h>
 #include <mysql/service_thd_wait.h>
 
-void thd_wait_begin(MYSQL_THD thd, thd_wait_type wait_type)
+void thd_wait_begin(MYSQL_THD thd, int wait_type)
 {
 	(void)thd;
 	(void)wait_type;
@@ -251,6 +251,15 @@
 					a file, so this is either "open" or
 					"create" */
 
+/***********************************************************************//**
+Compatibility wrapper around os_file_flush().
+@return	TRUE if success */
+static
+ibool
+xb_file_flush(
+/*==========*/
+	os_file_t	file);	/*!< in, own: handle to a file */
+
 #include <fcntl.h>
 #include <regex.h>
 
@@ -510,7 +519,7 @@
 struct fil_system_struct {
 #ifndef UNIV_HOTBACKUP
 	mutex_t		mutex;		/*!< The mutex protecting the cache */
-#ifdef XTRADB55
+#ifdef XTRADB_BASED
 	mutex_t		file_extend_mutex;
 #endif
 #endif /* !UNIV_HOTBACKUP */
@@ -557,6 +566,10 @@
 					request */
 	UT_LIST_BASE_NODE_T(fil_space_t) space_list;
 					/*!< list of all file spaces */
+	ibool		space_id_reuse_warned;
+					/* !< TRUE if fil_space_create()
+					has issued a warning about
+					potential space_id reuse */
 };
 
 #endif /* INNODB_VERSION_SHORT */
@@ -1520,6 +1533,31 @@
         putc(q, f);
 }
 
+/**********************************************************************//**
+It should be safe to use lower_case_table_names=0 for xtrabackup. If it causes
+any problems, we can add the lower_case_table_names option to xtrabackup
+later.
+@return	0 */
+ulint
+innobase_get_lower_case_table_names(void)
+/*=====================================*/
+{
+	return(0);
+}
+
+/******************************************************************//**
+Strip dir name from a full path name and return only the file name
+@return file name or "null" if no file name */
+const char*
+innobase_basename(
+/*==============*/
+	const char*	path_name)	/*!< in: full path name */
+{
+	const char*	name = base_name(path_name);
+
+	return((name) ? name : "null");
+}
+
 /*****************************************************************//**
 Convert an SQL identifier to the MySQL system_charset_info (UTF-8)
 and quote it if needed.
@@ -1856,6 +1894,22 @@
 #endif
 #endif
 
+/***********************************************************************//**
+Compatibility wrapper around os_file_flush().
+@return	TRUE if success */
+static
+ibool
+xb_file_flush(
+/*==========*/
+	os_file_t	file)	/*!< in, own: handle to a file */
+{
+#ifdef XTRADB_BASED
+	return os_file_flush(file, TRUE);
+#else
+	return os_file_flush(file);
+#endif
+}
+
 /***********************************************************************
 Computes bit shift for a given value. If the argument is not a power
 of 2, returns 0.*/
@@ -2925,7 +2979,7 @@
 		}
 	}
 
-	success = os_file_flush(dst_file);
+	success = xb_file_flush(dst_file);
 	if (!success) {
 		goto error;
 	}
@@ -3237,7 +3291,7 @@
 
 
 	if (!xtrabackup_stream) {
-		success = os_file_flush(dst_log);
+		success = xb_file_flush(dst_log);
 	} else {
 		fflush(stdout);
 		success = TRUE;
@@ -4270,7 +4324,11 @@
 #ifndef INNODB_VERSION_SHORT
 						local_page = buf_page_get(space_id, page_no, RW_S_LATCH, &local_mtr);
 #else
+#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);
 #endif
 						blob_header = local_page + offset;
@@ -4315,7 +4373,13 @@
 #ifndef INNODB_VERSION_SHORT
 		page = btr_page_get(space, right_page_no, RW_X_LATCH, &mtr);
 #else
-		block = btr_block_get(space, zip_size, right_page_no, RW_X_LATCH, &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);
 #endif
 		goto loop;
@@ -5771,7 +5835,7 @@
 						os_file_get_last_error(TRUE);
 						goto next_node;
 					}
-					success = os_file_flush(info_file);
+					success = xb_file_flush(info_file);
 					if (!success) {
 						os_file_get_last_error(TRUE);
 						goto next_node;