Merge lp:~akopytov/percona-xtrabackup/bug722638-trunk into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

Bug #722638: xtrabackup: taking backup while tables are droped and
created breaks backup

The root cause of the problem was that xtrabackup iterated .ibd files
based on a data dictionary snapshot taken at the very start of a backup
process. If a tablespace id changed due to dropping and recreating the
table with the same name, or an ALTER TABLE that requires a table copy,
or TRUNCATE (if it was performed as DROP + CREATE TABLE), InnoDB
complained about id mismatch, and crashed with an assertion failure.

The idea of the fix is to ignore tablespaces with wrong ids at the
backup stage. They will be (re)created when doing recovery at the prepare
stage, since the corresponding delete/create log records will be
replayed on recovery.

Fixed by modifying fil_node_open_file() in all XtraBackup patches to
InnoDB/XtraDB source to signal id mismatches back to the caller (with an
descriptive warning) rather than crash with an error.

Warning messages in xtrabackup.c were also adjusted to take this new
case into account.

This patch also introduces a new command line switch to xtrabackup,
--debug-sync, to make possible automatic testing of the fix.

[Alexey Kopytov (akopytov)]

Can't link a Jenkins build as it have been stuck for a few days.

[Stewart Smith (stewart)]

review: Approve

=== modified file 'patches/innodb51.patch'
--- patches/innodb51.patch	2011-06-26 03:06:10 +0000
+++ patches/innodb51.patch	2011-09-15 04:23:22 +0000
@@ -1,4 +1,3 @@
-diff -ruN a/storage/innodb_plugin/btr/btr0btr.c b/storage/innodb_plugin/btr/btr0btr.c
 --- a/storage/innodb_plugin/btr/btr0btr.c
 +++ b/storage/innodb_plugin/btr/btr0btr.c
 @@ -120,7 +120,7 @@
@@ -19,7 +18,6 @@
  buf_block_t*
  btr_node_ptr_get_child(
  /*===================*/
-diff -ruN a/storage/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
 --- a/storage/innodb_plugin/buf/buf0buf.c
 +++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -358,7 +358,7 @@
@@ -51,7 +49,6 @@
  			ibuf_merge_or_delete_for_page(
  				(buf_block_t*) bpage, bpage->space,
  				bpage->offset, buf_page_get_zip_size(bpage),
-diff -ruN a/storage/innodb_plugin/buf/buf0rea.c b/storage/innodb_plugin/buf/buf0rea.c
 --- a/storage/innodb_plugin/buf/buf0rea.c
 +++ b/storage/innodb_plugin/buf/buf0rea.c
 @@ -120,6 +120,45 @@
@@ -151,7 +148,6 @@
  		return;
  	}
  
-diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
 --- a/storage/innodb_plugin/fil/fil0fil.c
 +++ b/storage/innodb_plugin/fil/fil0fil.c
 @@ -48,6 +48,8 @@
@@ -190,7 +186,7 @@
  fil_node_open_file(
  /*===============*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -657,7 +659,14 @@
+@@ -657,7 +659,17 @@
  			node->name, OS_FILE_OPEN, OS_FILE_READ_ONLY, &success);
  		if (!success) {
  			/* The following call prints an error message */
@@ -199,14 +195,36 @@
 +			{
 +				ut_print_timestamp(stderr);
 +				fprintf(stderr,
-+					" InnoDB: Warning: cannot open %s\n",
++					" InnoDB: Warning: cannot open %s\n"
++					"InnoDB: this can happen if the table "
++					"was removed or renamed during an \n"
++					"InnoDB: xtrabackup run and is not dangerous.\n",
 +					node->name);
 +				return(OS_FILE_NOT_FOUND);
 +			}
  
  			ut_print_timestamp(stderr);
  
-@@ -747,8 +756,8 @@
+@@ -718,12 +730,15 @@
+ 
+ 		if (UNIV_UNLIKELY(space_id != space->id)) {
+ 			fprintf(stderr,
+-				"InnoDB: Error: tablespace id is %lu"
++				"InnoDB: Warning: tablespace id is %lu"
+ 				" in the data dictionary\n"
+-				"InnoDB: but in file %s it is %lu!\n",
++				"InnoDB: but in file %s it is %lu!\n"
++				"InnoDB: this can happen if the table metadata "
++				"was modified during an xtrabackup run\n"
++				"InnoDB: and is not dangerous.\n",
+ 				space->id, node->name, space_id);
+ 
+-			ut_error;
++			return(OS_FILE_NOT_FOUND);
+ 		}
+ 
+ 		if (UNIV_UNLIKELY(space_id == ULINT_UNDEFINED
+@@ -747,8 +762,8 @@
  		}
  
  		if (size_bytes >= 1024 * 1024) {
@@ -217,7 +235,7 @@
  		}
  
  		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
-@@ -793,6 +802,8 @@
+@@ -793,6 +808,8 @@
  		/* Put the node to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
@@ -226,7 +244,7 @@
  }
  
  /**********************************************************************//**
-@@ -1418,7 +1429,12 @@
+@@ -1418,7 +1435,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -240,7 +258,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1470,7 +1486,12 @@
+@@ -1470,7 +1492,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -254,7 +272,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1910,7 +1931,7 @@
+@@ -1910,7 +1937,7 @@
  	mem_free(path);
  }
  
@@ -263,7 +281,7 @@
  /********************************************************//**
  Writes a log record about an .ibd file create/rename/delete. */
  static
-@@ -2134,7 +2155,7 @@
+@@ -2134,7 +2161,7 @@
  			if (fil_create_new_single_table_tablespace(
  				    space_id, name, FALSE, flags,
  				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
@@ -272,7 +290,7 @@
  			}
  		}
  
-@@ -2297,7 +2318,7 @@
+@@ -2297,7 +2324,7 @@
  	}
  
  	if (success) {
@@ -281,7 +299,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
-@@ -2598,7 +2619,7 @@
+@@ -2598,7 +2625,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
@@ -290,7 +308,7 @@
  	if (success) {
  		mtr_t		mtr;
  
-@@ -2788,7 +2809,7 @@
+@@ -2788,7 +2815,7 @@
  
  	fil_node_create(path, size, space_id, FALSE);
  
@@ -299,7 +317,7 @@
  	{
  		mtr_t		mtr;
  
-@@ -3041,19 +3062,97 @@
+@@ -3041,19 +3068,97 @@
  		      "InnoDB: open the tablespace file ", stderr);
  		ut_print_filename(stderr, filepath);
  		fputs("!\n"
@@ -407,7 +425,7 @@
  		return(FALSE);
  	}
  
-@@ -3284,7 +3383,7 @@
+@@ -3284,7 +3389,7 @@
  	cannot be ok. */
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
@@ -416,7 +434,7 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3425,7 +3524,7 @@
+@@ -3425,7 +3530,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 */
@@ -425,7 +443,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -3724,15 +3823,97 @@
+@@ -3724,15 +3829,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -531,7 +549,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4121,7 +4302,7 @@
+@@ -4121,7 +4308,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -540,7 +558,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4141,10 +4322,13 @@
+@@ -4141,10 +4328,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -555,7 +573,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4157,6 +4341,8 @@
+@@ -4157,6 +4347,8 @@
  	}
  
  	node->n_pending++;
@@ -564,7 +582,7 @@
  }
  
  /********************************************************************//**
-@@ -4292,7 +4478,9 @@
+@@ -4292,7 +4484,9 @@
  	ut_ad(recv_no_ibuf_operations || (type == OS_FILE_WRITE)
  	      || !ibuf_bitmap_page(zip_size, block_offset)
  	      || sync || is_log);
@@ -575,7 +593,7 @@
  	      || ibuf_page(space_id, zip_size, block_offset, NULL));
  # endif /* UNIV_LOG_DEBUG */
  	if (sync) {
-@@ -4341,6 +4529,16 @@
+@@ -4341,6 +4535,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -592,7 +610,6 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
-diff -ruN a/storage/innodb_plugin/ibuf/ibuf0ibuf.c b/storage/innodb_plugin/ibuf/ibuf0ibuf.c
 --- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c
 +++ b/storage/innodb_plugin/ibuf/ibuf0ibuf.c
 @@ -1061,6 +1061,9 @@
@@ -615,7 +632,6 @@
  	while (sum_pages < n_pages) {
  		n_bytes = ibuf_contract_ext(&n_pag2, sync);
  
-diff -ruN a/storage/innodb_plugin/include/mem0mem.ic b/storage/innodb_plugin/include/mem0mem.ic
 --- a/storage/innodb_plugin/include/mem0mem.ic
 +++ b/storage/innodb_plugin/include/mem0mem.ic
 @@ -367,7 +367,7 @@
@@ -627,7 +643,6 @@
  #endif
  
  	return(buf);
-diff -ruN a/storage/innodb_plugin/include/mtr0mtr.ic b/storage/innodb_plugin/include/mtr0mtr.ic
 --- a/storage/innodb_plugin/include/mtr0mtr.ic
 +++ b/storage/innodb_plugin/include/mtr0mtr.ic
 @@ -160,7 +160,7 @@
@@ -639,7 +654,6 @@
  
  		if ((object == slot->object) && (type == slot->type)) {
  
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
 --- a/storage/innodb_plugin/include/srv0srv.h
 +++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -201,6 +201,10 @@
@@ -653,7 +667,6 @@
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
-diff -ruN a/storage/innodb_plugin/include/srv0start.h b/storage/innodb_plugin/include/srv0start.h
 --- a/storage/innodb_plugin/include/srv0start.h
 +++ b/storage/innodb_plugin/include/srv0start.h
 @@ -91,6 +91,8 @@
@@ -665,7 +678,6 @@
  #ifdef __NETWARE__
  void set_panic_flag_for_netware(void);
  #endif
-diff -ruN a/storage/innodb_plugin/include/ut0byte.ic b/storage/innodb_plugin/include/ut0byte.ic
 --- a/storage/innodb_plugin/include/ut0byte.ic
 +++ b/storage/innodb_plugin/include/ut0byte.ic
 @@ -168,6 +168,16 @@
@@ -713,7 +725,6 @@
  	return(diff);
  }
  
-diff -ruN a/storage/innodb_plugin/log/log0log.c b/storage/innodb_plugin/log/log0log.c
 --- a/storage/innodb_plugin/log/log0log.c
 +++ b/storage/innodb_plugin/log/log0log.c
 @@ -564,7 +564,9 @@
@@ -760,7 +771,6 @@
  
  	if (srv_fast_shutdown == 2) {
  		/* In this fastest shutdown we do not flush the buffer pool:
-diff -ruN a/storage/innodb_plugin/log/log0recv.c b/storage/innodb_plugin/log/log0recv.c
 --- a/storage/innodb_plugin/log/log0recv.c
 +++ b/storage/innodb_plugin/log/log0recv.c
 @@ -42,27 +42,27 @@
@@ -912,7 +922,6 @@
  	trx_rollback_or_clean_recovered(FALSE);
  }
  
-diff -ruN a/storage/innodb_plugin/os/os0file.c b/storage/innodb_plugin/os/os0file.c
 --- a/storage/innodb_plugin/os/os0file.c
 +++ b/storage/innodb_plugin/os/os0file.c
 @@ -514,7 +514,7 @@
@@ -968,7 +977,6 @@
  	ret = os_file_pwrite(file, buf, n, offset, offset_high);
  
  	if ((ulint)ret == n) {
-diff -ruN a/storage/innodb_plugin/os/os0thread.c b/storage/innodb_plugin/os/os0thread.c
 --- a/storage/innodb_plugin/os/os0thread.c
 +++ b/storage/innodb_plugin/os/os0thread.c
 @@ -287,12 +287,17 @@
@@ -989,7 +997,6 @@
  #endif
  }
  
-diff -ruN a/storage/innodb_plugin/row/row0merge.c b/storage/innodb_plugin/row/row0merge.c
 --- a/storage/innodb_plugin/row/row0merge.c
 +++ b/storage/innodb_plugin/row/row0merge.c
 @@ -453,7 +453,9 @@
@@ -1030,7 +1037,6 @@
  
  	/* Read clustered index of the table and create files for
  	secondary index entries for merge sort */
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -372,6 +372,9 @@
@@ -1068,7 +1074,6 @@
  }
  
  /*********************************************************************//**
-diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
 --- a/storage/innodb_plugin/srv/srv0start.c
 +++ b/storage/innodb_plugin/srv/srv0start.c
 @@ -94,6 +94,8 @@
@@ -1153,7 +1158,6 @@
  	srv_file_per_table = srv_file_per_table_original_value;
  
  	srv_was_started = TRUE;
-diff -ruN a/storage/innodb_plugin/trx/trx0purge.c b/storage/innodb_plugin/trx/trx0purge.c
 --- a/storage/innodb_plugin/trx/trx0purge.c
 +++ b/storage/innodb_plugin/trx/trx0purge.c
 @@ -1087,6 +1087,9 @@
@@ -1166,7 +1170,6 @@
  	mutex_enter(&(purge_sys->mutex));
  
  	if (purge_sys->trx->n_active_thrs > 0) {
-diff -ruN a/storage/innodb_plugin/trx/trx0rseg.c b/storage/innodb_plugin/trx/trx0rseg.c
 --- a/storage/innodb_plugin/trx/trx0rseg.c
 +++ b/storage/innodb_plugin/trx/trx0rseg.c
 @@ -143,9 +143,11 @@
@@ -1181,7 +1184,6 @@
  
  	undo = UT_LIST_GET_FIRST(rseg->update_undo_cached);
  
-diff -ruN a/storage/innodb_plugin/trx/trx0sys.c b/storage/innodb_plugin/trx/trx0sys.c
 --- a/storage/innodb_plugin/trx/trx0sys.c
 +++ b/storage/innodb_plugin/trx/trx0sys.c
 @@ -1607,10 +1607,12 @@
@@ -1197,7 +1199,6 @@
  
  	mem_free(trx_sys);
  
-diff -ruN a/storage/innodb_plugin/trx/trx0trx.c b/storage/innodb_plugin/trx/trx0trx.c
 --- a/storage/innodb_plugin/trx/trx0trx.c
 +++ b/storage/innodb_plugin/trx/trx0trx.c
 @@ -461,8 +461,8 @@
 
=== modified file 'patches/innodb51_builtin.patch'
--- patches/innodb51_builtin.patch	2011-06-26 03:06:10 +0000
+++ patches/innodb51_builtin.patch	2011-09-15 04:23:22 +0000
@@ -1,4 +1,3 @@
-diff -ruN a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c
 --- a/storage/innobase/btr/btr0btr.c
 +++ b/storage/innobase/btr/btr0btr.c
 @@ -515,7 +515,7 @@
@@ -10,7 +9,6 @@
  page_t*
  btr_node_ptr_get_child(
  /*===================*/
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
 @@ -304,7 +304,7 @@
@@ -50,7 +48,6 @@
  			ibuf_merge_or_delete_for_page(
  				block->frame, block->space, block->offset,
  				TRUE);
-diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
 --- a/storage/innobase/buf/buf0flu.c
 +++ b/storage/innobase/buf/buf0flu.c
 @@ -81,6 +81,22 @@
@@ -84,7 +81,6 @@
  
  	ut_ad(buf_flush_validate_low());
  }
-diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
 --- a/storage/innobase/buf/buf0rea.c
 +++ b/storage/innobase/buf/buf0rea.c
 @@ -114,6 +114,45 @@
@@ -147,7 +143,6 @@
  				fprintf(stderr,
  					"InnoDB: Error: InnoDB has waited for"
  					" 50 seconds for pending\n"
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
 --- a/storage/innobase/fil/fil0fil.c
 +++ b/storage/innobase/fil/fil0fil.c
 @@ -26,6 +26,10 @@
@@ -161,7 +156,60 @@
  
  
  /*
-@@ -604,9 +608,9 @@
+@@ -260,7 +264,7 @@
+ off the LRU list if it is in the LRU list. The caller must hold the fil_sys
+ mutex. */
+ static
+-void
++ulint
+ fil_node_prepare_for_io(
+ /*====================*/
+ 	fil_node_t*	node,	/* in: file node */
+@@ -494,7 +498,7 @@
+ Opens a the file of a node of a tablespace. The caller must own the fil_system
+ mutex. */
+ static
+-void
++ulint
+ fil_node_open_file(
+ /*===============*/
+ 	fil_node_t*	node,	/* in: file node */
+@@ -529,7 +533,18 @@
+ 			node->name, OS_FILE_OPEN, OS_FILE_READ_ONLY, &success);
+ 		if (!success) {
+ 			/* The following call prints an error message */
+-			os_file_get_last_error(TRUE);
++			if (os_file_get_last_error(TRUE) == OS_FILE_NOT_FOUND)
++			{
++				ut_print_timestamp(stderr);
++				fprintf(stderr,
++					" InnoDB: Warning: cannot open %s\n"
++					"InnoDB: this can happen if the table "
++					"was removed or renamed during an \n"
++					"InnoDB: xtrabackup run and is not dangerous.\n",
++					node->name);
++				return(OS_FILE_NOT_FOUND);
++			}
++
+ 
+ 			ut_print_timestamp(stderr);
+ 
+@@ -595,18 +610,21 @@
+ 
+ 		if (space_id != space->id) {
+ 			fprintf(stderr,
+-				"InnoDB: Error: tablespace id is %lu"
++				"InnoDB: Warning: tablespace id is %lu"
+ 				" in the data dictionary\n"
+-				"InnoDB: but in file %s it is %lu!\n",
++				"InnoDB: but in file %s it is %lu!\n"
++				"InnoDB: this can happen if the table metadata "
++				"was modified during an xtrabackup run\n"
++				"InnoDB: and is not dangerous.\n",
+ 				space->id, node->name, space_id);
+ 
+-			ut_a(0);
++			return(OS_FILE_NOT_FOUND);
  		}
  
  		if (size_bytes >= FSP_EXTENT_SIZE * UNIV_PAGE_SIZE) {
@@ -174,7 +222,30 @@
  		} else {
  			node->size = (ulint) (size_bytes / UNIV_PAGE_SIZE);
  		}
-@@ -1755,7 +1759,7 @@
+@@ -642,6 +660,8 @@
+ 		/* Put the node to the LRU list */
+ 		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
+ 	}
++
++	return(0);
+ }
+ 
+ /**************************************************************************
+@@ -1288,7 +1308,12 @@
+ 		the file yet; the following calls will open it and update the
+ 		size fields */
+ 
+-		fil_node_prepare_for_io(node, system, space);
++		if (fil_node_prepare_for_io(node, system, space))
++		{
++			mutex_exit(&(system->mutex));
++
++			return(0);
++		}
+ 		fil_node_complete_io(node, system, OS_FILE_READ);
+ 	}
+ 
+@@ -1755,7 +1780,7 @@
  	mem_free(path);
  }
  
@@ -183,7 +254,7 @@
  /************************************************************
  Writes a log record about an .ibd file create/rename/delete. */
  static
-@@ -1957,7 +1961,7 @@
+@@ -1957,7 +1982,7 @@
  			if (fil_create_new_single_table_tablespace(
  				    &space_id, name, FALSE,
  				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
@@ -192,7 +263,7 @@
  			}
  		}
  	}
-@@ -2116,7 +2120,7 @@
+@@ -2116,7 +2141,7 @@
  	}
  
  	if (success) {
@@ -201,7 +272,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
-@@ -2392,7 +2396,7 @@
+@@ -2392,7 +2417,7 @@
  
  	mutex_exit(&(system->mutex));
  
@@ -210,7 +281,7 @@
  	if (success) {
  		mtr_t		mtr;
  
-@@ -2568,7 +2572,7 @@
+@@ -2568,7 +2593,7 @@
  
  	fil_node_create(path, size, *space_id, FALSE);
  
@@ -219,7 +290,7 @@
  	{
  		mtr_t		mtr;
  
-@@ -2786,20 +2790,99 @@
+@@ -2786,20 +2811,99 @@
  		      "InnoDB: open the tablespace file ", stderr);
  		ut_print_filename(stderr, filepath);
  		fputs("!\n"
@@ -330,7 +401,7 @@
  		return(FALSE);
  	}
  
-@@ -3025,7 +3108,7 @@
+@@ -3025,7 +3129,7 @@
  	cannot be ok. */
  
  	size = (((ib_longlong)size_high) << 32) + (ib_longlong)size_low;
@@ -339,7 +410,7 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3152,7 +3235,7 @@
+@@ -3152,7 +3256,7 @@
  A fault-tolerant function that tries to read the next file name in the
  directory. We retry 100 times if os_file_readdir_next_file() returns -1. The
  idea is to read as much good data as we can and jump over bad data. */
@@ -348,7 +419,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -3500,15 +3583,100 @@
+@@ -3500,15 +3604,100 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -457,7 +528,32 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4067,7 +4235,9 @@
+@@ -3901,7 +4090,7 @@
+ off the LRU list if it is in the LRU list. The caller must hold the fil_sys
+ mutex. */
+ static
+-void
++ulint
+ fil_node_prepare_for_io(
+ /*====================*/
+ 	fil_node_t*	node,	/* in: file node */
+@@ -3921,10 +4110,14 @@
+ 	}
+ 
+ 	if (node->open == FALSE) {
++		ulint	err;
+ 		/* File is closed: open it */
+ 		ut_a(node->n_pending == 0);
+ 
+-		fil_node_open_file(node, system, space);
++		err = fil_node_open_file(node, system, space);
++		if (err) {
++			return(err);
++		}
+ 	}
+ 
+ 	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
+@@ -4067,7 +4259,9 @@
  	ut_ad(recv_no_ibuf_operations || (type == OS_FILE_WRITE)
  	      || !ibuf_bitmap_page(block_offset) || sync || is_log);
  #ifdef UNIV_SYNC_DEBUG
@@ -468,7 +564,7 @@
  	      || ibuf_page(space_id, block_offset));
  #endif
  #endif
-@@ -4112,6 +4282,16 @@
+@@ -4112,6 +4306,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -485,7 +581,6 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
-diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
 @@ -984,7 +984,7 @@
@@ -507,7 +602,6 @@
  	while (sum_pages < n_pages) {
  		n_bytes = ibuf_contract_ext(&n_pag2, sync);
  
-diff -ruN a/storage/innobase/include/mem0mem.h b/storage/innobase/include/mem0mem.h
 --- a/storage/innobase/include/mem0mem.h
 +++ b/storage/innobase/include/mem0mem.h
 @@ -401,6 +401,7 @@
@@ -518,7 +612,6 @@
  #ifdef MEM_PERIODIC_CHECK
  	UT_LIST_NODE_T(mem_block_t) mem_block_list;
  			/* List of all mem blocks allocated; protected
-diff -ruN a/storage/innobase/include/mem0mem.ic b/storage/innobase/include/mem0mem.ic
 --- a/storage/innobase/include/mem0mem.ic
 +++ b/storage/innobase/include/mem0mem.ic
 @@ -452,6 +452,7 @@
@@ -552,7 +645,6 @@
  
  	if (heap->free_block) {
  		size += UNIV_PAGE_SIZE;
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
 @@ -60,6 +60,8 @@
@@ -583,7 +675,6 @@
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
-diff -ruN a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h
 --- a/storage/innobase/include/srv0start.h
 +++ b/storage/innobase/include/srv0start.h
 @@ -80,6 +80,7 @@
@@ -594,7 +685,6 @@
  
  #ifdef __NETWARE__
  void set_panic_flag_for_netware(void);
-diff -ruN a/storage/innobase/include/ut0byte.ic b/storage/innobase/include/ut0byte.ic
 --- a/storage/innobase/include/ut0byte.ic
 +++ b/storage/innobase/include/ut0byte.ic
 @@ -152,6 +152,16 @@
@@ -642,7 +732,6 @@
  	return(diff);
  }
  
-diff -ruN a/storage/innobase/include/ut0mem.h b/storage/innobase/include/ut0mem.h
 --- a/storage/innobase/include/ut0mem.h
 +++ b/storage/innobase/include/ut0mem.h
 @@ -30,6 +30,13 @@
@@ -659,7 +748,6 @@
  Allocates memory. Sets it also to zero if UNIV_SET_MEM_TO_ZERO is
  defined and set_to_zero is TRUE. */
  
-diff -ruN a/storage/innobase/include/ut0rnd.ic b/storage/innobase/include/ut0rnd.ic
 --- a/storage/innobase/include/ut0rnd.ic
 +++ b/storage/innobase/include/ut0rnd.ic
 @@ -172,7 +172,7 @@
@@ -680,7 +768,6 @@
  		i++;
  		ut_a(i < 100);
  #endif
-diff -ruN a/storage/innobase/log/log0log.c b/storage/innobase/log/log0log.c
 --- a/storage/innobase/log/log0log.c
 +++ b/storage/innobase/log/log0log.c
 @@ -538,7 +538,9 @@
@@ -718,7 +805,6 @@
  
  	if (srv_fast_shutdown == 2) {
  		/* In this fastest shutdown we do not flush the buffer pool:
-diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
 --- a/storage/innobase/log/log0recv.c
 +++ b/storage/innobase/log/log0recv.c
 @@ -35,19 +35,19 @@
@@ -861,7 +947,6 @@
  }
  
  /**********************************************************
-diff -ruN a/storage/innobase/mem/mem0dbg.c b/storage/innobase/mem/mem0dbg.c
 --- a/storage/innobase/mem/mem0dbg.c
 +++ b/storage/innobase/mem/mem0dbg.c
 @@ -133,6 +133,14 @@
@@ -879,7 +964,6 @@
  	mem_comm_pool = mem_pool_create(size);
  }
  
-diff -ruN a/storage/innobase/mem/mem0mem.c b/storage/innobase/mem/mem0mem.c
 --- a/storage/innobase/mem/mem0mem.c
 +++ b/storage/innobase/mem/mem0mem.c
 @@ -472,6 +472,7 @@
@@ -914,7 +998,6 @@
  
  	if (init_block) {
  		/* Do not have to free: do nothing */
-diff -ruN a/storage/innobase/mem/mem0pool.c b/storage/innobase/mem/mem0pool.c
 --- a/storage/innobase/mem/mem0pool.c
 +++ b/storage/innobase/mem/mem0pool.c
 @@ -11,6 +11,7 @@
@@ -957,7 +1040,6 @@
  	/* It may be that the area was really allocated from the OS with
  	regular malloc: check if ptr points within our memory pool */
  
-diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
 --- a/storage/innobase/os/os0file.c
 +++ b/storage/innobase/os/os0file.c
 @@ -466,7 +466,7 @@
@@ -1058,7 +1140,6 @@
  
  	array->n_reserved++;
  
-diff -ruN a/storage/innobase/os/os0thread.c b/storage/innobase/os/os0thread.c
 --- a/storage/innobase/os/os0thread.c
 +++ b/storage/innobase/os/os0thread.c
 @@ -273,12 +273,17 @@
@@ -1079,7 +1160,6 @@
  #endif
  }
  
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
 --- a/storage/innobase/srv/srv0srv.c
 +++ b/storage/innobase/srv/srv0srv.c
 @@ -94,6 +94,8 @@
@@ -1118,7 +1198,6 @@
  	os_sync_init();
  	sync_init();
  	mem_init(srv_mem_pool_size);
-diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
 --- a/storage/innobase/srv/srv0start.c
 +++ b/storage/innobase/srv/srv0start.c
 @@ -61,6 +61,8 @@
@@ -1231,7 +1310,6 @@
  	srv_file_per_table = srv_file_per_table_original_value;
  
  	return((int) DB_SUCCESS);
-diff -ruN a/storage/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c
 --- a/storage/innobase/trx/trx0purge.c
 +++ b/storage/innobase/trx/trx0purge.c
 @@ -1024,6 +1024,9 @@
@@ -1244,7 +1322,6 @@
  	mutex_enter(&(purge_sys->mutex));
  
  	if (purge_sys->trx->n_active_thrs > 0) {
-diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
 --- a/storage/innobase/trx/trx0trx.c
 +++ b/storage/innobase/trx/trx0trx.c
 @@ -478,8 +478,8 @@
@@ -1270,7 +1347,6 @@
  						} else {
  							fprintf(stderr,
  								"InnoDB: Since"
-diff -ruN a/storage/innobase/ut/ut0mem.c b/storage/innobase/ut/ut0mem.c
 --- a/storage/innobase/ut/ut0mem.c
 +++ b/storage/innobase/ut/ut0mem.c
 @@ -15,6 +15,7 @@
 
=== modified file 'patches/innodb55.patch'
--- patches/innodb55.patch	2011-06-26 03:06:10 +0000
+++ patches/innodb55.patch	2011-09-15 04:23:22 +0000
@@ -1,4 +1,3 @@
-diff -ruN a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c
 --- a/storage/innobase/btr/btr0btr.c
 +++ b/storage/innobase/btr/btr0btr.c
 @@ -120,7 +120,7 @@
@@ -19,7 +18,6 @@
  buf_block_t*
  btr_node_ptr_get_child(
  /*===================*/
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
 @@ -517,7 +517,7 @@
@@ -51,7 +49,6 @@
  			ibuf_merge_or_delete_for_page(
  				(buf_block_t*) bpage, bpage->space,
  				bpage->offset, buf_page_get_zip_size(bpage),
-diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
 --- a/storage/innobase/buf/buf0rea.c
 +++ b/storage/innobase/buf/buf0rea.c
 @@ -122,6 +122,45 @@
@@ -151,7 +148,6 @@
  		return;
  	}
  
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
 --- a/storage/innobase/fil/fil0fil.c
 +++ b/storage/innobase/fil/fil0fil.c
 @@ -40,6 +40,8 @@
@@ -190,7 +186,7 @@
  fil_node_open_file(
  /*===============*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -696,7 +698,14 @@
+@@ -696,7 +698,17 @@
  			OS_FILE_READ_ONLY, &success);
  		if (!success) {
  			/* The following call prints an error message */
@@ -199,14 +195,36 @@
 +			{
 +				ut_print_timestamp(stderr);
 +				fprintf(stderr,
-+					" InnoDB: Warning: cannot open %s\n",
++					" InnoDB: Warning: cannot open %s\n"
++					"InnoDB: this can happen if the table "
++					"was removed or renamed during an \n"
++					"InnoDB: xtrabackup run and is not dangerous.\n",
 +					node->name);
 +				return(OS_FILE_NOT_FOUND);
 +			}
  
  			ut_print_timestamp(stderr);
  
-@@ -786,8 +795,8 @@
+@@ -757,12 +769,15 @@
+ 
+ 		if (UNIV_UNLIKELY(space_id != space->id)) {
+ 			fprintf(stderr,
+-				"InnoDB: Error: tablespace id is %lu"
++				"InnoDB: Warning: tablespace id is %lu"
+ 				" in the data dictionary\n"
+-				"InnoDB: but in file %s it is %lu!\n",
++				"InnoDB: but in file %s it is %lu!\n"
++				"InnoDB: this can happen if the table metadata "
++				"was modified during an xtrabackup run\n"
++				"InnoDB: and is not dangerous.\n",
+ 				space->id, node->name, space_id);
+ 
+-			ut_error;
++			return(OS_FILE_NOT_FOUND);
+ 		}
+ 
+ 		if (UNIV_UNLIKELY(space_id == ULINT_UNDEFINED
+@@ -786,8 +801,8 @@
  		}
  
  		if (size_bytes >= 1024 * 1024) {
@@ -217,7 +235,7 @@
  		}
  
  		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
-@@ -838,6 +847,8 @@
+@@ -838,6 +853,8 @@
  		/* Put the node to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
@@ -226,7 +244,7 @@
  }
  
  /**********************************************************************//**
-@@ -1463,7 +1474,12 @@
+@@ -1463,7 +1480,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -240,7 +258,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1515,7 +1531,12 @@
+@@ -1515,7 +1537,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -272,7 +290,7 @@
  			}
  		}
  
-@@ -2343,7 +2364,7 @@
+@@ -2343,7 +2370,7 @@
  	}
  
  	if (success) {
@@ -281,7 +299,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 +2665,7 @@
+@@ -2644,7 +2671,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
@@ -290,7 +308,7 @@
  	if (success) {
  		mtr_t		mtr;
  
-@@ -2835,7 +2856,7 @@
+@@ -2835,7 +2862,7 @@
  
  	fil_node_create(path, size, space_id, FALSE);
  
@@ -299,7 +317,7 @@
  	{
  		mtr_t		mtr;
  
-@@ -3090,19 +3111,97 @@
+@@ -3090,19 +3117,97 @@
  		      "InnoDB: open the tablespace file ", stderr);
  		ut_print_filename(stderr, filepath);
  		fputs("!\n"
@@ -407,7 +425,7 @@
  		return(FALSE);
  	}
  
-@@ -3334,7 +3433,7 @@
+@@ -3334,7 +3439,7 @@
  	cannot be ok. */
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
@@ -416,7 +434,7 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3475,7 +3574,7 @@
+@@ -3475,7 +3580,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 */
@@ -425,7 +443,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -3774,15 +3873,97 @@
+@@ -3774,15 +3879,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -531,7 +549,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4171,7 +4352,7 @@
+@@ -4171,7 +4358,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -540,7 +558,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4191,10 +4372,13 @@
+@@ -4191,10 +4378,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -555,7 +573,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4207,6 +4391,8 @@
+@@ -4207,6 +4397,8 @@
  	}
  
  	node->n_pending++;
@@ -592,7 +610,6 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
-diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
 @@ -1160,6 +1160,9 @@
@@ -630,7 +647,6 @@
  	while (sum_pages < n_pages) {
  		n_bytes = ibuf_contract_ext(&n_pag2, sync);
  
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
 @@ -216,6 +216,10 @@
@@ -644,7 +660,6 @@
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
-diff -ruN a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h
 --- a/storage/innobase/include/srv0start.h
 +++ b/storage/innobase/include/srv0start.h
 @@ -91,6 +91,8 @@
@@ -656,7 +671,6 @@
  #ifdef HAVE_DARWIN_THREADS
  /** TRUE if the F_FULLFSYNC option is available */
  extern	ibool	srv_have_fullfsync;
-diff -ruN a/storage/innobase/log/log0log.c b/storage/innobase/log/log0log.c
 --- a/storage/innobase/log/log0log.c
 +++ b/storage/innobase/log/log0log.c
 @@ -576,7 +576,9 @@
@@ -703,7 +717,6 @@
  
  	if (srv_fast_shutdown == 2) {
  		/* In this fastest shutdown we do not flush the buffer pool:
-diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
 --- a/storage/innobase/log/log0recv.c
 +++ b/storage/innobase/log/log0recv.c
 @@ -42,27 +42,27 @@
@@ -855,7 +868,6 @@
  	trx_rollback_or_clean_recovered(FALSE);
  }
  
-diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
 --- a/storage/innobase/os/os0file.c
 +++ b/storage/innobase/os/os0file.c
 @@ -656,7 +656,7 @@
@@ -911,7 +923,6 @@
  	ret = os_file_pwrite(file, buf, n, offset, offset_high);
  
  	if ((ulint)ret == n) {
-diff -ruN a/storage/innobase/os/os0thread.c b/storage/innobase/os/os0thread.c
 --- a/storage/innobase/os/os0thread.c
 +++ b/storage/innobase/os/os0thread.c
 @@ -266,12 +266,17 @@
@@ -932,7 +943,6 @@
  #endif
  }
  
-diff -ruN a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c
 --- a/storage/innobase/row/row0merge.c
 +++ b/storage/innobase/row/row0merge.c
 @@ -459,7 +459,9 @@
@@ -960,7 +970,7 @@
  				mem_heap_free(heap);
  				return(DB_DUPLICATE_KEY);
  			}
-@@ -2628,7 +2634,9 @@
+@@ -2628,7 +2632,9 @@
  
  	/* Reset the MySQL row buffer that is used when reporting
  	duplicate keys. */
@@ -971,7 +981,6 @@
  
  	/* Read clustered index of the table and create files for
  	secondary index entries for merge sort */
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
 --- a/storage/innobase/srv/srv0srv.c
 +++ b/storage/innobase/srv/srv0srv.c
 @@ -401,6 +401,9 @@
@@ -1018,7 +1027,6 @@
  	}
  
  	if (trx->was_chosen_as_deadlock_victim) {
-diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
 --- a/storage/innobase/srv/srv0start.c
 +++ b/storage/innobase/srv/srv0start.c
 @@ -94,6 +94,8 @@
@@ -1102,7 +1110,6 @@
  	srv_file_per_table = srv_file_per_table_original_value;
  
  	srv_was_started = TRUE;
-diff -ruN a/storage/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c
 --- a/storage/innobase/trx/trx0purge.c
 +++ b/storage/innobase/trx/trx0purge.c
 @@ -1100,6 +1100,9 @@
@@ -1115,7 +1122,6 @@
  	mutex_enter(&(purge_sys->mutex));
  
  	if (purge_sys->trx->n_active_thrs > 0) {
-diff -ruN a/storage/innobase/trx/trx0rseg.c b/storage/innobase/trx/trx0rseg.c
 --- a/storage/innobase/trx/trx0rseg.c
 +++ b/storage/innobase/trx/trx0rseg.c
 @@ -140,9 +140,11 @@
@@ -1130,7 +1136,6 @@
  
  	undo = UT_LIST_GET_FIRST(rseg->update_undo_cached);
  
-diff -ruN a/storage/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c
 --- a/storage/innobase/trx/trx0sys.c
 +++ b/storage/innobase/trx/trx0sys.c
 @@ -1641,10 +1641,12 @@
@@ -1146,7 +1151,6 @@
  
  	mem_free(trx_sys);
  
-diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
 --- a/storage/innobase/trx/trx0trx.c
 +++ b/storage/innobase/trx/trx0trx.c
 @@ -469,8 +469,8 @@
 
=== modified file 'patches/xtradb51.patch'
--- patches/xtradb51.patch	2011-06-26 03:06:10 +0000
+++ patches/xtradb51.patch	2011-09-15 04:23:22 +0000
@@ -1,4 +1,3 @@
-diff -ruN a/storage/innodb_plugin/btr/btr0btr.c b/storage/innodb_plugin/btr/btr0btr.c
 --- a/storage/innodb_plugin/btr/btr0btr.c
 +++ b/storage/innodb_plugin/btr/btr0btr.c
 @@ -120,7 +120,7 @@
@@ -19,7 +18,6 @@
  buf_block_t*
  btr_node_ptr_get_child(
  /*===================*/
-diff -ruN a/storage/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
 --- a/storage/innodb_plugin/buf/buf0buf.c
 +++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -440,7 +440,7 @@
@@ -51,7 +49,6 @@
  			ibuf_merge_or_delete_for_page(
  				/* Delete possible entries, if bpage is_corrupt */
  				(srv_pass_corrupt_table && bpage->is_corrupt) ? NULL :
-diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
 --- a/storage/innodb_plugin/fil/fil0fil.c
 +++ b/storage/innodb_plugin/fil/fil0fil.c
 @@ -294,7 +294,7 @@
@@ -81,7 +78,7 @@
  fil_node_open_file(
  /*===============*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -664,7 +664,14 @@
+@@ -664,7 +664,17 @@
  			node->name, OS_FILE_OPEN, OS_FILE_READ_ONLY, &success);
  		if (!success) {
  			/* The following call prints an error message */
@@ -90,14 +87,36 @@
 +			{
 +				ut_print_timestamp(stderr);
 +				fprintf(stderr,
-+					" InnoDB: Warning: cannot open %s\n",
++					" InnoDB: Warning: cannot open %s\n"
++					"InnoDB: this can happen if the table "
++					"was removed or renamed during an \n"
++					"InnoDB: xtrabackup run and is not dangerous.\n",
 +					node->name);
 +				return(OS_FILE_NOT_FOUND);
 +			}
  
  			ut_print_timestamp(stderr);
  
-@@ -754,8 +761,8 @@
+@@ -725,12 +735,14 @@
+ 
+ 		if (UNIV_UNLIKELY(space_id != space->id)) {
+ 			fprintf(stderr,
+-				"InnoDB: Error: tablespace id is %lu"
++				"InnoDB: Warning: tablespace id is %lu"
+ 				" in the data dictionary\n"
+-				"InnoDB: but in file %s it is %lu!\n",
++				"InnoDB: but in file %s it is %lu!\n"
++				"InnoDB: this can happen if the table metadata "
++				"was modified during an xtrabackup run\n"
++				"InnoDB: and is not dangerous.\n",
+ 				space->id, node->name, space_id);
+-
+-			ut_error;
++			return(OS_FILE_NOT_FOUND);
+ 		}
+ 
+ 		if (UNIV_UNLIKELY(space_id == ULINT_UNDEFINED
+@@ -754,8 +766,8 @@
  		}
  
  		if (size_bytes >= 1024 * 1024) {
@@ -108,7 +127,7 @@
  		}
  
  		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
-@@ -800,6 +807,8 @@
+@@ -800,6 +812,8 @@
  		/* Put the node to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
@@ -117,7 +136,7 @@
  }
  
  /**********************************************************************//**
-@@ -1428,7 +1437,12 @@
+@@ -1428,7 +1442,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -131,7 +150,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1480,7 +1494,12 @@
+@@ -1480,7 +1499,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -163,7 +182,7 @@
  			}
  		}
  
-@@ -2316,7 +2335,7 @@
+@@ -2316,7 +2340,7 @@
  	}
  
  	if (success) {
@@ -172,7 +191,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 +2636,7 @@
+@@ -2617,7 +2641,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
@@ -181,7 +200,7 @@
  	if (success) {
  		mtr_t		mtr;
  
-@@ -2807,7 +2826,7 @@
+@@ -2807,7 +2831,7 @@
  
  	fil_node_create(path, size, space_id, FALSE);
  
@@ -190,7 +209,7 @@
  	{
  		mtr_t		mtr;
  
-@@ -3060,19 +3079,97 @@
+@@ -3060,19 +3084,97 @@
  		      "InnoDB: open the tablespace file ", stderr);
  		ut_print_filename(stderr, filepath);
  		fputs("!\n"
@@ -298,7 +317,7 @@
  		return(FALSE);
  	}
  
-@@ -3777,7 +3874,7 @@
+@@ -3777,7 +3879,7 @@
  	cannot be ok. */
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
@@ -307,7 +326,7 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3918,7 +4015,7 @@
+@@ -3918,7 +4020,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 */
@@ -316,7 +335,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4217,15 +4314,97 @@
+@@ -4217,15 +4319,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -422,7 +441,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4614,7 +4793,7 @@
+@@ -4614,7 +4798,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -431,7 +450,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4634,10 +4813,13 @@
+@@ -4634,10 +4818,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -446,7 +465,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4650,6 +4832,8 @@
+@@ -4650,6 +4837,8 @@
  	}
  
  	node->n_pending++;
@@ -483,7 +502,6 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -343,12 +343,6 @@
@@ -525,7 +543,6 @@
    MYSQL_SYSVAR(enable_unsafe_group_commit),
    MYSQL_SYSVAR(expand_import),
    MYSQL_SYSVAR(extra_rsegments),
-diff -ruN a/storage/innodb_plugin/ibuf/ibuf0ibuf.c b/storage/innodb_plugin/ibuf/ibuf0ibuf.c
 --- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c
 +++ b/storage/innodb_plugin/ibuf/ibuf0ibuf.c
 @@ -1064,6 +1064,9 @@
@@ -548,7 +565,6 @@
  	while (sum_pages < n_pages) {
  		n_bytes = ibuf_contract_ext(&n_pag2, sync);
  
-diff -ruN a/storage/innodb_plugin/include/ha_prototypes.h b/storage/innodb_plugin/include/ha_prototypes.h
 --- a/storage/innodb_plugin/include/ha_prototypes.h
 +++ b/storage/innodb_plugin/include/ha_prototypes.h
 @@ -268,12 +268,4 @@
@@ -602,7 +618,6 @@
  extern long long	srv_ibuf_max_size;
  extern ulint	srv_ibuf_active_contract;
  extern ulint	srv_ibuf_accel_rate;
-diff -ruN a/storage/innodb_plugin/include/srv0start.h b/storage/innodb_plugin/include/srv0start.h
 --- a/storage/innodb_plugin/include/srv0start.h
 +++ b/storage/innodb_plugin/include/srv0start.h
 @@ -91,6 +91,8 @@
@@ -614,7 +629,6 @@
  #ifdef __NETWARE__
  void set_panic_flag_for_netware(void);
  #endif
-diff -ruN a/storage/innodb_plugin/include/trx0trx.h b/storage/innodb_plugin/include/trx0trx.h
 --- a/storage/innodb_plugin/include/trx0trx.h
 +++ b/storage/innodb_plugin/include/trx0trx.h
 @@ -497,7 +497,6 @@
@@ -625,7 +639,6 @@
  	ulint		flush_log_later;/* In 2PC, we hold the
  					prepare_commit mutex across
  					both phases. In that case, we
-diff -ruN a/storage/innodb_plugin/include/ut0byte.ic b/storage/innodb_plugin/include/ut0byte.ic
 --- a/storage/innodb_plugin/include/ut0byte.ic
 +++ b/storage/innodb_plugin/include/ut0byte.ic
 @@ -168,6 +168,16 @@
@@ -673,7 +686,6 @@
  	return(diff);
  }
  
-diff -ruN a/storage/innodb_plugin/log/log0log.c b/storage/innodb_plugin/log/log0log.c
 --- a/storage/innodb_plugin/log/log0log.c
 +++ b/storage/innodb_plugin/log/log0log.c
 @@ -1370,7 +1370,7 @@
@@ -710,7 +722,6 @@
  
  	if (srv_fast_shutdown == 2) {
  		/* In this fastest shutdown we do not flush the buffer pool:
-diff -ruN a/storage/innodb_plugin/log/log0recv.c b/storage/innodb_plugin/log/log0recv.c
 --- a/storage/innodb_plugin/log/log0recv.c
 +++ b/storage/innodb_plugin/log/log0recv.c
 @@ -42,27 +42,27 @@
@@ -836,7 +847,6 @@
  	trx_rollback_or_clean_recovered(FALSE);
  }
  
-diff -ruN a/storage/innodb_plugin/os/os0file.c b/storage/innodb_plugin/os/os0file.c
 --- a/storage/innodb_plugin/os/os0file.c
 +++ b/storage/innodb_plugin/os/os0file.c
 @@ -554,7 +554,7 @@
@@ -892,7 +902,6 @@
  	ret = os_file_pwrite(file, buf, n, offset, offset_high);
  
  	if ((ulint)ret == n) {
-diff -ruN a/storage/innodb_plugin/os/os0thread.c b/storage/innodb_plugin/os/os0thread.c
 --- a/storage/innodb_plugin/os/os0thread.c
 +++ b/storage/innodb_plugin/os/os0thread.c
 @@ -287,12 +287,17 @@
@@ -913,7 +922,6 @@
  #endif
  }
  
-diff -ruN a/storage/innodb_plugin/row/row0merge.c b/storage/innodb_plugin/row/row0merge.c
 --- a/storage/innodb_plugin/row/row0merge.c
 +++ b/storage/innodb_plugin/row/row0merge.c
 @@ -453,7 +453,9 @@
@@ -952,7 +960,6 @@
  
  	/* Read clustered index of the table and create files for
  	secondary index entries for merge sort */
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -402,6 +402,10 @@
@@ -991,7 +998,6 @@
  }
  
  /*********************************************************************//**
-diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
 --- a/storage/innodb_plugin/srv/srv0start.c
 +++ b/storage/innodb_plugin/srv/srv0start.c
 @@ -94,6 +94,8 @@
@@ -1067,7 +1073,6 @@
  	srv_file_per_table = srv_file_per_table_original_value;
  
  	srv_was_started = TRUE;
-diff -ruN a/storage/innodb_plugin/trx/trx0purge.c b/storage/innodb_plugin/trx/trx0purge.c
 --- a/storage/innodb_plugin/trx/trx0purge.c
 +++ b/storage/innodb_plugin/trx/trx0purge.c
 @@ -1113,6 +1113,9 @@
@@ -1080,7 +1085,6 @@
  	mutex_enter(&(purge_sys->mutex));
  
  	if (purge_sys->trx->n_active_thrs > 0) {
-diff -ruN a/storage/innodb_plugin/trx/trx0rseg.c b/storage/innodb_plugin/trx/trx0rseg.c
 --- a/storage/innodb_plugin/trx/trx0rseg.c
 +++ b/storage/innodb_plugin/trx/trx0rseg.c
 @@ -143,9 +143,11 @@
@@ -1095,7 +1099,6 @@
  
  	undo = UT_LIST_GET_FIRST(rseg->update_undo_cached);
  
-diff -ruN a/storage/innodb_plugin/trx/trx0sys.c b/storage/innodb_plugin/trx/trx0sys.c
 --- a/storage/innodb_plugin/trx/trx0sys.c
 +++ b/storage/innodb_plugin/trx/trx0sys.c
 @@ -1931,10 +1931,12 @@
@@ -1111,7 +1114,6 @@
  
  	mem_free(trx_sys);
  
-diff -ruN a/storage/innodb_plugin/trx/trx0trx.c b/storage/innodb_plugin/trx/trx0trx.c
 --- a/storage/innodb_plugin/trx/trx0trx.c
 +++ b/storage/innodb_plugin/trx/trx0trx.c
 @@ -109,8 +109,6 @@
 
=== modified file 'patches/xtradb55.patch'
--- patches/xtradb55.patch	2011-06-26 03:06:10 +0000
+++ patches/xtradb55.patch	2011-09-15 04:23:22 +0000
@@ -1,4 +1,3 @@
-diff -ruN a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c
 --- a/storage/innobase/btr/btr0btr.c
 +++ b/storage/innobase/btr/btr0btr.c
 @@ -120,7 +120,7 @@
@@ -19,7 +18,6 @@
  buf_block_t*
  btr_node_ptr_get_child(
  /*===================*/
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
 @@ -609,7 +609,7 @@
@@ -79,7 +77,6 @@
  			ibuf_merge_or_delete_for_page(
  				/* Delete possible entries, if bpage is_corrupt */
  				(srv_pass_corrupt_table && bpage->is_corrupt) ? NULL :
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
 --- a/storage/innobase/fil/fil0fil.c
 +++ b/storage/innobase/fil/fil0fil.c
 @@ -305,7 +305,7 @@
@@ -109,7 +106,7 @@
  fil_node_open_file(
  /*===============*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -704,7 +704,14 @@
+@@ -704,7 +704,17 @@
  			OS_FILE_READ_ONLY, &success);
  		if (!success) {
  			/* The following call prints an error message */
@@ -118,14 +115,36 @@
 +			{
 +				ut_print_timestamp(stderr);
 +				fprintf(stderr,
-+					" InnoDB: Warning: cannot open %s\n",
++					" InnoDB: Warning: cannot open %s\n"
++					"InnoDB: this can happen if the table "
++					"was removed or renamed during an \n"
++					"InnoDB: xtrabackup run and is not dangerous.\n",
 +					node->name);
 +				return(OS_FILE_NOT_FOUND);
 +			}
  
  			ut_print_timestamp(stderr);
  
-@@ -794,8 +801,8 @@
+@@ -765,12 +775,15 @@
+ 
+ 		if (UNIV_UNLIKELY(space_id != space->id)) {
+ 			fprintf(stderr,
+-				"InnoDB: Error: tablespace id is %lu"
++				"InnoDB: Warning: tablespace id is %lu"
+ 				" in the data dictionary\n"
+-				"InnoDB: but in file %s it is %lu!\n",
++				"InnoDB: but in file %s it is %lu!\n"
++				"InnoDB: this can happen if the table metadata "
++				"was modified during an xtrabackup run\n"
++				"InnoDB: and is not dangerous.\n",
+ 				space->id, node->name, space_id);
+ 
+-			ut_error;
++			return(OS_FILE_NOT_FOUND);
+ 		}
+ 
+ 		if (UNIV_UNLIKELY(space_id == ULINT_UNDEFINED
+@@ -794,8 +807,8 @@
  		}
  
  		if (size_bytes >= 1024 * 1024) {
@@ -136,7 +155,7 @@
  		}
  
  		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
-@@ -846,6 +853,8 @@
+@@ -846,6 +859,8 @@
  		/* Put the node to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
@@ -145,7 +164,7 @@
  }
  
  /**********************************************************************//**
-@@ -1474,7 +1483,12 @@
+@@ -1474,7 +1489,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -159,7 +178,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -1526,7 +1540,12 @@
+@@ -1526,7 +1546,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -191,7 +210,7 @@
  			}
  		}
  
-@@ -2369,7 +2388,7 @@
+@@ -2369,7 +2394,7 @@
  	}
  
  	if (success) {
@@ -200,7 +219,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 +2689,7 @@
+@@ -2670,7 +2695,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
@@ -209,7 +228,7 @@
  	if (success) {
  		mtr_t		mtr;
  
-@@ -2861,7 +2880,7 @@
+@@ -2861,7 +2886,7 @@
  
  	fil_node_create(path, size, space_id, FALSE);
  
@@ -218,7 +237,7 @@
  	{
  		mtr_t		mtr;
  
-@@ -3116,19 +3135,97 @@
+@@ -3116,19 +3141,97 @@
  		      "InnoDB: open the tablespace file ", stderr);
  		ut_print_filename(stderr, filepath);
  		fputs("!\n"
@@ -326,7 +345,7 @@
  		return(FALSE);
  	}
  
-@@ -3836,7 +3933,7 @@
+@@ -3836,7 +3939,7 @@
  	cannot be ok. */
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
@@ -335,7 +354,7 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3977,7 +4074,7 @@
+@@ -3977,7 +4080,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 */
@@ -344,7 +363,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4276,15 +4373,97 @@
+@@ -4276,15 +4379,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -450,7 +469,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4683,7 +4862,7 @@
+@@ -4683,7 +4868,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -459,7 +478,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4703,10 +4882,13 @@
+@@ -4703,10 +4888,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -474,7 +493,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4719,6 +4901,8 @@
+@@ -4719,6 +4907,8 @@
  	}
  
  	node->n_pending++;
@@ -511,7 +530,6 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
 @@ -460,13 +460,6 @@
@@ -597,7 +615,6 @@
    MYSQL_SYSVAR(flush_method),
    MYSQL_SYSVAR(force_recovery),
    MYSQL_SYSVAR(locks_unsafe_for_binlog),
-diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
 @@ -1202,6 +1202,9 @@
@@ -635,7 +652,6 @@
  	while (sum_pages < n_pages) {
  		n_bytes = ibuf_contract_ext(&n_pag2, sync);
  
-diff -ruN a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h
 --- a/storage/innobase/include/ha_prototypes.h
 +++ b/storage/innobase/include/ha_prototypes.h
 @@ -275,12 +275,5 @@
@@ -651,7 +667,6 @@
 -	void*	thd);
  
  #endif
-diff -ruN a/storage/innobase/include/log0recv.h b/storage/innobase/include/log0recv.h
 --- a/storage/innobase/include/log0recv.h
 +++ b/storage/innobase/include/log0recv.h
 @@ -444,7 +444,7 @@
@@ -663,7 +678,6 @@
  	time_t		stats_recv_start_time;
  	ulint		stats_recv_turns;
  
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
 @@ -148,8 +148,7 @@
@@ -687,7 +701,6 @@
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
-diff -ruN a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h
 --- a/storage/innobase/include/srv0start.h
 +++ b/storage/innobase/include/srv0start.h
 @@ -91,6 +91,8 @@
@@ -699,7 +712,6 @@
  #ifdef HAVE_DARWIN_THREADS
  /** TRUE if the F_FULLFSYNC option is available */
  extern	ibool	srv_have_fullfsync;
-diff -ruN a/storage/innobase/log/log0log.c b/storage/innobase/log/log0log.c
 --- a/storage/innobase/log/log0log.c
 +++ b/storage/innobase/log/log0log.c
 @@ -1154,7 +1154,7 @@
@@ -745,7 +757,6 @@
  
  	if (srv_fast_shutdown == 2) {
  		/* In this fastest shutdown we do not flush the buffer pool:
-diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
 --- a/storage/innobase/log/log0recv.c
 +++ b/storage/innobase/log/log0recv.c
 @@ -42,27 +42,27 @@
@@ -871,7 +882,6 @@
  	trx_rollback_or_clean_recovered(FALSE);
  }
  
-diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
 --- a/storage/innobase/os/os0file.c
 +++ b/storage/innobase/os/os0file.c
 @@ -660,7 +660,7 @@
@@ -945,7 +955,6 @@
  	ret = os_file_pwrite(file, buf, n, offset, offset_high);
  
  	if ((ulint)ret == n) {
-diff -ruN a/storage/innobase/os/os0thread.c b/storage/innobase/os/os0thread.c
 --- a/storage/innobase/os/os0thread.c
 +++ b/storage/innobase/os/os0thread.c
 @@ -266,12 +266,17 @@
@@ -966,7 +975,6 @@
  #endif
  }
  
-diff -ruN a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c
 --- a/storage/innobase/row/row0merge.c
 +++ b/storage/innobase/row/row0merge.c
 @@ -459,7 +459,9 @@
@@ -1005,7 +1013,6 @@
  
  	/* Read clustered index of the table and create files for
  	secondary index entries for merge sort */
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
 --- a/storage/innobase/srv/srv0srv.c
 +++ b/storage/innobase/srv/srv0srv.c
 @@ -197,8 +197,7 @@
@@ -1063,7 +1070,6 @@
  	}
  
  	if (trx->was_chosen_as_deadlock_victim) {
-diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
 --- a/storage/innobase/srv/srv0start.c
 +++ b/storage/innobase/srv/srv0start.c
 @@ -94,6 +94,8 @@
@@ -1138,7 +1144,6 @@
  	srv_file_per_table = srv_file_per_table_original_value;
  
  	srv_was_started = TRUE;
-diff -ruN a/storage/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c
 --- a/storage/innobase/trx/trx0purge.c
 +++ b/storage/innobase/trx/trx0purge.c
 @@ -1100,6 +1100,9 @@
@@ -1151,7 +1156,6 @@
  	mutex_enter(&(purge_sys->mutex));
  
  	if (purge_sys->trx->n_active_thrs > 0) {
-diff -ruN a/storage/innobase/trx/trx0rseg.c b/storage/innobase/trx/trx0rseg.c
 --- a/storage/innobase/trx/trx0rseg.c
 +++ b/storage/innobase/trx/trx0rseg.c
 @@ -140,9 +140,11 @@
@@ -1166,7 +1170,6 @@
  
  	undo = UT_LIST_GET_FIRST(rseg->update_undo_cached);
  
-diff -ruN a/storage/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c
 --- a/storage/innobase/trx/trx0sys.c
 +++ b/storage/innobase/trx/trx0sys.c
 @@ -1938,10 +1938,12 @@
@@ -1182,7 +1185,6 @@
  
  	mem_free(trx_sys);
  
-diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
 --- a/storage/innobase/trx/trx0trx.c
 +++ b/storage/innobase/trx/trx0trx.c
 @@ -505,8 +505,8 @@
 
=== modified file 'test/inc/common.sh'
--- test/inc/common.sh	2011-06-29 05:38:02 +0000
+++ test/inc/common.sh	2011-09-15 04:23:22 +0000
@@ -230,3 +230,12 @@
 	let "race_cycle_cnt=race_cycle_cnt+1"
   done
 }
+
+########################################################################
+# Prints checksum for a given table.
+# Expects 2 arguments: $1 is the DB name and $2 is the table to checksum
+########################################################################
+function checksum_table()
+{
+    $MYSQL $MYSQL_ARGS -Ns -e "CHECKSUM TABLE $2" $1 | awk {'print $2'}
+}
 \ No newline at end of file
 
=== added file 'test/t/bug722638.sh'
--- test/t/bug722638.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug722638.sh	2011-09-15 04:23:22 +0000
@@ -0,0 +1,119 @@
+########################################################################
+# Bug #722638: xtrabackup: taking backup while tables are droped and 
+#              created breaks backup
+########################################################################
+
+if ! `$XB_BIN --help | grep debug-sync > /dev/null`; then
+    echo "Requires --debug-sync support" > $SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+. inc/common.sh
+
+init
+run_mysqld --innodb_file_per_table
+
+run_cmd $MYSQL $MYSQL_ARGS test <<EOF
+
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1), (2), (3);
+
+CREATE TABLE t2(a INT) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1), (2), (3);
+
+CREATE TABLE t3(a INT) ENGINE=InnoDB;
+INSERT INTO t3 VALUES (1), (2), (3);
+
+CREATE TABLE t4_old(a INT) ENGINE=InnoDB;
+INSERT INTO t4_old VALUES (1), (2), (3);
+
+EOF
+
+mkdir -p $topdir/backup
+
+# Backup
+xtrabackup --datadir=$mysql_datadir --backup --target-dir=$topdir/backup \
+    --debug-sync="data_copy_thread_func" &
+
+job_pid=$!
+
+pid_file=$topdir/backup/xtrabackup_debug_sync
+
+# Wait for xtrabackup to suspend
+i=0
+while [ ! -r "$pid_file" ]
+do
+    sleep 1
+    i=$((i+1))
+    echo "Waited $i seconds for $pid_file to be created"
+done
+
+xb_pid=`cat $pid_file`
+
+# Modify the original tables, then change spaces ids by running DDL
+
+run_cmd $MYSQL $MYSQL_ARGS test <<EOF
+
+INSERT INTO t1 VALUES (4), (5), (6);
+DROP TABLE t1;
+CREATE TABLE t1(a CHAR(1)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES ("1"), ("2"), ("3");
+
+INSERT INTO t2 VALUES (4), (5), (6);
+ALTER TABLE t2 MODIFY a BIGINT;
+INSERT INTO t2 VALUES (7), (8), (9);
+
+INSERT INTO t3 VALUES (4), (5), (6);
+TRUNCATE t3;
+INSERT INTO t3 VALUES (7), (8), (9);
+
+INSERT INTO t4_old VALUES (4), (5), (6);
+ALTER TABLE t4_old RENAME t4;
+INSERT INTO t4 VALUES (7), (8), (9);
+
+EOF
+
+# Calculate checksums
+checksum_t1=`checksum_table test t1`
+checksum_t2=`checksum_table test t2`
+checksum_t3=`checksum_table test t3`
+checksum_t4=`checksum_table test t4`
+
+# Resume xtrabackup
+vlog "Resuming xtrabackup"
+kill -SIGCONT $xb_pid
+
+run_cmd wait $job_pid
+
+# Prepare
+xtrabackup --datadir=$mysql_datadir --prepare --target-dir=$topdir/backup
+
+stop_mysqld
+
+# Restore
+rm -rf $mysql_datadir/ibdata1 $mysql_datadir/ib_logfile* \
+    $mysql_datadir/test/*.ibd
+cp -r $topdir/backup/* $mysql_datadir
+
+run_mysqld --innodb_file_per_table
+
+# Verify checksums
+checksum_t1_new=`checksum_table test t1`
+checksum_t2_new=`checksum_table test t2`
+checksum_t3_new=`checksum_table test t3`
+checksum_t4_new=`checksum_table test t4`
+vlog "Checksums (old/new):"
+vlog "t1: $checksum_t1/$checksum_t1_new"
+vlog "t2: $checksum_t2/$checksum_t2_new"
+vlog "t3: $checksum_t3/$checksum_t3_new"
+vlog "t4: $checksum_t4/$checksum_t4_new"
+
+if [ "$checksum_t1" = "$checksum_t1_new" -a \
+     "$checksum_t2" = "$checksum_t2_new" -a \
+     "$checksum_t3" = "$checksum_t3_new" -a \
+     "$checksum_t4" = "$checksum_t4_new" ]; then
+    exit 0
+fi
+
+vlog "Checksums do not match"
+exit -1
 
=== modified file 'test/t/bug723097.sh'
--- test/t/bug723097.sh	2011-06-12 10:16:51 +0000
+++ test/t/bug723097.sh	2011-09-15 04:23:22 +0000
@@ -7,7 +7,7 @@
 run_cmd ${MYSQL} ${MYSQL_ARGS} test < inc/bug723097.sql
 
 vlog "Saving checksum"
-checksum_a=`${MYSQL} ${MYSQL_ARGS} -Ns -e "CHECKSUM TABLE messages" test | awk {'print $2'}`
+checksum_a=`checksum_table test messages`
 vlog "Checksum before is $checksum_a"
 
 vlog "Creating backup directory"
@@ -24,7 +24,7 @@
 cp -r * $mysql_datadir/test
 cd -
 run_mysqld --innodb_file_per_table
-checksum_b=`${MYSQL} ${MYSQL_ARGS} -Ns -e "CHECKSUM TABLE messages" test | awk {'print $2'}`
+checksum_b=`checksum_table test messages`
 vlog "Checksum after is $checksum_b"
 
 if [ $checksum_a -eq $checksum_b ]
 
=== modified file 'test/t/bug810269.sh'
--- test/t/bug810269.sh	2011-08-10 01:26:20 +0000
+++ test/t/bug810269.sh	2011-09-15 04:23:22 +0000
@@ -46,8 +46,7 @@
 
 vlog "Initial rows added"
 
-checksum_a=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" \
-incremental_sample | awk '{print $2}'`
+checksum_a=`checksum_table incremental_sample test`
 
 vlog "Starting streaming backup"
 
@@ -71,8 +70,7 @@
 
 run_mysqld
 
-checksum_b=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" \
-incremental_sample | awk '{print $2}'`
+checksum_b=`checksum_table incremental_sample test`
 
 if [ "$checksum_a" != "$checksum_b" ]; then
     vlog "Checksums do not match"
 
=== modified file 'test/t/ib_csm_csv.sh'
--- test/t/ib_csm_csv.sh	2011-06-10 07:55:26 +0000
+++ test/t/ib_csm_csv.sh	2011-09-15 04:23:22 +0000
@@ -25,7 +25,7 @@
 vlog "Full backup done to directory $full_backup_dir"
 
 # Saving the checksum of original table
-checksum_a=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table csm;" csv | awk '{print $2}'`
+checksum_a=`checksum_table csv csm`
 vlog "Table checksum is $checksum_a"
 
 vlog "Preparing backup"
@@ -50,10 +50,10 @@
 vlog "Data restored"
 
 run_mysqld --innodb_file_per_table
-vlog "Checking checksums"
-checksum_b=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table csm" incremental_sample | awk '{print $2}'`
+checksum_b=`checksum_table csv csm`
+vlog "Checking checksums: $checksum_a/$checksum_b"
 
-if [ $checksum_a -ne $checksum_b  ]
+if [ "$checksum_a" != "$checksum_b"  ]
 then 
 	vlog "Checksums are not equal"
 	exit -1
 
=== modified file 'test/t/ib_incremental.sh'
--- test/t/ib_incremental.sh	2011-06-29 05:38:02 +0000
+++ test/t/ib_incremental.sh	2011-09-15 04:23:22 +0000
@@ -37,7 +37,7 @@
 vlog "Changes done"
 
 # Saving the checksum of original table
-checksum_a=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" incremental_sample | awk '{print $2}'`
+checksum_a=`checksum_table incremental_sample test`
 vlog "Table checksum is $checksum_a"
 
 vlog "Making incremental backup"
@@ -87,7 +87,7 @@
 run_mysqld --innodb_file_per_table
 
 vlog "Checking checksums"
-checksum_b=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" incremental_sample | awk '{print $2}'`
+checksum_b=`checksum_table incremental_sample test`
 
 if [ $checksum_a -ne $checksum_b  ]
 then 
 
=== modified file 'test/t/xb_export.sh'
--- test/t/xb_export.sh	2011-06-28 09:31:12 +0000
+++ test/t/xb_export.sh	2011-09-15 04:23:22 +0000
@@ -38,7 +38,7 @@
 done
 vlog "Initial rows added"
 
-checksum_1=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test" incremental_sample | awk '{print $2}'`
+checksum_1=`checksum_table incremental_sample test`
 rowsnum_1=`${MYSQL} ${MYSQL_ARGS} -Ns -e "select count(*) from test" incremental_sample`
 vlog "rowsnum_1 is $rowsnum_1"
 vlog "checksum_1 is $checksum_1"
@@ -74,7 +74,7 @@
 vlog "Table has been imported"
 
 vlog "Cheking checksums"
-checksum_2=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" incremental_sample | awk '{print $2}'`
+checksum_2=`checksum_table incremental_sample test`
 vlog "checksum_2 is $checksum_2"
 rowsnum_1=`${MYSQL} ${MYSQL_ARGS} -Ns -e "select count(*) from test" incremental_sample`
 vlog "rowsnum_1 is $rowsnum_1"
@@ -120,7 +120,7 @@
 run_mysqld
 
 vlog "Cheking checksums"
-checksum_3=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" incremental_sample | awk '{print $2}'`
+checksum_3=`checksum_table incremental_sample test`
 vlog "checksum_3 is $checksum_3"
 
 if [ "$checksum_3" != $checksum_2  ]
 
=== modified file 'test/t/xb_incremental.sh'
--- test/t/xb_incremental.sh	2011-06-10 07:55:26 +0000
+++ test/t/xb_incremental.sh	2011-09-15 04:23:22 +0000
@@ -47,7 +47,7 @@
 vlog "Changes done"
 
 # Saving the checksum of original table
-checksum_a=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" incremental_sample | awk '{print $2}'`
+checksum_a=`checksum_table incremental_sample test`
 
 vlog "Table checksum is $checksum_a"
 vlog "Making incremental backup"
@@ -83,7 +83,7 @@
 run_mysqld --innodb_file_per_table
 
 vlog "Checking checksums"
-checksum_b=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" incremental_sample | awk '{print $2}'`
+checksum_b=`checksum_table incremental_sample test`
 
 if [ $checksum_a -ne $checksum_b  ]
 then 
 
=== modified file 'test/t/xb_incremental_compressed.sh'
--- test/t/xb_incremental_compressed.sh	2011-06-22 17:55:52 +0000
+++ test/t/xb_incremental_compressed.sh	2011-09-15 04:23:22 +0000
@@ -103,8 +103,7 @@
   vlog "Changes done"
 
   # Saving the checksum of original table
-  checksum_a=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" \
-incremental_sample | awk '{print $2}'`
+  checksum_a=`checksum_table incremental_sample test`
 
   vlog "Table checksum is $checksum_a"
 
@@ -148,8 +147,7 @@
   run_mysqld ${mysqld_additional_args}
 
   vlog "Cheking checksums"
-  checksum_b=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" \
-incremental_sample | awk '{print $2}'`
+  checksum_b=`checksum_table incremental_sample test`
 
   if [ $checksum_a -ne $checksum_b  ]
       then 
 
=== modified file 'test/t/xb_part_range.sh'
--- test/t/xb_part_range.sh	2011-06-22 08:07:10 +0000
+++ test/t/xb_part_range.sh	2011-09-15 04:23:22 +0000
@@ -59,7 +59,7 @@
 vlog "Changes done"
 
 # Saving the checksum of original table
-checksum_a=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" test | awk '{print $2}'`
+checksum_a=`checksum_table test test`
 
 vlog "Table checksum is $checksum_a - before backup"
 
@@ -102,7 +102,7 @@
 run_mysqld
 
 vlog "Cheking checksums"
-checksum_b=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" test | awk '{print $2}'`
+checksum_b=`checksum_table test test`
 
 if [ $checksum_a -ne $checksum_b  ]
 then 
 
=== modified file 'test/t/xb_partial.sh'
--- test/t/xb_partial.sh	2011-06-10 07:55:26 +0000
+++ test/t/xb_partial.sh	2011-09-15 04:23:22 +0000
@@ -14,7 +14,7 @@
 	let "count=count+1"
 done
 vlog "Initial rows added"
-checksum_a=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" incremental_sample | awk '{print $2}'`
+checksum_a=`checksum_table incremental_sample test`
 vlog "Table checksum is $checksum_a"
 
 # Backup directory
@@ -42,7 +42,7 @@
 vlog "Data restored"
 run_mysqld --innodb_file_per_table
 vlog "Checking checksums"
-checksum_b=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" incremental_sample | awk '{print $2}'`
+checksum_b=`checksum_table incremental_sample test`
 
 if [ $checksum_a -ne $checksum_b  ]
 then 
 
=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-08-10 01:26:20 +0000
+++ xtrabackup.c	2011-09-15 04:23:22 +0000
@@ -812,6 +812,8 @@
 #define INNOBASE_WAKE_INTERVAL	32
 ulong	innobase_active_counter	= 0;
 
+static char *xtrabackup_debug_sync = NULL;
+
 /* ======== Datafiles iterator ======== */
 typedef struct {
 	fil_system_t *system;
@@ -961,7 +963,8 @@
   OPT_INNODB_OPEN_FILES,
   OPT_INNODB_SYNC_SPIN_LOOPS,
   OPT_INNODB_THREAD_CONCURRENCY,
-  OPT_INNODB_THREAD_SLEEP_DELAY
+  OPT_INNODB_THREAD_SLEEP_DELAY,
+  OPT_XTRA_DEBUG_SYNC
 };
 
 static struct my_option my_long_options[] =
@@ -1219,45 +1222,59 @@
    (G_PTR*) &innobase_doublewrite_file, (G_PTR*) &innobase_doublewrite_file,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
-/*
-  {"innodb_rollback_on_timeout", OPT_INNODB_ROLLBACK_ON_TIMEOUT,
-   "Roll back the complete transaction on lock wait timeout, for 4.x compatibility (disabled by default)",
-   (G_PTR*) &innobase_rollback_on_timeout, (G_PTR*) &innobase_rollback_on_timeout,
-   0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
-*/
-/*
-  {"innodb_status_file", OPT_INNODB_STATUS_FILE,
-   "Enable SHOW INNODB STATUS output in the innodb_status.<pid> file",
-   (G_PTR*) &innobase_create_status_file, (G_PTR*) &innobase_create_status_file,
-   0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
-*/
-/*
-  {"innodb_sync_spin_loops", OPT_INNODB_SYNC_SPIN_LOOPS,
-   "Count of spin-loop rounds in InnoDB mutexes",
-   (G_PTR*) &srv_n_spin_wait_rounds,
-   (G_PTR*) &srv_n_spin_wait_rounds,
-   0, GET_ULONG, REQUIRED_ARG, 20L, 0L, ULONG_MAX, 0, 1L, 0},
-*/
-/*
-  {"innodb_thread_concurrency", OPT_INNODB_THREAD_CONCURRENCY,
-   "Helps in performance tuning in heavily concurrent environments. "
-   "Sets the maximum number of threads allowed inside InnoDB. Value 0"
-   " will disable the thread throttling.",
-   (G_PTR*) &srv_thread_concurrency, (G_PTR*) &srv_thread_concurrency,
-   0, GET_ULONG, REQUIRED_ARG, 8, 0, 1000, 0, 1, 0},
-*/
-/*
-  {"innodb_thread_sleep_delay", OPT_INNODB_THREAD_SLEEP_DELAY,
-   "Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0"
-    " disable a sleep",
-   (G_PTR*) &srv_thread_sleep_delay,
-   (G_PTR*) &srv_thread_sleep_delay,
-   0, GET_ULONG, REQUIRED_ARG, 10000L, 0L, ULONG_MAX, 0, 1L, 0},
-*/
+
+#ifndef __WIN__
+  {"debug-sync", OPT_XTRA_DEBUG_SYNC,
+   "Debug sync point. This is only used by the xtrabackup test suite",
+   (G_PTR*) &xtrabackup_debug_sync,
+   (G_PTR*) &xtrabackup_debug_sync,
+   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#endif
 
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
+UNIV_INLINE
+void
+debug_sync_point(const char *name)
+{
+#ifndef __WIN__
+	FILE	*fp;
+	pid_t	pid;
+	char	pid_path[FN_REFLEN];
+
+	if (xtrabackup_debug_sync == NULL) {
+		return;
+	}
+
+	if (strcmp(xtrabackup_debug_sync, name)) {
+		return;
+	}
+
+	pid = getpid();
+
+	snprintf(pid_path, sizeof(pid_path), "%s/xtrabackup_debug_sync",
+		 xtrabackup_target_dir);
+	fp = fopen(pid_path, "w");
+	if (fp == NULL) {
+		fprintf(stderr, "xtrabackup: Error: cannot open %s\n",
+			pid_path);
+		exit(EXIT_FAILURE);
+	}
+	fprintf(fp, "%u\n", (uint) pid);
+	fclose(fp);
+
+	fprintf(stderr, "xtrabackup: DEBUG: "
+		"Suspending at debug sync point '%s'. "
+		"Resume with 'kill -SIGCONT %u'.\n", name, (uint) pid);
+
+	kill(pid, SIGSTOP);
+
+	/* On resume */
+	my_delete(pid_path, MYF(MY_WME));
+#endif
+}
+
 static const char *load_default_groups[]= { "mysqld","xtrabackup",0 };
 
 static void print_version(void)
@@ -2816,11 +2833,6 @@
 #else
 	zip_size = fil_space_get_zip_size(node->space->id);
 	if (zip_size == ULINT_UNDEFINED) {
-		fprintf(stderr, "[%02u] xtrabackup: Warning: "
-			"Failed to determine page size for %s.\n"
-			"[%02u] xtrabackup: Warning: We assume the table was "
-			"dropped during xtrabackup execution and ignore the "
-			"file.\n", thread_n, node->name, thread_n);
 		goto skip;
 	} else if (zip_size) {
 		page_size = zip_size;
@@ -2884,8 +2896,8 @@
 			fprintf(stderr,
 				"[%02u] xtrabackup: Warning: cannot open %s\n"
 				"[%02u] xtrabackup: Warning: We assume the "
-				"table was dropped during xtrabackup execution "
-				"and ignore the file.\n",
+				"table was dropped or renamed during "
+				"xtrabackup execution and ignore the file.\n",
 				thread_n, node->name, thread_n);
 			goto skip;
 		}
@@ -3583,6 +3595,8 @@
 	*/
 	my_thread_init();
 
+	debug_sync_point("data_copy_thread_func");
+
 	while ((node = datafiles_iter_next(ctxt->it, &space_changed)) != NULL) {
 		space = node->space;
 
@@ -3607,7 +3621,6 @@
 	OS_THREAD_DUMMY_RETURN;
 }
 
-/* CAUTION(?): Don't rename file_per_table during backup */
 static void
 xtrabackup_backup_func(void)
 {