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

[Alexey Kopytov]

Bug #1079700: Issues with renaming/rotating tables during the backup
              stage

The problem was in the way XtraBackup handled DDL on individual
tablespaces on the backup stage. It first created a list of tablespaces
to copy which is represented by fil_system, but when starting the actual
tablespace copy operation later, it opened tablespace files by name. If
a tablespace file could not be opened, XtraBackup assumed the tablespace
got removed after the fil_system list was created and ignored the
tablespaces. This naturally only worked for cases when the tablespace
got dropped. A renamed tablespace would be missing in the resulting
backup, and tablespace rotations resulted in a missing tablespace and a
duplicate copy of another tablespace participating in rotation.

The idea of the fix is to make sure that once a tablespace is added to
fil_system, the underlying file is copied to backup with the same name
and space ID, regardless of what operations have been performed on the
tablespace/file during the backup procedure.

The only way to achieve that is to reuse file handles created when
opening tablespaces and adding them to fil_system, i.e. never attempt to
access tablespaces by name and rely on the fact the an open file handle
will always point to the same inode, even if the file is unlink()ed or
rename()d along the way. In other words, exclude the case when we are
going to copy a tablespace, but the file does not exist already.

This requires changes to fil_load_single_table_tablespace() to not close
the file handle after adding a space/node to fil_system, but keep the
node open and assign the handle to node->handle. We could use
fil_node_open_file() for that, but that function creates another handle
and open the tablespace file by name, which would still leave some room
for a race condition during the time when fil_system is populated. This
also requires XtraBackup to close the node correctly basically to comply
with various invariants enforced by fil_validate() in debug builds. This
part is implemented in XtraBackup in xb_fil_node_close_file().

We also want to reuse file handles in fil_load_single_table_tablespace()
only at the backup stage. Historically, XtraBackup patches used
recv_recovery_on to detect whether we are currently in the 'backup' or
'recovery' mode. That doesn't always work reliably. For example, we may
initialize fil_system before we start recovery to apply an incremental
backup. So recovery is still not started, but we are not in the backup
mode either. To circumvent that, the patch introduces another global
variable srv_backup_mode which is set by XtraBackup only in
xtrabackup_backup_func(). This patch also changes remote tablespaces
support in innodb56.patch to use srv_backup_mode instead of
recv_recovery_on.

Another change necessitated by the patch is ignoring deleted tablespaces
on recovery, which has been implemented in XB patches to
recv_apply_hashed_log_recs(). After MLOG_FILE_DELETE is replayed on
recovery and the underlying file is deleted, possible updates to the
same tablespace done before deleting the tablespace are left in the redo
log. They will be ignored by the recovery code. This can never cause any
problems for server, because file creation/removal is done immediately,
so on recovery InnoDB detects missing tablespace files and does not the
corresponding log records to the hash table (see the first lines in
recv_add_to_hash_table). The situation is different with XtraBackup: the
underlying file will be present when recovery starts, but then get
deleted when MLOG_FILE_DELETE is replayed, i.e. after all log records
from the current batch have been added to the hash table. As a result,
log records corresponding to the deleted tablespace are ignore, but are
still left in the hash table, so recv_apply_hashed_log_recs() hangs
forever waiting for recv_sys->n_addrs to become zero. This was also
possible with XtraBackup before this fix, i.e. when a tablespace is
removed after it has been copied by XtraBackup. This fix just makes this
condition more likely to occur, as we always copy all tablespaces rather
than ignore those removed before the copy operation is tarted.

To fix the above case, we also check for deleted tablespaces in
recv_apply_hashed_log_recs(). Those corresponding to previously deleted
tablespaces are marked as processed and recv_sys->n_addrs is decremented
accordingly to not leave spurious unprocessed log records in the hash
table.

Finally, now that we reuse fil_system file handles again, bug #870119
needs another fix. I.e. the number of open file handles grows to the
number of tablespaces we want to copy, so we want to prevent InnoDB LRU
policies from kicking in and closing/reusing file handles. There are
multiple ways to achieve that. Patching InnoDB code to disable
fil_system LRU and file closing policies in InnoDB appeared to be too
risky. The easiest one is to set the allowed number of open InnoDB files
to some vary large value unconditionally (i.e. override
innodb_open_files with the maximum possible value, LONG_MAX). InnoDB
does not allocate any resource for each srv_max_n_open_files
increment. It's just the maximum possible LRU list length, so this
change does not incur any additional resource consumption.

This revision also extends bug722638.sh (since there's 95% overlap
between that one and the test case for this bug), and renames
bug722638.sh to ddl.sh to better reflect the contents. It also backports
record_db_state() / verify_db_state() from the 2.1 test suite, because
messing with individual table checksums and checksum_table looks rather
cumbersome with a higher number of tables in the test.

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

[Laurynas Biveinis (laurynas-biveinis)]

    - The MLOG_FILE_DELETE bits need reconcilation and/or explanation
      on why the already existing hashed log rec handling in the
      patches for buf_page_read_low() is not enough. Maybe it's
      possible to tweak buf_page_read_low() patch instead of adding
      more patches to log0recv.c? Please see
      http://bugs.mysql.com/bug.php?id=43948 and
      https://bugs.launchpad.net/percona-xtrabackup/+bug/1121072
      which I have closed as Invalid due to this MP.

    - Will the following work:
      - XtraBackup creates a list of tablespaces;
      - CREATE TABLE foo is issued (optionally maybe even CREATE
        DATABASE first);
      - XtraBackup proceeds with backup;
      - Incremental backup is taken. Will it contain foo? It is
        possible that some of the foo writes will be captured in the
        full backup redo log backup.
      I guess this question boils down to "is fil_system snapshot
      taking atomic with the rest of backup state." CREATE TABLE
      specifically because other scenarios seem to be covered by this
      fix. I am not implying that I suspect it will or will not, I
      don't know and am curious.

    - This might be outside the scope of the current fix, but since
      you are backporting the mysqldump backup verifier, I am
      mentioning it here. If there's a bug/blueprint open for this,
      please point me there: mysqldump verification probably would miss
      secondary index tree corruptions, wouldn't it?

    - What are the s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS bits for?
      Some bug fixed? If yes, is there a # ref?

    - Likewise for configure.cmake patch bits?

    - I recall seeing utils/build.sh patch elsewhere, yet there is
      only one unmerged revision in this MP. Is this intended?

review: Needs Information

[Alexey Kopytov (akopytov)]

Hi Laurynas,

On Wed, 08 May 2013 14:48:26 -0000, Laurynas Biveinis wrote:
> Review: Needs Information
>
> - The MLOG_FILE_DELETE bits need reconcilation and/or explanation
> on why the already existing hashed log rec handling in the
> patches for buf_page_read_low() is not enough. Maybe it's
> possible to tweak buf_page_read_low() patch instead of adding
> more patches to log0recv.c? Please see
> http://bugs.mysql.com/bug.php?id=43948 and
> https://bugs.launchpad.net/percona-xtrabackup/+bug/1121072
> which I have closed as Invalid due to this MP.
>

The explanation is that you did not port the patch for bug #43948 to
innodb56.patch. Now that I have patched recv_apply_hashed_log_recs(),
the fix for bug 43948 in PS and innodb51.patch/innodb55.patch is redundant.

But since the goal is to get rid of all those patches, they will be
"reconciled" naturally.

> - Will the following work:
> - XtraBackup creates a list of tablespaces;
> - CREATE TABLE foo is issued (optionally maybe even CREATE
> DATABASE first);
> - XtraBackup proceeds with backup;
> - Incremental backup is taken. Will it contain foo? It is
> possible that some of the foo writes will be captured in the
> full backup redo log backup.
> I guess this question boils down to "is fil_system snapshot
> taking atomic with the rest of backup state." CREATE TABLE
> specifically because other scenarios seem to be covered by this
> fix. I am not implying that I suspect it will or will not, I
> don't know and am curious.
>

fil_op_log_parse_or_replay() does nothing if it has to replay
MLOG_FILE_CREATE and the tablespace already exists. So if the tablespace
makes it into fil_system at the backup stage, XtraBackup will ignore
MLOG_FILE_CREATE. Otherwise it will replay it. Not sure what difference
a subsequent incremental backup would make.

> - This might be outside the scope of the current fix, but since
> you are backporting the mysqldump backup verifier, I am
> mentioning it here. If there's a bug/blueprint open for this,
> please point me there: mysqldump verification probably would miss
> secondary index tree corruptions, wouldn't it?
>

Both mysqldump and CHECKSUM TABLE verification are identical for InnoDB.
CHECKSUM TABLE basically does "SELECT * FROM table" internally and
calculates checksums for all values in all rows. So corruption in
secondary index pages will also go unnoticed.

> - What are the s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS bits for?
> Some bug fixed? If yes, is there a # ref?
>

It is a backport of the fix for bug #1164958 to older PS/MySQL 5.1 versions.

> - Likewise for configure.cmake patch bits?
>

Likewise, backports of the fix for
http://bugs.mysql.com/bug.php?id=65050 to older PS/MySQL 5.5 versions.

> - I recall seeing utils/build.sh patch elsewhere, yet there is
> only one unmerged revision in this MP. Is this intended?
>

That was for 2.1.

[Laurynas Biveinis (laurynas-biveinis)]

Hi Alexey -

> > - The MLOG_FILE_DELETE bits need reconcilation and/or explanation
> > http://bugs.mysql.com/bug.php?id=43948 and
>
> The explanation is that you did not port the patch for bug #43948 to
> innodb56.patch. Now that I have patched recv_apply_hashed_log_recs(),
> the fix for bug 43948 in PS and innodb51.patch/innodb55.patch is redundant.

Yes, I was wondering about other than innodb56.patch patches. The fact that I didn't patch innodb56.patch is/was https://bugs.launchpad.net/percona-xtrabackup/+bug/1121072. So if I understand correctly, now they will carry the both fixes and either fix may be reverted. And there is no point to spend effort to actually do this.

> > - This might be outside the scope of the current fix, but since
> > you are backporting the mysqldump backup verifier, I am
> > mentioning it here. If there's a bug/blueprint open for this,
> > please point me there: mysqldump verification probably would miss
> > secondary index tree corruptions, wouldn't it?
> >
>
> Both mysqldump and CHECKSUM TABLE verification are identical for InnoDB.
> CHECKSUM TABLE basically does "SELECT * FROM table" internally and
> calculates checksums for all values in all rows. So corruption in
> secondary index pages will also go unnoticed.

I didn't mention CHECKSUM TABLE anywhere in my comment for this very reason. So do we want to do something re. secondary index tree verifications?

review: Approve

=== modified file 'patches/innodb51.patch'
--- patches/innodb51.patch	2013-04-16 14:29:50 +0000
+++ patches/innodb51.patch	2013-05-08 05:16:27 +0000
@@ -444,7 +444,60 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3425,7 +3530,7 @@
+@@ -3414,7 +3519,51 @@
+ 
+ 	fil_node_create(filepath, 0, space_id, FALSE);
+ func_exit:
+-	os_file_close(file);
++	/* We reuse file handles on the backup stage in XtraBackup to avoid
++	inconsistencies between the file name and the actual tablespace contents
++	if a DDL occurs between a fil_load_single_table_tablespaces() call and
++	the actual copy operation. */
++	if (srv_backup_mode) {
++
++		fil_node_t*	node;
++		fil_space_t*	space;
++
++		mutex_enter(&fil_system->mutex);
++
++		space = fil_space_get_by_id(space_id);
++
++		if (space) {
++			node = UT_LIST_GET_LAST(space->chain);
++
++			/* The handle will be closed by xtrabackup in
++			xtrabackup_copy_datafile(). We set node->open to TRUE to
++			make sure no one calls fil_node_open_file()
++			(i.e. attempts to reopen the tablespace by name) during
++			the backup stage. */
++
++			node->open = TRUE;
++			node->handle = file;
++
++			/* The following is copied from fil_node_open_file() to
++			pass fil_system validity checks. We cannot use
++			fil_node_open_file() directly, as that would re-open the
++			file by name and create another file handle. */
++
++			fil_system->n_open++;
++
++			if (space->purpose == FIL_TABLESPACE &&
++			    space->id != 0) {
++
++				/* Put the node to the LRU list */
++				UT_LIST_ADD_FIRST(LRU, fil_system->LRU, node);
++			}
++		}
++
++		mutex_exit(&fil_system->mutex);
++	} else {
++
++		os_file_close(file);
++	}
+ 	ut_free(buf2);
+ 	mem_free(filepath);
+ }
+@@ -3425,7 +3574,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 */
@@ -453,7 +506,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -3469,7 +3574,7 @@
+@@ -3469,7 +3618,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  ulint
@@ -462,7 +515,7 @@
  /*===================================*/
  {
  	int		ret;
-@@ -3525,7 +3630,9 @@
+@@ -3525,7 +3674,9 @@
  			dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -473,7 +526,7 @@
  
  		if (dbdir != NULL) {
  			/* printf("Opened dir %s\n", dbinfo.name); */
-@@ -3551,8 +3658,11 @@
+@@ -3551,8 +3702,11 @@
  						   ".ibd")) {
  					/* The name ends in .ibd; try opening
  					the file */
@@ -486,7 +539,7 @@
  				}
  next_file_item:
  				ret = fil_file_readdir_next_file(&err,
-@@ -3724,15 +3834,97 @@
+@@ -3724,15 +3878,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -592,7 +645,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4121,7 +4313,7 @@
+@@ -4121,7 +4357,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -601,7 +654,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4141,10 +4333,13 @@
+@@ -4141,10 +4377,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -616,7 +669,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4157,6 +4352,8 @@
+@@ -4157,6 +4396,8 @@
  	}
  
  	node->n_pending++;
@@ -625,7 +678,7 @@
  }
  
  /********************************************************************//**
-@@ -4292,7 +4489,9 @@
+@@ -4292,7 +4533,9 @@
  	ut_ad(recv_no_ibuf_operations || (type == OS_FILE_WRITE)
  	      || !ibuf_bitmap_page(zip_size, block_offset)
  	      || sync || is_log);
@@ -636,7 +689,7 @@
  	      || ibuf_page(space_id, zip_size, block_offset, NULL));
  # endif /* UNIV_LOG_DEBUG */
  	if (sync) {
-@@ -4341,6 +4540,16 @@
+@@ -4341,6 +4584,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -710,7 +763,7 @@
  
 --- a/storage/innodb_plugin/include/srv0srv.h
 +++ b/storage/innodb_plugin/include/srv0srv.h
-@@ -202,6 +202,10 @@
+@@ -202,6 +202,11 @@
  extern ulong	srv_max_purge_lag;
  
  extern ulong	srv_replication_delay;
@@ -718,6 +771,7 @@
 +extern ibool	srv_read_only;
 +extern ibool	srv_fake_write;
 +extern ibool	srv_apply_log_only;
++extern ibool	srv_backup_mode;
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
@@ -912,7 +966,35 @@
  	    || (recv_addr->state == RECV_BEING_PROCESSED)
  	    || (recv_addr->state == RECV_PROCESSED)) {
  
-@@ -2297,7 +2298,7 @@
+@@ -1762,6 +1763,18 @@
+ 			ulint	zip_size = fil_space_get_zip_size(space);
+ 			ulint	page_no = recv_addr->page_no;
+ 
++			/* By now we have replayed all DDL log records from the
++			current batch. Check if the space ID is still valid in
++			the entry being processed, and ignore it if it is not.*/
++			if (fil_tablespace_deleted_or_being_deleted_in_mem(space, -1)) {
++
++				ut_a(recv_sys->n_addrs);
++
++				recv_addr->state = RECV_PROCESSED;
++				recv_sys->n_addrs--;
++
++				goto next;
++			}
+ 			if (recv_addr->state == RECV_NOT_PROCESSED) {
+ 				if (!has_printed) {
+ 					ut_print_timestamp(stderr);
+@@ -1795,7 +1808,7 @@
+ 
+ 				mutex_enter(&(recv_sys->mutex));
+ 			}
+-
++next:
+ 			recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
+ 		}
+ 
+@@ -2297,7 +2310,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -921,7 +1003,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2320,7 +2321,7 @@
+@@ -2320,7 +2333,7 @@
  					ut_error;
  				}
  			}
@@ -930,7 +1012,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2737,8 +2738,11 @@
+@@ -2737,8 +2750,11 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -944,7 +1026,7 @@
  		}
  	}
  
-@@ -2841,7 +2845,7 @@
+@@ -2841,7 +2857,7 @@
  		"InnoDB: Reading tablespace information"
  		" from the .ibd files...\n");
  
@@ -953,7 +1035,7 @@
  
  	/* If we are using the doublewrite method, we will
  	check if there are half-written pages in data files,
-@@ -2850,12 +2854,14 @@
+@@ -2850,12 +2866,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -969,7 +1051,7 @@
  	}
  }
  
-@@ -3005,6 +3011,7 @@
+@@ -3005,6 +3023,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -977,7 +1059,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3286,6 +3293,7 @@
+@@ -3286,6 +3305,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. */
@@ -1102,17 +1184,18 @@
  	secondary index entries for merge sort */
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
-@@ -374,6 +374,9 @@
+@@ -374,6 +374,10 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
 +UNIV_INTERN ibool	srv_read_only   = FALSE;
 +UNIV_INTERN ibool	srv_fake_write  = FALSE;
 +UNIV_INTERN ibool	srv_apply_log_only = FALSE;
++UNIV_INTERN ibool	srv_backup_mode = FALSE;
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -1002,7 +1005,7 @@
+@@ -1002,7 +1006,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -1121,7 +1204,7 @@
  }
  
  /*********************************************************************//**
-@@ -1013,6 +1016,7 @@
+@@ -1013,6 +1017,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -1129,7 +1212,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1026,6 +1030,7 @@
+@@ -1026,6 +1031,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -1347,3 +1430,14 @@
  
  	UNIV_MEM_FREE(buf, n);
  }
+--- a/configure.in
++++ b/configure.in
+@@ -22,7 +22,7 @@
+ AM_INIT_AUTOMAKE([1.9 tar-ustar])
+ AC_PROG_LIBTOOL
+ 
+-AM_CONFIG_HEADER([include/config.h])
++AC_CONFIG_HEADERS([include/config.h])
+ 
+ # Request support for automake silent-rules if available.
+ # Default to verbose output. One can use the configure-time
 
=== modified file 'patches/innodb51_builtin.patch'
--- patches/innodb51_builtin.patch	2013-04-16 14:29:50 +0000
+++ patches/innodb51_builtin.patch	2013-05-08 05:16:27 +0000
@@ -231,6 +231,15 @@
  }
  
  /**************************************************************************
+@@ -1227,7 +1247,7 @@
+ 	return(TRUE);
+ }
+ 
+-#ifdef UNIV_HOTBACKUP
++#if 1
+ /***********************************************************************
+ Returns the tablespace object for a given id, or NULL if not found from the
+ tablespace memory cache. */
 @@ -1288,7 +1308,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
@@ -410,7 +419,60 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3152,7 +3256,7 @@
+@@ -3143,7 +3247,51 @@
+ 
+ 	fil_node_create(filepath, 0, space_id, FALSE);
+ func_exit:
+-	os_file_close(file);
++	/* We reuse file handles on the backup stage in XtraBackup to avoid
++	inconsistencies between the file name and the actual tablespace contents
++	if a DDL occurs between a fil_load_single_table_tablespaces() call and
++	the actual copy operation. */
++	if (srv_backup_mode) {
++
++		fil_node_t*	node;
++		fil_space_t*	space;
++
++		mutex_enter(&fil_system->mutex);
++
++		space = fil_get_space_for_id_low(space_id);
++
++		if (space) {
++			node = UT_LIST_GET_LAST(space->chain);
++
++			/* The handle will be closed by xtrabackup in
++			xtrabackup_copy_datafile(). We set node->open to TRUE to
++			make sure no one calls fil_node_open_file()
++			(i.e. attempts to reopen the tablespace by name) during
++			the backup stage. */
++
++			node->open = TRUE;
++			node->handle = file;
++
++			/* The following is copied from fil_node_open_file() to
++			pass fil_system validity checks. We cannot use
++			fil_node_open_file() directly, as that would re-open the
++			file by name and create another file handle. */
++
++			fil_system->n_open++;
++
++			if (space->purpose == FIL_TABLESPACE &&
++			    space->id != 0) {
++
++				/* Put the node to the LRU list */
++				UT_LIST_ADD_FIRST(LRU, fil_system->LRU, node);
++			}
++		}
++
++		mutex_exit(&fil_system->mutex);
++	} else {
++
++		os_file_close(file);
++	}
+ 	ut_free(buf2);
+ 	mem_free(filepath);
+ }
+@@ -3152,7 +3300,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. */
@@ -419,7 +481,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -3197,7 +3301,7 @@
+@@ -3197,7 +3345,7 @@
  space id is != 0. */
  
  ulint
@@ -428,7 +490,7 @@
  /*===================================*/
  			/* out: DB_SUCCESS or error number */
  {
-@@ -3254,7 +3358,9 @@
+@@ -3254,7 +3402,9 @@
  			dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -439,7 +501,7 @@
  
  		if (dbdir != NULL) {
  			/* printf("Opened dir %s\n", dbinfo.name); */
-@@ -3280,8 +3386,11 @@
+@@ -3280,8 +3430,11 @@
  						   ".ibd")) {
  					/* The name ends in .ibd; try opening
  					the file */
@@ -452,7 +514,7 @@
  				}
  next_file_item:
  				ret = fil_file_readdir_next_file(&err,
-@@ -3500,15 +3609,100 @@
+@@ -3500,15 +3653,100 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -561,7 +623,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -3901,7 +4095,7 @@
+@@ -3901,7 +4139,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -570,7 +632,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/* in: file node */
-@@ -3921,10 +4115,14 @@
+@@ -3921,10 +4159,14 @@
  	}
  
  	if (node->open == FALSE) {
@@ -586,7 +648,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -3937,6 +4135,8 @@
+@@ -3937,6 +4179,8 @@
  	}
  
  	node->n_pending++;
@@ -595,7 +657,7 @@
  }
  
  /************************************************************************
-@@ -4067,7 +4267,9 @@
+@@ -4067,7 +4311,9 @@
  	ut_ad(recv_no_ibuf_operations || (type == OS_FILE_WRITE)
  	      || !ibuf_bitmap_page(block_offset) || sync || is_log);
  #ifdef UNIV_SYNC_DEBUG
@@ -606,7 +668,7 @@
  	      || ibuf_page(space_id, block_offset));
  #endif
  #endif
-@@ -4112,6 +4314,16 @@
+@@ -4112,6 +4358,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -746,7 +808,7 @@
  extern ulint	srv_pool_size;
  extern ulint	srv_awe_window_size;
  extern ulint	srv_mem_pool_size;
-@@ -138,6 +141,10 @@
+@@ -138,6 +141,11 @@
  extern ulong	srv_max_purge_lag;
  extern ibool	srv_use_awe;
  extern ibool	srv_use_adaptive_hash_indexes;
@@ -754,6 +816,7 @@
 +extern ibool	srv_read_only;
 +extern ibool	srv_fake_write;
 +extern ibool	srv_apply_log_only;
++extern ibool	srv_backup_mode;
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
@@ -956,7 +1019,34 @@
  	    || (recv_addr->state == RECV_BEING_PROCESSED)
  	    || (recv_addr->state == RECV_PROCESSED)) {
  
-@@ -1926,7 +1927,7 @@
+@@ -1429,6 +1430,18 @@
+ 			space = recv_addr->space;
+ 			page_no = recv_addr->page_no;
+ 
++			/* By now we have replayed all DDL log records from the
++			current batch. Check if the space ID is still valid in
++			the entry being processed, and ignore it if it is not.*/
++			if (fil_tablespace_deleted_or_being_deleted_in_mem(space, -1)) {
++
++				ut_a(recv_sys->n_addrs);
++
++				recv_addr->state = RECV_PROCESSED;
++				recv_sys->n_addrs--;
++
++				goto next;
++			}
+ 			if (recv_addr->state == RECV_NOT_PROCESSED) {
+ 				if (!has_printed) {
+ 					ut_print_timestamp(stderr);
+@@ -1463,6 +1476,7 @@
+ 				mutex_enter(&(recv_sys->mutex));
+ 			}
+ 
++next:
+ 			recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
+ 		}
+ 
+@@ -1926,7 +1940,7 @@
  		} else if (store_to_hash && (type == MLOG_FILE_CREATE
  					     || type == MLOG_FILE_RENAME
  					     || type == MLOG_FILE_DELETE)) {
@@ -965,7 +1055,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -1949,7 +1950,7 @@
+@@ -1949,7 +1963,7 @@
  					ut_a(0);
  				}
  			}
@@ -974,7 +1064,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  		} else if (store_to_hash) {
-@@ -2360,9 +2361,12 @@
+@@ -2360,9 +2374,12 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -989,7 +1079,7 @@
  		}
  	}
  
-@@ -2462,7 +2466,7 @@
+@@ -2462,7 +2479,7 @@
  		"InnoDB: Reading tablespace information"
  		" from the .ibd files...\n");
  
@@ -998,7 +1088,7 @@
  
  	/* If we are using the doublewrite method, we will
  	check if there are half-written pages in data files,
-@@ -2471,12 +2475,14 @@
+@@ -2471,12 +2488,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -1014,7 +1104,7 @@
  	}
  }
  
-@@ -2611,6 +2617,7 @@
+@@ -2611,6 +2630,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -1022,7 +1112,7 @@
  	}
  
  	contiguous_lsn = ut_dulint_align_down(recv_sys->scanned_lsn,
-@@ -2910,6 +2917,7 @@
+@@ -2910,6 +2930,7 @@
  	/* Switch latching order checks on in sync0sync.c */
  	sync_order_checks_on = TRUE;
  #endif
@@ -1030,7 +1120,7 @@
  	if (srv_force_recovery < SRV_FORCE_NO_TRX_UNDO) {
  		/* Rollback the uncommitted transactions which have no user
  		session */
-@@ -2917,6 +2925,7 @@
+@@ -2917,6 +2938,7 @@
  		os_thread_create(trx_rollback_or_clean_all_without_sess,
  				 (void *)&i, NULL);
  	}
@@ -1346,17 +1436,18 @@
  ulint	srv_pool_size		= ULINT_MAX;	/* size in pages; MySQL inits
  						this to size in kilobytes but
  						we normalize this to pages in
-@@ -363,6 +367,9 @@
+@@ -363,6 +367,10 @@
  ibool	srv_use_awe			= FALSE;
  ibool	srv_use_adaptive_hash_indexes	= TRUE;
  
 +ibool	srv_read_only	= FALSE;
 +ibool	srv_fake_write	= FALSE;
 +ibool	srv_apply_log_only = FALSE;
++ibool	srv_backup_mode = FALSE;
  /*-------------------------------------------*/
  ulong	srv_n_spin_wait_rounds	= 20;
  ulong	srv_n_free_tickets_to_enter = 500;
-@@ -985,6 +992,7 @@
+@@ -985,6 +993,7 @@
  srv_general_init(void)
  /*==================*/
  {
@@ -1605,3 +1696,14 @@
  
  		if (rec_len != UNIV_SQL_NULL) {
  			n_not_null[i]++;
+--- a/configure.in
++++ b/configure.in
+@@ -22,7 +22,7 @@
+ AM_INIT_AUTOMAKE([1.9 tar-ustar])
+ AC_PROG_LIBTOOL
+ 
+-AM_CONFIG_HEADER([include/config.h])
++AC_CONFIG_HEADERS([include/config.h])
+ 
+ # Request support for automake silent-rules if available.
+ # Default to verbose output. One can use the configure-time
 
=== modified file 'patches/innodb55.patch'
--- patches/innodb55.patch	2013-04-16 14:29:50 +0000
+++ patches/innodb55.patch	2013-05-08 05:16:27 +0000
@@ -433,7 +433,60 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -3476,7 +3581,7 @@
+@@ -3465,7 +3570,51 @@
+ 
+ 	fil_node_create(filepath, 0, space_id, FALSE);
+ func_exit:
+-	os_file_close(file);
++	/* We reuse file handles on the backup stage in XtraBackup to avoid
++	inconsistencies between the file name and the actual tablespace contents
++	if a DDL occurs between a fil_load_single_table_tablespaces() call and
++	the actual copy operation. */
++	if (srv_backup_mode) {
++
++		fil_node_t*	node;
++		fil_space_t*	space;
++
++		mutex_enter(&fil_system->mutex);
++
++		space = fil_space_get_by_id(space_id);
++
++		if (space) {
++			node = UT_LIST_GET_LAST(space->chain);
++
++			/* The handle will be closed by xtrabackup in
++			xtrabackup_copy_datafile(). We set node->open to TRUE to
++			make sure no one calls fil_node_open_file()
++			(i.e. attempts to reopen the tablespace by name) during
++			the backup stage. */
++
++			node->open = TRUE;
++			node->handle = file;
++
++			/* The following is copied from fil_node_open_file() to
++			pass fil_system validity checks. We cannot use
++			fil_node_open_file() directly, as that would re-open the
++			file by name and create another file handle. */
++
++			fil_system->n_open++;
++
++			if (space->purpose == FIL_TABLESPACE &&
++			    space->id != 0) {
++
++				/* Put the node to the LRU list */
++				UT_LIST_ADD_FIRST(LRU, fil_system->LRU, node);
++			}
++		}
++
++		mutex_exit(&fil_system->mutex);
++	} else {
++
++		os_file_close(file);
++	}
+ 	ut_free(buf2);
+ 	mem_free(filepath);
+ }
+@@ -3476,7 +3625,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 */
@@ -442,7 +495,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -3520,7 +3625,7 @@
+@@ -3520,7 +3669,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  ulint
@@ -451,7 +504,7 @@
  /*===================================*/
  {
  	int		ret;
-@@ -3576,7 +3681,9 @@
+@@ -3576,7 +3725,9 @@
  			dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -462,7 +515,7 @@
  
  		if (dbdir != NULL) {
  			/* printf("Opened dir %s\n", dbinfo.name); */
-@@ -3602,8 +3709,11 @@
+@@ -3602,8 +3753,11 @@
  						   ".ibd")) {
  					/* The name ends in .ibd; try opening
  					the file */
@@ -475,7 +528,7 @@
  				}
  next_file_item:
  				ret = fil_file_readdir_next_file(&err,
-@@ -3775,15 +3885,97 @@
+@@ -3775,15 +3929,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -581,7 +634,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4172,7 +4364,7 @@
+@@ -4172,7 +4408,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -590,7 +643,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4192,10 +4384,13 @@
+@@ -4192,10 +4428,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -605,7 +658,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4208,6 +4403,8 @@
+@@ -4208,6 +4447,8 @@
  	}
  
  	node->n_pending++;
@@ -614,7 +667,7 @@
  }
  
  /********************************************************************//**
-@@ -4390,6 +4587,16 @@
+@@ -4390,6 +4631,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -666,7 +719,7 @@
  Returns TRUE if a single-table tablespace does not exist in the memory cache,
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -218,6 +218,10 @@
+@@ -218,6 +218,11 @@
  extern ulong	srv_max_purge_lag;
  
  extern ulong	srv_replication_delay;
@@ -674,6 +727,7 @@
 +extern ibool	srv_read_only;
 +extern ibool	srv_fake_write;
 +extern ibool	srv_apply_log_only;
++extern ibool	srv_backup_mode;
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
@@ -824,7 +878,35 @@
  	    || (recv_addr->state == RECV_BEING_PROCESSED)
  	    || (recv_addr->state == RECV_PROCESSED)) {
  
-@@ -2308,7 +2309,7 @@
+@@ -1774,6 +1775,18 @@
+ 			ulint	zip_size = fil_space_get_zip_size(space);
+ 			ulint	page_no = recv_addr->page_no;
+ 
++			/* By now we have replayed all DDL log records from the
++			current batch. Check if the space ID is still valid in
++			the entry being processed, and ignore it if it is not.*/
++			if (fil_tablespace_deleted_or_being_deleted_in_mem(space, -1)) {
++
++				ut_a(recv_sys->n_addrs);
++
++				recv_addr->state = RECV_PROCESSED;
++				recv_sys->n_addrs--;
++
++				goto next;
++			}
+ 			if (recv_addr->state == RECV_NOT_PROCESSED) {
+ 				if (!has_printed) {
+ 					ut_print_timestamp(stderr);
+@@ -1807,7 +1820,7 @@
+ 
+ 				mutex_enter(&(recv_sys->mutex));
+ 			}
+-
++next:
+ 			recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
+ 		}
+ 
+@@ -2308,7 +2321,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -833,7 +915,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2331,7 +2332,7 @@
+@@ -2331,7 +2344,7 @@
  					ut_error;
  				}
  			}
@@ -842,7 +924,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2748,8 +2749,11 @@
+@@ -2748,8 +2761,11 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -856,7 +938,7 @@
  		}
  	}
  
-@@ -2854,7 +2858,7 @@
+@@ -2854,7 +2870,7 @@
  		"InnoDB: Reading tablespace information"
  		" from the .ibd files...\n");
  
@@ -865,7 +947,7 @@
  
  	/* If we are using the doublewrite method, we will
  	check if there are half-written pages in data files,
-@@ -2863,12 +2867,14 @@
+@@ -2863,12 +2879,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -881,7 +963,7 @@
  	}
  }
  
-@@ -3018,6 +3024,7 @@
+@@ -3018,6 +3036,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -889,7 +971,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3299,6 +3306,7 @@
+@@ -3299,6 +3318,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. */
@@ -1011,17 +1093,18 @@
  	secondary index entries for merge sort */
 --- a/storage/innobase/srv/srv0srv.c
 +++ b/storage/innobase/srv/srv0srv.c
-@@ -399,6 +399,9 @@
+@@ -399,6 +399,10 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
 +UNIV_INTERN ibool	srv_read_only   = FALSE;
 +UNIV_INTERN ibool	srv_fake_write  = FALSE;
 +UNIV_INTERN ibool	srv_apply_log_only = FALSE;
++UNIV_INTERN ibool	srv_backup_mode = FALSE;
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -1078,7 +1081,7 @@
+@@ -1078,7 +1082,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -1030,7 +1113,7 @@
  }
  
  /*********************************************************************//**
-@@ -1089,6 +1092,7 @@
+@@ -1089,6 +1093,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -1038,7 +1121,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1102,6 +1106,7 @@
+@@ -1102,6 +1107,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -1046,7 +1129,7 @@
  }
  
  /*********************************************************************//**
-@@ -1717,7 +1722,7 @@
+@@ -1717,7 +1723,7 @@
  		}
  
  		/* Record the lock wait time for this thread */
@@ -1264,3 +1347,16 @@
  
  	UNIV_MEM_FREE(buf, n);
  }
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -149,7 +149,9 @@
+   SET(CMAKE_REQUIRED_LIBRARIES 
+     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
+ 
+-  LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
++  IF(CMAKE_REQUIRED_LIBRARIES)
++    LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
++  ENDIF()
+   LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
+   
+   OPTION(WITH_LIBWRAP "Compile with tcp wrappers support" OFF)
 
=== modified file 'patches/innodb56.patch'
--- patches/innodb56.patch	2013-05-03 14:12:58 +0000
+++ patches/innodb56.patch	2013-05-08 05:16:27 +0000
@@ -336,7 +336,7 @@
  
 +	/* Ignore .isl files on XtraBackup recovery. All tablespaces must be
 +	local. */
-+	if (!recv_recovery_on) {
++	if (srv_backup_mode) {
  	/* Check for a link file which locates a remote tablespace. */
  	remote.success = fil_open_linked_file(
  		tablename, &remote.filepath, &remote.file);
@@ -357,7 +357,60 @@
  		ib_logf(IB_LOG_LEVEL_ERROR,
  			"The size of single-table tablespace file %s "
  			"is only " UINT64PF ", should be at least %lu!",
-@@ -4263,7 +4390,7 @@
+@@ -4243,7 +4370,51 @@
+ 	}
+ 
+ func_exit:
+-	os_file_close(fsp->file);
++	/* We reuse file handles on the backup stage in XtraBackup to avoid
++	inconsistencies between the file name and the actual tablespace contents
++	if a DDL occurs between a fil_load_single_table_tablespaces() call and
++	the actual copy operation. */
++	if (srv_backup_mode) {
++
++		fil_node_t*	node;
++		fil_space_t*	space;
++
++		mutex_enter(&fil_system->mutex);
++
++		space = fil_space_get_by_id(fsp->id);
++
++		if (space) {
++			node = UT_LIST_GET_LAST(space->chain);
++
++			/* The handle will be closed by xtrabackup in
++			xtrabackup_copy_datafile(). We set node->open to TRUE to
++			make sure no one calls fil_node_open_file()
++			(i.e. attempts to reopen the tablespace by name) during
++			the backup stage. */
++
++			node->open = TRUE;
++			node->handle = fsp->file;
++
++			/* The following is copied from fil_node_open_file() to
++			pass fil_system validaty checks. We cannot use
++			fil_node_open_file() directly, as that would re-open the
++			file by name and create another file handle. */
++
++			fil_system->n_open++;
++			fil_n_file_opened++;
++
++			if (fil_space_belongs_in_lru(space)) {
++
++				/* Put the node to the LRU list */
++				UT_LIST_ADD_FIRST(LRU, fil_system->LRU, node);
++			}
++		}
++
++		mutex_exit(&fil_system->mutex);
++	} else {
++
++		os_file_close(fsp->file);
++	}
+ 
+ #ifdef UNIV_HOTBACKUP
+ func_exit_after_close:
+@@ -4263,7 +4434,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 */
@@ -366,7 +419,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4303,7 +4430,7 @@
+@@ -4303,7 +4474,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  dberr_t
@@ -375,7 +428,7 @@
  /*===================================*/
  {
  	int		ret;
-@@ -4359,7 +4486,9 @@
+@@ -4359,7 +4530,9 @@
  			    "%s/%s", fil_path_to_mysql_datadir, dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -386,7 +439,7 @@
  
  		if (dbdir != NULL) {
  
-@@ -4380,9 +4509,15 @@
+@@ -4380,9 +4553,15 @@
  				    && (0 == strcmp(fileinfo.name
  						   + strlen(fileinfo.name) - 4,
  						   ".ibd")
@@ -394,7 +447,7 @@
 +					/* Ignore .isl files on XtraBackup
 +					recovery, all tablespaces must be
 +					local. */
-+					|| (!recv_recovery_on &&
++					|| (srv_backup_mode &&
 +					    0 == strcmp(fileinfo.name
  						   + strlen(fileinfo.name) - 4,
 -						   ".isl"))) {
@@ -404,7 +457,7 @@
  					/* The name ends in .ibd or .isl;
  					try opening the file */
  					fil_load_single_table_tablespace(
-@@ -4538,6 +4673,7 @@
+@@ -4538,6 +4717,7 @@
  {
  	fil_space_t*	fnamespace;
  	fil_space_t*	space;
@@ -412,7 +465,7 @@
  
  	ut_ad(fil_system);
  
-@@ -4615,6 +4751,10 @@
+@@ -4615,6 +4795,10 @@
  		if (fnamespace == NULL) {
  			if (print_error_if_does_not_exist) {
  				fil_report_missing_tablespace(name, id);
@@ -423,7 +476,7 @@
  			}
  		} else {
  			ut_print_timestamp(stderr);
-@@ -4638,6 +4778,10 @@
+@@ -4638,6 +4822,10 @@
  
  		mutex_exit(&fil_system->mutex);
  
@@ -434,7 +487,7 @@
  		return(FALSE);
  	}
  
-@@ -4728,6 +4872,7 @@
+@@ -4728,6 +4916,7 @@
  	ulint		page_size;
  	ulint		pages_added;
  	ibool		success;
@@ -442,7 +495,7 @@
  
  	ut_ad(!srv_read_only_mode);
  
-@@ -4772,13 +4917,17 @@
+@@ -4772,13 +4961,17 @@
  		goto retry;
  	}
  
@@ -461,7 +514,7 @@
  	start_page_no = space->size;
  	file_start_page_no = space->size - node->size;
  
-@@ -5024,7 +5173,7 @@
+@@ -5024,7 +5217,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -470,7 +523,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -5044,9 +5193,12 @@
+@@ -5044,9 +5237,12 @@
  	}
  
  	if (node->open == FALSE) {
@@ -484,7 +537,7 @@
  	}
  
  	if (node->n_pending == 0 && fil_space_belongs_in_lru(space)) {
-@@ -5058,6 +5210,8 @@
+@@ -5058,6 +5254,8 @@
  	}
  
  	node->n_pending++;
@@ -493,7 +546,7 @@
  }
  
  /********************************************************************//**
-@@ -5259,6 +5413,16 @@
+@@ -5259,6 +5457,16 @@
  
  	ut_ad(mode != OS_AIO_IBUF || space->purpose == FIL_TABLESPACE);
  
@@ -510,7 +563,7 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
-@@ -5290,7 +5454,11 @@
+@@ -5290,7 +5498,11 @@
  	}
  
  	/* Open file if closed */
@@ -523,7 +576,7 @@
  
  	/* Check that at least the start offset is within the bounds of a
  	single-table tablespace, including rollback tablespaces. */
-@@ -6164,6 +6332,7 @@
+@@ -6164,6 +6376,7 @@
  	return(err);
  }
  
@@ -531,7 +584,7 @@
  /****************************************************************//**
  Generate redo logs for swapping two .ibd files */
  UNIV_INTERN
-@@ -6187,4 +6356,4 @@
+@@ -6187,4 +6400,4 @@
  			 0, 0, new_name, old_name, &mtr);
  	mtr_commit(&mtr);
  }
@@ -674,13 +727,15 @@
  Returns TRUE if a single-table tablespace does not exist in the memory cache,
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -353,6 +353,9 @@
+@@ -353,6 +353,11 @@
  extern ulong	srv_max_purge_lag_delay;
  
  extern ulong	srv_replication_delay;
 +
 +extern ibool	srv_apply_log_only;
 +
++extern ibool	srv_backup_mode;
++
  /*-------------------------------------------*/
  
  extern ibool	srv_print_innodb_monitor;
@@ -755,7 +810,26 @@
  	    || (recv_addr->state == RECV_BEING_PROCESSED)
  	    || (recv_addr->state == RECV_PROCESSED)) {
  
-@@ -2413,7 +2415,7 @@
+@@ -1868,6 +1870,18 @@
+ 			ulint	zip_size = fil_space_get_zip_size(space);
+ 			ulint	page_no = recv_addr->page_no;
+ 
++			/* By now we have replayed all DDL log records from the
++			current batch. Check if the space ID is still valid in
++			the entry being processed, and ignore it if it is not.*/
++			if (fil_tablespace_deleted_or_being_deleted_in_mem(space, -1)) {
++
++				ut_a(recv_sys->n_addrs);
++
++				recv_addr->state = RECV_PROCESSED;
++				recv_sys->n_addrs--;
++
++				continue;
++			}
+ 			if (recv_addr->state == RECV_NOT_PROCESSED) {
+ 				if (!has_printed) {
+ 					ib_logf(IB_LOG_LEVEL_INFO,
+@@ -2413,7 +2427,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -764,7 +838,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2436,7 +2438,7 @@
+@@ -2436,7 +2450,7 @@
  					ut_error;
  				}
  			}
@@ -773,7 +847,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2863,8 +2865,14 @@
+@@ -2863,8 +2877,14 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -790,7 +864,7 @@
  		}
  	}
  
-@@ -2964,7 +2972,7 @@
+@@ -2964,7 +2984,7 @@
  	ib_logf(IB_LOG_LEVEL_INFO,
  		"Reading tablespace information from the .ibd files...");
  
@@ -799,7 +873,7 @@
  
  	/* If we are using the doublewrite method, we will
  	check if there are half-written pages in data files,
-@@ -3456,7 +3464,8 @@
+@@ -3456,7 +3476,8 @@
  	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. */
@@ -836,16 +910,18 @@
  	tested with following crash point */
 --- a/storage/innobase/srv/srv0srv.cc
 +++ b/storage/innobase/srv/srv0srv.cc
-@@ -349,6 +349,8 @@
+@@ -349,6 +349,10 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
 +UNIV_INTERN ibool	srv_apply_log_only	= FALSE;
 +
++UNIV_INTERN ibool	srv_backup_mode		= FALSE;
++
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_spin_wait_delay	= 6;
-@@ -1808,7 +1810,8 @@
+@@ -1808,7 +1812,8 @@
  	if (ret == SRV_NONE
  	    && srv_shutdown_state != SRV_SHUTDOWN_NONE
  	    && trx_purge_state() != PURGE_STATE_DISABLED
 
=== modified file 'patches/xtradb51.patch'
--- patches/xtradb51.patch	2013-04-16 14:29:50 +0000
+++ patches/xtradb51.patch	2013-05-08 05:16:27 +0000
@@ -326,7 +326,60 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -4247,7 +4349,7 @@
+@@ -4236,7 +4338,51 @@
+ 
+ 	fil_node_create(filepath, 0, space_id, FALSE);
+ func_exit:
+-	os_file_close(file);
++	/* We reuse file handles on the backup stage in XtraBackup to avoid
++	inconsistencies between the file name and the actual tablespace contents
++	if a DDL occurs between a fil_load_single_table_tablespaces() call and
++	the actual copy operation. */
++	if (srv_backup_mode) {
++
++		fil_node_t*	node;
++		fil_space_t*	space;
++
++		mutex_enter(&fil_system->mutex);
++
++		space = fil_space_get_by_id(space_id);
++
++		if (space) {
++			node = UT_LIST_GET_LAST(space->chain);
++
++			/* The handle will be closed by xtrabackup in
++			xtrabackup_copy_datafile(). We set node->open to TRUE to
++			make sure no one calls fil_node_open_file()
++			(i.e. attempts to reopen the tablespace by name) during
++			the backup stage. */
++
++			node->open = TRUE;
++			node->handle = file;
++
++			/* The following is copied from fil_node_open_file() to
++			pass fil_system validity checks. We cannot use
++			fil_node_open_file() directly, as that would re-open the
++			file by name and create another file handle. */
++
++			fil_system->n_open++;
++
++			if (space->purpose == FIL_TABLESPACE &&
++			    space->id != 0) {
++
++				/* Put the node to the LRU list */
++				UT_LIST_ADD_FIRST(LRU, fil_system->LRU, node);
++			}
++		}
++
++		mutex_exit(&fil_system->mutex);
++	} else {
++
++		os_file_close(file);
++	}
+ 	ut_free(buf2);
+ 	mem_free(filepath);
+ }
+@@ -4247,7 +4393,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 */
@@ -335,7 +388,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4291,7 +4393,7 @@
+@@ -4291,7 +4437,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  ulint
@@ -344,7 +397,7 @@
  /*===================================*/
  {
  	int		ret;
-@@ -4347,7 +4449,9 @@
+@@ -4347,7 +4493,9 @@
  			dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -355,7 +408,7 @@
  
  		if (dbdir != NULL) {
  			/* printf("Opened dir %s\n", dbinfo.name); */
-@@ -4373,8 +4477,11 @@
+@@ -4373,8 +4521,11 @@
  						   ".ibd")) {
  					/* The name ends in .ibd; try opening
  					the file */
@@ -368,7 +421,7 @@
  				}
  next_file_item:
  				ret = fil_file_readdir_next_file(&err,
-@@ -4546,15 +4653,97 @@
+@@ -4546,15 +4697,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -474,7 +527,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -4953,7 +5142,7 @@
+@@ -4953,7 +5186,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -483,7 +536,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -4973,10 +5162,13 @@
+@@ -4973,10 +5206,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -498,7 +551,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4989,6 +5181,8 @@
+@@ -4989,6 +5225,8 @@
  	}
  
  	node->n_pending++;
@@ -507,7 +560,7 @@
  }
  
  /********************************************************************//**
-@@ -5125,7 +5319,9 @@
+@@ -5125,7 +5363,9 @@
  	ut_ad(recv_no_ibuf_operations || (type == OS_FILE_WRITE)
  	      || !ibuf_bitmap_page(zip_size, block_offset)
  	      || sync || is_log);
@@ -518,7 +571,7 @@
  	      || ibuf_page(space_id, zip_size, block_offset, NULL));
  # endif /* UNIV_LOG_DEBUG */
  	if (sync) {
-@@ -5190,6 +5386,16 @@
+@@ -5190,6 +5430,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -650,13 +703,14 @@
  	return(buf);
 --- a/storage/innodb_plugin/include/srv0srv.h
 +++ b/storage/innodb_plugin/include/srv0srv.h
-@@ -226,6 +226,10 @@
+@@ -226,6 +226,11 @@
  
  extern ulong	srv_replication_delay;
  
 +extern ibool	srv_read_only;
 +extern ibool	srv_fake_write;
 +extern ibool	srv_apply_log_only;
++extern ibool	srv_backup_mode;
 +
  extern long long	srv_ibuf_max_size;
  extern ulint	srv_ibuf_active_contract;
@@ -826,7 +880,35 @@
  ibool
  log_block_checksum_is_ok_or_old_format(
  /*===================================*/
-@@ -2369,7 +2369,7 @@
+@@ -1830,6 +1830,18 @@
+ 			ulint	zip_size = fil_space_get_zip_size(space);
+ 			ulint	page_no = recv_addr->page_no;
+ 
++			/* By now we have replayed all DDL log records from the
++			current batch. Check if the space ID is still valid in
++			the entry being processed, and ignore it if it is not.*/
++			if (fil_tablespace_deleted_or_being_deleted_in_mem(space, -1)) {
++
++				ut_a(recv_sys->n_addrs);
++
++				recv_addr->state = RECV_PROCESSED;
++				recv_sys->n_addrs--;
++
++				goto next;
++			}
+ 			if (recv_addr->state == RECV_NOT_PROCESSED) {
+ 				if (!has_printed) {
+ 					ut_print_timestamp(stderr);
+@@ -1863,7 +1875,7 @@
+ 
+ 				mutex_enter(&(recv_sys->mutex));
+ 			}
+-
++next:
+ 			recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
+ 		}
+ 
+@@ -2369,7 +2381,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -835,7 +917,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2392,7 +2392,7 @@
+@@ -2392,7 +2404,7 @@
  					ut_error;
  				}
  			}
@@ -844,7 +926,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2809,8 +2809,11 @@
+@@ -2809,8 +2821,11 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -858,7 +940,7 @@
  		}
  	}
  
-@@ -2913,7 +2916,7 @@
+@@ -2913,7 +2928,7 @@
  		"InnoDB: Reading tablespace information"
  		" from the .ibd files...\n");
  
@@ -867,7 +949,7 @@
  
  	/* If we are using the doublewrite method, we will
  	check if there are half-written pages in data files,
-@@ -2922,12 +2925,14 @@
+@@ -2922,12 +2937,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -883,7 +965,7 @@
  	}
  }
  
-@@ -3095,6 +3100,7 @@
+@@ -3095,6 +3112,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -891,7 +973,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3453,6 +3459,7 @@
+@@ -3453,6 +3471,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. */
@@ -1026,18 +1108,19 @@
  /* prototypes for new functions added to ha_innodb.cc */
  ibool	innobase_get_slow_log();
  
-@@ -415,6 +410,10 @@
+@@ -415,6 +410,11 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
 +UNIV_INTERN ibool	srv_read_only	= FALSE;
 +UNIV_INTERN ibool	srv_fake_write	= FALSE;
 +UNIV_INTERN ibool	srv_apply_log_only = FALSE;
++UNIV_INTERN ibool	srv_backup_mode = FALSE;
 +
  UNIV_INTERN long long	srv_ibuf_max_size = 0;
  UNIV_INTERN ulint	srv_ibuf_active_contract = 0; /* 0:disable 1:enable */
  UNIV_INTERN ulint	srv_ibuf_accel_rate = 100;
-@@ -1065,7 +1064,7 @@
+@@ -1065,7 +1065,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -1046,7 +1129,7 @@
  }
  
  /*********************************************************************//**
-@@ -1076,6 +1075,7 @@
+@@ -1076,6 +1076,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -1054,7 +1137,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1089,6 +1089,7 @@
+@@ -1089,6 +1090,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -1062,7 +1145,7 @@
  }
  
  /*********************************************************************//**
-@@ -2570,36 +2571,6 @@
+@@ -2570,36 +2572,6 @@
  		old_sema = sema;
  	}
  
@@ -1143,7 +1226,6 @@
  
  	if (srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes < tablespace_size_in_header) {
--
 +		/* extend table space size aligning with header */
 +		ulint	actual_size;
 +		fil_extend_space_to_desired_size(&actual_size, 0, tablespace_size_in_header);
@@ -1154,7 +1236,7 @@
 +				(ulong) actual_size,
 +				(ulong) tablespace_size_in_header);
 +		}
-+
+ 
 +#ifdef UNDEFINED
  		fprintf(stderr,
  			"InnoDB: Error: tablespace size stored in header"
@@ -1431,3 +1513,14 @@
  
  	UNIV_MEM_FREE(buf, n);
  }
+--- a/configure.in
++++ b/configure.in
+@@ -22,7 +22,7 @@
+ AM_INIT_AUTOMAKE([1.9 tar-ustar])
+ AC_PROG_LIBTOOL
+ 
+-AM_CONFIG_HEADER([include/config.h])
++AC_CONFIG_HEADERS([include/config.h])
+ 
+ # Request support for automake silent-rules if available.
+ # Default to verbose output. One can use the configure-time
 
=== modified file 'patches/xtradb55.patch'
--- patches/xtradb55.patch	2013-04-16 14:29:50 +0000
+++ patches/xtradb55.patch	2013-05-08 05:16:27 +0000
@@ -325,7 +325,60 @@
  	if (size < FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) {
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
-@@ -4299,7 +4402,7 @@
+@@ -4288,7 +4391,51 @@
+ 
+ 	fil_node_create(filepath, 0, space_id, FALSE);
+ func_exit:
+-	os_file_close(file);
++	/* We reuse file handles on the backup stage in XtraBackup to avoid
++	inconsistencies between the file name and the actual tablespace contents
++	if a DDL occurs between a fil_load_single_table_tablespaces() call and
++	the actual copy operation. */
++	if (srv_backup_mode) {
++
++		fil_node_t*	node;
++		fil_space_t*	space;
++
++		mutex_enter(&fil_system->mutex);
++
++		space = fil_space_get_by_id(space_id);
++
++		if (space) {
++			node = UT_LIST_GET_LAST(space->chain);
++
++			/* The handle will be closed by xtrabackup in
++			xtrabackup_copy_datafile(). We set node->open to TRUE to
++			make sure no one calls fil_node_open_file()
++			(i.e. attempts to reopen the tablespace by name) during
++			the backup stage. */
++
++			node->open = TRUE;
++			node->handle = file;
++
++			/* The following is copied from fil_node_open_file() to
++			pass fil_system validity checks. We cannot use
++			fil_node_open_file() directly, as that would re-open the
++			file by name and create another file handle. */
++
++			fil_system->n_open++;
++
++			if (space->purpose == FIL_TABLESPACE &&
++			    space->id != 0) {
++
++				/* Put the node to the LRU list */
++				UT_LIST_ADD_FIRST(LRU, fil_system->LRU, node);
++			}
++		}
++
++		mutex_exit(&fil_system->mutex);
++	} else {
++
++		os_file_close(file);
++	}
+ 	ut_free(buf2);
+ 	mem_free(filepath);
+ }
+@@ -4299,7 +4446,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 */
@@ -334,7 +387,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4343,7 +4446,7 @@
+@@ -4343,7 +4490,7 @@
  @return	DB_SUCCESS or error number */
  UNIV_INTERN
  ulint
@@ -343,7 +396,7 @@
  /*===================================*/
  {
  	int		ret;
-@@ -4399,7 +4502,9 @@
+@@ -4399,7 +4546,9 @@
  			dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -354,7 +407,7 @@
  
  		if (dbdir != NULL) {
  			/* printf("Opened dir %s\n", dbinfo.name); */
-@@ -4425,8 +4530,11 @@
+@@ -4425,8 +4574,11 @@
  						   ".ibd")) {
  					/* The name ends in .ibd; try opening
  					the file */
@@ -367,7 +420,7 @@
  				}
  next_file_item:
  				ret = fil_file_readdir_next_file(&err,
-@@ -4598,15 +4706,97 @@
+@@ -4598,15 +4750,97 @@
  				"InnoDB: in InnoDB data dictionary"
  				" has tablespace id %lu,\n"
  				"InnoDB: but tablespace with that id"
@@ -473,7 +526,7 @@
  		} else {
  			ut_print_timestamp(stderr);
  			fputs("  InnoDB: Error: table ", stderr);
-@@ -5005,7 +5195,7 @@
+@@ -5005,7 +5239,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -482,7 +535,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -5025,10 +5215,13 @@
+@@ -5025,10 +5259,13 @@
  	}
  
  	if (node->open == FALSE) {
@@ -497,7 +550,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -5041,6 +5234,8 @@
+@@ -5041,6 +5278,8 @@
  	}
  
  	node->n_pending++;
@@ -506,7 +559,7 @@
  }
  
  /********************************************************************//**
-@@ -5240,6 +5435,16 @@
+@@ -5240,6 +5479,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -660,7 +713,7 @@
  extern char	srv_adaptive_flushing;
  
  
-@@ -247,6 +246,10 @@
+@@ -247,6 +246,11 @@
  extern ulint	srv_dict_size_limit;
  
  extern ulint	srv_lazy_drop_table;
@@ -668,6 +721,7 @@
 +extern ibool	srv_read_only;
 +extern ibool	srv_fake_write;
 +extern ibool	srv_apply_log_only;
++extern ibool	srv_backup_mode;
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
@@ -790,7 +844,35 @@
  ibool
  log_block_checksum_is_ok_or_old_format(
  /*===================================*/
-@@ -2380,7 +2380,7 @@
+@@ -1842,6 +1842,18 @@
+ 			ulint	zip_size = fil_space_get_zip_size(space);
+ 			ulint	page_no = recv_addr->page_no;
+ 
++			/* By now we have replayed all DDL log records from the
++			current batch. Check if the space ID is still valid in
++			the entry being processed, and ignore it if it is not.*/
++			if (fil_tablespace_deleted_or_being_deleted_in_mem(space, -1)) {
++
++				ut_a(recv_sys->n_addrs);
++
++				recv_addr->state = RECV_PROCESSED;
++				recv_sys->n_addrs--;
++
++				goto next;
++			}
+ 			if (recv_addr->state == RECV_NOT_PROCESSED) {
+ 				if (!has_printed) {
+ 					ut_print_timestamp(stderr);
+@@ -1875,7 +1887,7 @@
+ 
+ 				mutex_enter(&(recv_sys->mutex));
+ 			}
+-
++next:
+ 			recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
+ 		}
+ 
+@@ -2380,7 +2392,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -799,7 +881,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2403,7 +2403,7 @@
+@@ -2403,7 +2415,7 @@
  					ut_error;
  				}
  			}
@@ -808,7 +890,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2820,8 +2820,11 @@
+@@ -2820,8 +2832,11 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -822,7 +904,7 @@
  		}
  	}
  
-@@ -2926,7 +2929,7 @@
+@@ -2926,7 +2941,7 @@
  		"InnoDB: Reading tablespace information"
  		" from the .ibd files...\n");
  
@@ -831,7 +913,7 @@
  
  	/* If we are using the doublewrite method, we will
  	check if there are half-written pages in data files,
-@@ -2935,12 +2938,14 @@
+@@ -2935,12 +2950,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -847,7 +929,7 @@
  	}
  }
  
-@@ -3109,6 +3114,7 @@
+@@ -3109,6 +3126,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -855,7 +937,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3474,6 +3480,7 @@
+@@ -3474,6 +3492,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. */
@@ -1017,7 +1099,7 @@
  
  /* Try to flush dirty pages so as to avoid IO bursts at
  the checkpoints. */
-@@ -457,6 +451,10 @@
+@@ -457,6 +451,11 @@
  UNIV_INTERN ulint	srv_dict_size_limit = 0;
  
  UNIV_INTERN ulint	srv_lazy_drop_table = 0;
@@ -1025,10 +1107,11 @@
 +UNIV_INTERN ibool	srv_read_only   = FALSE;
 +UNIV_INTERN ibool	srv_fake_write  = FALSE;
 +UNIV_INTERN ibool	srv_apply_log_only = FALSE;
++UNIV_INTERN ibool	srv_backup_mode = FALSE;
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -1137,7 +1135,7 @@
+@@ -1137,7 +1136,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -1037,7 +1120,7 @@
  }
  
  /*********************************************************************//**
-@@ -1148,6 +1146,7 @@
+@@ -1148,6 +1147,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -1045,7 +1128,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1161,6 +1160,7 @@
+@@ -1161,6 +1161,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -1053,7 +1136,7 @@
  }
  
  /*********************************************************************//**
-@@ -1886,7 +1886,7 @@
+@@ -1886,7 +1887,7 @@
  		}
  
  		/* Record the lock wait time for this thread */
@@ -1062,7 +1145,7 @@
  	}
  
  	if (trx->was_chosen_as_deadlock_victim) {
-@@ -2842,36 +2842,6 @@
+@@ -2842,36 +2843,6 @@
  		old_sema = sema;
  	}
  
 
=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2013-05-03 14:12:58 +0000
+++ src/xtrabackup.cc	2013-05-08 05:16:27 +0000
@@ -4035,6 +4035,55 @@
 
 }
 
+/**********************************************************************//**
+Closes a file. */
+static
+void
+xb_fil_node_close_file(
+/*===================*/
+	fil_node_t*	node)	/*!< in: file node */
+{
+	ibool	ret;
+
+	mutex_enter(&fil_system->mutex);
+
+	ut_ad(node);
+	ut_a(node->n_pending == 0);
+	ut_a(node->n_pending_flushes == 0);
+#if MYSQL_VERSION_ID >= 50600
+	ut_a(!node->being_extended);
+#endif
+
+	if (!node->open) {
+
+		mutex_exit(&fil_system->mutex);
+
+		return;
+	}
+
+	ret = os_file_close(node->handle);
+	ut_a(ret);
+
+	node->open = FALSE;
+
+	ut_a(fil_system->n_open > 0);
+	fil_system->n_open--;
+#if MYSQL_VERSION_ID >= 50600
+	fil_n_file_opened--;
+#endif
+
+	if (node->space->purpose == FIL_TABLESPACE &&
+	    !trx_sys_sys_space(node->space->id)) {
+
+		ut_a(UT_LIST_GET_LEN(fil_system->LRU) > 0);
+
+		/* The node is in the LRU list, remove it */
+		UT_LIST_REMOVE(LRU, fil_system->LRU, node);
+	}
+
+	mutex_exit(&fil_system->mutex);
+}
+
 /* TODO: We may tune the behavior (e.g. by fil_aio)*/
 #define COPY_CHUNK 64
 
@@ -4042,7 +4091,6 @@
 my_bool
 xtrabackup_copy_datafile(fil_node_t* node, uint thread_n, ds_ctxt_t *ds_ctxt)
 {
-	os_file_t	src_file = XB_FILE_UNDEFINED;
 	MY_STAT		src_stat;
 	char		dst_name[FN_REFLEN];
 	char		meta_name[FN_REFLEN];
@@ -4093,34 +4141,47 @@
 	strncpy(dst_name, xb_get_relative_path(node_path, is_system),
 		sizeof(dst_name));
 
-	/* open src_file*/
-	src_file = xb_file_create_no_error_handling(node_path,
-						    OS_FILE_OPEN,
-						    OS_FILE_READ_ONLY,
-						    &success);
-	if (!success) {
-		/* The following call prints an error message */
-		os_file_get_last_error(TRUE);
-
-		msg("[%02u] xtrabackup: Warning: cannot open %s\n"
-		    "[%02u] xtrabackup: Warning: We assume the "
-		    "table was dropped or renamed during "
-		    "xtrabackup execution and ignore the file.\n",
-		    thread_n, node_path, thread_n);
-		goto skip;
+	/* We should already have a tablespace handle created by
+	fil_load_single_table_tablespace() unless it is a system tablespace. */
+	if (is_system) {
+
+		node->handle =
+			xb_file_create_no_error_handling(node_path,
+							 OS_FILE_OPEN,
+							 OS_FILE_READ_ONLY,
+							 &success);
+		if (!success) {
+
+			msg("[%02u] xtrabackup: error: cannot open "
+			    "system tablespace %s\n", thread_n, node_path);
+			goto error;
+		}
+
+		mutex_enter(&fil_system->mutex);
+
+		node->open = TRUE;
+
+		fil_system->n_open++;
+#if MYSQL_VERSION_ID >= 50600
+		fil_n_file_opened++;
+#endif
+
+		mutex_exit(&fil_system->mutex);
 	}
 
-	xb_file_set_nocache(src_file, node_path, "OPEN");
+	ut_ad(node->open);
+
+	xb_file_set_nocache(node->handle, node_path, "OPEN");
 
 #ifdef USE_POSIX_FADVISE
-	posix_fadvise(src_file, 0, 0, POSIX_FADV_SEQUENTIAL);
+	posix_fadvise(node->handle, 0, 0, POSIX_FADV_SEQUENTIAL);
 #endif
 
 #ifndef INNODB_VERSION_SHORT
 	page_size = UNIV_PAGE_SIZE;
 	page_size_shift = UNIV_PAGE_SIZE_SHIFT;
 #else
-	info.zip_size = xb_get_zip_size(src_file);
+	info.zip_size = xb_get_zip_size(node->handle);
 	if (info.zip_size == ULINT_UNDEFINED) {
 		goto skip;
 	} else if (info.zip_size) {
@@ -4164,10 +4225,10 @@
 	} else
 		info.page_size = 0;
 
-	if (my_stat(node_path, &src_stat, MYF(MY_WME)) == NULL) {
+	if (my_fstat(node->handle, &src_stat, MYF(MY_WME))) {
 		msg("[%02u] xtrabackup: Warning: cannot stat %s\n",
 		    thread_n, node_path);
-		goto skip;
+		goto error;
 	}
 	dstfile = ds->open(ds_ctxt, dst_name, &src_stat);
 	if (dstfile == NULL) {
@@ -4197,7 +4258,7 @@
 					     * page_size + UNIV_PAGE_SIZE));
 	page = static_cast<byte *>(ut_align(buf2, UNIV_PAGE_SIZE));
 
-	success = xb_os_file_read(src_file, page, 0, UNIV_PAGE_SIZE);
+	success = xb_os_file_read(node->handle, page, 0, UNIV_PAGE_SIZE);
 	if (!success) {
 		goto error;
 	}
@@ -4218,13 +4279,13 @@
 read_retry:
 		xtrabackup_io_throttling();
 
-		success = xb_os_file_read(src_file, page, offset, chunk);
+		success = xb_os_file_read(node->handle, page, offset, chunk);
 		if (!success) {
 			goto error;
 		}
 
 #ifdef USE_POSIX_FADVISE
-		posix_fadvise(src_file, 0, 0, POSIX_FADV_DONTNEED);
+		posix_fadvise(node->handle, 0, 0, POSIX_FADV_DONTNEED);
 #endif
 
 		/* check corruption and retry */
@@ -4349,17 +4410,17 @@
 
 	/* close */
 	msg("[%02u]        ...done\n", thread_n);
-	if (!node->open) {
-		os_file_close(src_file);
-	}
+
+	xb_fil_node_close_file(node);
+
 	ds->close(dstfile);
 	if (incremental_buffer_base)
 		ut_free(incremental_buffer_base);
 	ut_free(buf2);
 	return(FALSE);
 error:
-	if (src_file != XB_FILE_UNDEFINED && !node->open)
-		os_file_close(src_file);
+	xb_fil_node_close_file(node);
+
 	if (dstfile != NULL)
 		ds->close(dstfile);
 	if (incremental_buffer_base)
@@ -4371,8 +4432,8 @@
 	return(TRUE); /*ERROR*/
 
 skip:
-	if (src_file != XB_FILE_UNDEFINED && !node->open)
-		os_file_close(src_file);
+	xb_fil_node_close_file(node);
+
 	if (dstfile != NULL)
 		ds->close(dstfile);
 	if (incremental_buffer_base)
@@ -4789,7 +4850,7 @@
 		    srv_n_file_io_threads,
 		    SRV_MAX_N_PENDING_SYNC_IOS);
 
-	fil_init(srv_max_n_open_files);
+	fil_init(LONG_MAX);
 #else
 #if MYSQL_VERSION_ID >= 50600
 	srv_n_file_io_threads = srv_n_read_io_threads;
@@ -4803,8 +4864,7 @@
 		    srv_n_write_io_threads,
 		    SRV_MAX_N_PENDING_SYNC_IOS);
 
-	fil_init(srv_file_per_table ? 50000 : 5000,
-		 srv_max_n_open_files);
+	fil_init(srv_file_per_table ? 50000 : 5000, LONG_MAX);
 #endif
 
 	fsp_init();
@@ -4848,11 +4908,6 @@
 		return(DB_ERROR);
 	}
 
-	err = fil_load_single_table_tablespaces(xb_check_if_open_tablespace);
-	if (err != DB_SUCCESS) {
-		return(err);
-	}
-
 #if MYSQL_VERSION_ID >= 50600
 	/* Add separate undo tablespaces to fil_system */
 
@@ -4865,6 +4920,15 @@
 	}
 #endif
 
+	/* It is important to call fil_load_single_table_tablespace() after
+	srv_undo_tablespaces_init(), because fil_is_user_tablespace_id() *
+	relies on srv_undo_tablespaces_open to be properly initialized */
+
+	err = fil_load_single_table_tablespaces(xb_check_if_open_tablespace);
+	if (err != DB_SUCCESS) {
+		return(err);
+	}
+
 	return(DB_SUCCESS);
 }
 
@@ -5278,6 +5342,8 @@
 	srv_read_only = TRUE;
 #endif
 
+	srv_backup_mode = TRUE;
+
 	/* initialize components */
         if(innodb_init_param())
                 exit(EXIT_FAILURE);
 
=== modified file 'test/inc/common.sh'
--- test/inc/common.sh	2013-05-01 20:09:28 +0000
+++ test/inc/common.sh	2013-05-08 05:16:27 +0000
@@ -442,6 +442,25 @@
     $MYSQL $MYSQL_ARGS -Ns -e "CHECKSUM TABLE $2 EXTENDED" $1 | awk {'print $2'}
 }
 
+##########################################################################
+# Dumps a given database using mysqldump                                 #
+##########################################################################
+function record_db_state()
+{
+    $MYSQLDUMP $MYSQL_ARGS -t --compact $1 >"$topdir/tmp/$1_old.sql"
+}
+
+
+##########################################################################
+# Compares the current dump of a given database with a state previously  #
+# captured with record_db_state().					 #
+##########################################################################
+function verify_db_state()
+{
+    $MYSQLDUMP $MYSQL_ARGS -t --compact $1 >"$topdir/tmp/$1_new.sql"
+    diff -u "$topdir/tmp/$1_old.sql" "$topdir/tmp/$1_new.sql"
+}
+
 ########################################################################
 # Workarounds for a bug in grep 2.10 when grep -q file > file would
 # result in a failure.
 
=== renamed file 'test/t/bug722638.sh' => 'test/t/ddl.sh'
--- test/t/bug722638.sh	2012-06-04 18:29:48 +0000
+++ test/t/ddl.sh	2013-05-08 05:16:27 +0000
@@ -1,7 +1,9 @@
-########################################################################
-# Bug #722638: xtrabackup: taking backup while tables are droped and 
+############################################################################
+# Bug #722638: xtrabackup: taking backup while tables are droped and
 #              created breaks backup
-########################################################################
+#
+# Bug #1079700: Issues with renaming/rotating tables during the backup stage
+############################################################################
 
 . inc/common.sh
 
@@ -10,7 +12,11 @@
     exit $SKIPPED_EXIT_CODE
 fi
 
-start_server --innodb_file_per_table
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_file_per_table
+"
+
+start_server
 
 run_cmd $MYSQL $MYSQL_ARGS test <<EOF
 
@@ -26,8 +32,19 @@
 CREATE TABLE t4_old(a INT) ENGINE=InnoDB;
 INSERT INTO t4_old VALUES (1), (2), (3);
 
+CREATE TABLE t5(a INT) ENGINE=InnoDB;
+INSERT INTO t5 VALUES (1), (2), (3);
+
+CREATE TABLE t6(c CHAR(1)) ENGINE=InnoDB;
+INSERT INTO t6 VALUES ('a'), ('b'), ('c');
+
 EOF
 
+# Make a checkpoint so that original tablespace creation events are not in the
+# xtrabackup log
+shutdown_server
+start_server
+
 mkdir -p $topdir/backup
 
 # Backup
@@ -70,13 +87,18 @@
 ALTER TABLE t4_old RENAME t4;
 INSERT INTO t4 VALUES (7), (8), (9);
 
+INSERT INTO t5 VALUES (4), (5), (6);
+INSERT INTO t6 VALUES ('d'), ('e'), ('f');
+
+# Rotate tables t5 and t6
+RENAME TABLE t5 TO temp, t6 TO t5, temp TO t6;
+
+INSERT INTO t5 VALUES ('g'), ('h'), ('i');
+INSERT INTO t6 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`
+record_db_state test
 
 # Resume xtrabackup
 vlog "Resuming xtrabackup"
@@ -84,6 +106,8 @@
 
 run_cmd wait $job_pid
 
+# exit 1
+
 # Prepare
 xtrabackup --datadir=$mysql_datadir --prepare --target-dir=$topdir/backup
 
@@ -94,25 +118,7 @@
     $mysql_datadir/test/*.ibd
 cp -r $topdir/backup/* $mysql_datadir
 
-start_server --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
+start_server
+
+# Verify backup
+verify_db_state test
 
=== modified file 'test/testrun.sh'
--- test/testrun.sh	2013-04-27 18:46:54 +0000
+++ test/testrun.sh	2013-05-08 05:16:27 +0000
@@ -70,6 +70,7 @@
     find_program MYSQLD mysqld $MYSQL_BASEDIR/bin/ $MYSQL_BASEDIR/libexec
     find_program MYSQL mysql $MYSQL_BASEDIR/bin
     find_program MYSQLADMIN mysqladmin $MYSQL_BASEDIR/bin
+    find_program MYSQLDUMP mysqldump $MYSQL_BASEDIR/bin
 
     # Check if we are running from a source tree and, if so, set PATH 
     # appropriately
@@ -85,9 +86,10 @@
     else
 	LD_LIBRARY_PATH=$MYSQL_BASEDIR/lib/mysql:$LD_LIBRARY_PATH
     fi
+    DYLD_LIBRARY_PATH="$LD_LIBRARY_PATH"
 
     export TEST_BASEDIR PORT_BASE TAR MYSQL_BASEDIR MYSQL MYSQLD MYSQLADMIN \
-MYSQL_INSTALL_DB PATH LD_LIBRARY_PATH
+MYSQL_INSTALL_DB PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH MYSQLDUMP
 }
 
 
 
=== modified file 'utils/build.sh'
--- utils/build.sh	2013-04-30 07:33:04 +0000
+++ utils/build.sh	2013-05-08 05:16:27 +0000
@@ -44,7 +44,13 @@
 -DUNIV_DEBUG_THREAD_CREATION -DUNIV_DEBUG_LOCK_VALIDATE -DUNIV_DEBUG_PRINT \
 -DUNIV_DEBUG_FILE_ACCESS -DUNIV_SEARCH_DEBUG -DUNIV_LOG_LSN_DEBUG \
 -DUNIV_ZIP_DEBUG -DUNIV_AHI_DEBUG -DUNIV_SQL_DEBUG -DUNIV_AIO_DEBUG \
--DUNIV_LRU_DEBUG -DUNIV_BUF_DEBUG -DUNIV_HASH_DEBUG -DUNIV_LIST_DEBUG -DUNIV_IBUF_DEBUG"
+-DUNIV_LRU_DEBUG -DUNIV_BUF_DEBUG -DUNIV_HASH_DEBUG -DUNIV_IBUF_DEBUG"
+
+    if [ "$type" = "innodb56" ]
+    then
+	innodb_extra_debug="$innodb_extra_debug -DUNIV_LIST_DEBUG"
+    fi
+
     export CFLAGS="$CFLAGS -g -O0 $innodb_extra_debug -DSAFE_MUTEX -DSAFEMALLOC"
     export CXXFLAGS="$CXXFLAGS -g -O0 $innodb_extra_debug -DSAFE_MUTEX -DSAFEMALLOC"
     extra_config_51="--with-debug=full"