Merge lp:~akopytov/percona-xtrabackup/support-remote-tablespaces-2.1 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

    Implementation of
    https://blueprints.launchpad.net/percona-xtrabackup/+spec/support-remote-tablespaces

    On backup, copy both .isl and .ibd files for remote tablespaces. Remote
    .ibd files are copied to the corresponding database directory under the
    backup root directory as if there were local tablespaces.

    On prepare, ignore .isl files and possible inconsistencies of tablespace
    locations with the data dictionary, i.e. handle all tablespaces as local
    ones.

    On restore, innobackupex checks if there's an .isl file corresponding to
    the .ibd file being copied. If so, it uses the original remote
    tablespace location instead of the default location under the data
    directory.

    Changes in the ib_part_* tests are necessery to support 2 additional SYS_*
    tables in the data dictionary (SYS_TABLESPACES and SYS_DATAFILES). To
    avoid dependency on the number of SYS_* tables, they are now excluded
    from the 'xtrabackup --stats' output, i.e. only user tables are counted.

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

[Alexey Kopytov (akopytov)]

Same spurious issues as in https://code.launchpad.net/~akopytov/percona-xtrabackup/bug1169169-2.1/+merge/160273

[Laurynas Biveinis (laurynas-biveinis)]

Approving as automerge

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-04-23 10:01:10 +0000
+++ innobackupex	2013-04-23 10:01:10 +0000
@@ -236,6 +236,7 @@
 my $copy_dir_dst;
 my $copy_dir_exclude_regexp;
 my $copy_dir_overwrite;
+my $copy_dir_resolve_isl;
 
 ######################################################################
 # program execution begins here
@@ -607,11 +608,31 @@
 #
 sub process_file {
     my $process_func = shift;
+    my $dst_path;
 
     if (/$copy_dir_exclude_regexp/) {
 	return;
     }
-    (my $dst_path = $File::Find::name) =~ s/^$copy_dir_src/$copy_dir_dst/;
+
+    # If requested, check if there is a "link" in the .isl file for an InnoDB
+    # tablespace and use it as a destination path.
+    if ($copy_dir_resolve_isl && $File::Find::name =~ m/\.ibd$/) {
+        my $isl_path;
+
+        ($isl_path = $File::Find::name) =~ s/\.ibd$/.isl/;
+        if (-e "$isl_path") {
+            my @lines;
+            print STDERR "Found an .isl file for $File::Find::name\n";
+            file_to_array($isl_path, \@lines);
+            $dst_path = $lines[0];
+            print STDERR "Using $dst_path as the destination path\n";
+        }
+    }
+
+    if (! defined $dst_path) {
+        ($dst_path = $File::Find::name) =~ s/^$copy_dir_src/$copy_dir_dst/;
+    }
+
     if (-d "$File::Find::name") {
 	# Create the directory in the destination if necessary
 	if (! -e "$dst_path") {
@@ -646,14 +667,16 @@
 }
 
 #
-# copy_dir_recursively subroutine does a recursive copy of a specified
-# directory excluding files matching a specifies regexp. If $overwrite
-# is 1, it overwrites the existing files.
+# copy_dir_recursively subroutine does a recursive copy of a specified directory
+# excluding files matching a specifies regexp. If $overwrite is 1, it overwrites
+# the existing files. If $resolve_isl is 1, it also resolves InnoDB .isl files,
+# i.e. copies to the absolute path specified in the corresponding .isl file
+# rather than the default location
 #
 # SYNOPSIS 
 #
 #     copy_dir_recursively($src_dir, $dst_dir, $exclude_regexp,
-#                          $overwrite);
+#                          $overwrite, $resolve_isl);
 #
 # TODO
 #
@@ -665,6 +688,7 @@
     $copy_dir_dst = File::Spec->canonpath(shift);
     $copy_dir_exclude_regexp = shift;
     $copy_dir_overwrite = shift;
+    $copy_dir_resolve_isl = shift;
 
     find(\&copy_file_callback, $copy_dir_src);
 }
@@ -675,7 +699,7 @@
 # SYNOPSIS
 #
 #     move_dir_recursively($src_dir, $dst_dir, $exclude_regexp,
-#                          $overwrite);
+#                          $overwrite, $resolve_isl);
 #
 # TODO
 #
@@ -687,6 +711,7 @@
     $copy_dir_dst = File::Spec->canonpath(shift);
     $copy_dir_exclude_regexp = shift;
     $copy_dir_overwrite = shift;
+    $copy_dir_resolve_isl = shift;
 
     find(\&move_file_callback, $copy_dir_src);
 }
@@ -711,13 +736,9 @@
         '\.\.?|backup-my\.cnf|xtrabackup_logfile|' .
         'xtrabackup_binary|xtrabackup_binlog_info|xtrabackup_checkpoints|' .
         '.*\.qp|' .
-<<<<<<< TREE
         '.*\.pmap|.*\.tmp|' .
-	$iblog_files;
-=======
         $iblog_files . '|'.
         $ibundo_files;
->>>>>>> MERGE-SOURCE
     my $compressed_data_file = '.*\.ibz$';
     my $file;
     my $backup_innodb_data_file_path;
@@ -791,7 +812,7 @@
     my $excluded_regexp = '^(' . $excluded_files . ')$';
     print STDERR "$prefix Starting to $operation files in '$backup_dir'\n"; 
     print STDERR "$prefix back to original data directory '$orig_datadir'\n";
-    &$move_or_copy_dir($backup_dir, $orig_datadir, $excluded_regexp, 0);
+    &$move_or_copy_dir($backup_dir, $orig_datadir, $excluded_regexp, 0, 1);
 
     # copy InnoDB data files to original InnoDB data directory
     print STDERR "\n$prefix Starting to $operation InnoDB system tablespace\n";
@@ -927,7 +948,7 @@
 	copy_dir_recursively($option_incremental_dir, $backup_dir,
 			     '^(\.\.?|backup-my\.cnf|xtrabackup_logfile|' .
 			     'xtrabackup_binary|xtrabackup_checkpoints|' .
-			     '.*\.delta|.*\.meta|ib_logfile.*)$', 1);
+			     '.*\.delta|.*\.meta|ib_logfile.*)$', 1, 0);
         # If the latest backup has no file, we need to remove the old
         # xtrabackup_slave_info file, because it is out of date
         # TODO: this will not be needed when bug #856400 is fixed.
@@ -2061,7 +2082,7 @@
 
 
 #
-# backup_files subroutine copies .frm, .MRG, .MYD and .MYI files to 
+# backup_files subroutine copies .frm, .isl, .MRG, .MYD and .MYI files to 
 # backup directory.
 #
 sub backup_files {
@@ -2070,7 +2091,7 @@
     my @list;
     my $file;
     my $database;
-    my $wildcard = '*.{frm,MYD,MYI,MAD,MAI,MRG,TRG,TRN,ARM,ARZ,CSM,CSV,opt,par}';
+    my $wildcard = '*.{frm,isl,MYD,MYI,MAD,MAI,MRG,TRG,TRN,ARM,ARZ,CSM,CSV,opt,par}';
     my $rsync_file_list;
     my $operation;
     my $rsync_tmpfile_pass1 = "$option_tmpdir/xtrabackup_rsyncfiles_pass1";
@@ -2123,7 +2144,7 @@
 
         # copy files of this database
 	opendir(DBDIR, "$source_dir/$database");
-	@list = grep(/\.(frm|MYD|MYI|MAD|MAI|MRG|TRG|TRN|ARM|ARZ|CSM|CSV|opt|par)$/, readdir(DBDIR));
+	@list = grep(/\.(frm|isl|MYD|MYI|MAD|MAI|MRG|TRG|TRN|ARM|ARZ|CSM|CSV|opt|par)$/, readdir(DBDIR));
 	closedir DBDIR;
         $file_c = @list;
         if ($file_c <= $backup_file_print_limit) {

=== modified file 'patches/innodb56.patch'
--- patches/innodb56.patch	2013-04-23 10:01:10 +0000
+++ patches/innodb56.patch	2013-04-23 10:01:10 +0000
@@ -334,7 +334,25 @@
  /********************************************************************//**
  Tries to open a single-table tablespace and optionally checks that the
  space id in it is correct. If this does not succeed, print an error message
-@@ -3712,11 +3827,15 @@
+@@ -3569,6 +3684,9 @@
+ 	in the default location. If it is remote, it should not be here. */
+ 	def.filepath = fil_make_ibd_name(tablename, false);
+ 
++	/* We skip SYS_DATAFILES validation and remote tablespaces discovery for
++	XtraBackup, as all tablespaces are local for XtraBackup recovery. */
++#if 0
+ 	/* The path_in was read from SYS_DATAFILES. */
+ 	if (path_in) {
+ 		if (strcmp(def.filepath, path_in)) {
+@@ -3616,6 +3734,7 @@
+ 			tablespaces_found++;
+ 		}
+ 	}
++#endif
+ 
+ 	/* Always look for a file at the default location. */
+ 	ut_a(def.filepath);
+@@ -3712,11 +3831,15 @@
  		/* The following call prints an error message */
  		os_file_get_last_error(true);
  
@@ -351,7 +369,25 @@
  
  		err = DB_CORRUPTION;
  
-@@ -4135,7 +4254,7 @@
+@@ -4018,6 +4141,9 @@
+ # endif /* !UNIV_HOTBACKUP */
+ #endif
+ 
++	/* Ignore .isl files on XtraBackup recovery. All tablespaces must be
++	local. */
++	if (!recv_recovery_on) {
+ 	/* Check for a link file which locates a remote tablespace. */
+ 	remote.success = fil_open_linked_file(
+ 		tablename, &remote.filepath, &remote.file);
+@@ -4030,6 +4156,7 @@
+ 			mem_free(remote.filepath);
+ 		}
+ 	}
++	}
+ 
+ 
+ 	/* Try to open the tablespace in the datadir. */
+@@ -4135,7 +4262,7 @@
  	cannot be ok. */
  	ulong minimum_size = FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE;
  	if (size < minimum_size) {
@@ -360,7 +396,7 @@
  		ib_logf(IB_LOG_LEVEL_ERROR,
  			"The size of single-table tablespace file %s "
  			"is only " UINT64PF ", should be at least %lu!",
-@@ -4263,7 +4382,7 @@
+@@ -4263,7 +4390,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 */
@@ -369,7 +405,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4359,7 +4478,9 @@
+@@ -4359,7 +4486,9 @@
  			    "%s/%s", fil_path_to_mysql_datadir, dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -380,7 +416,23 @@
  
  		if (dbdir != NULL) {
  
-@@ -4538,6 +4659,7 @@
+@@ -4380,9 +4509,13 @@
+ 				    && (0 == strcmp(fileinfo.name
+ 						   + strlen(fileinfo.name) - 4,
+ 						   ".ibd")
+-					|| 0 == strcmp(fileinfo.name
++					/* Ignore .isl files on XtraBackup
++					recovery, all tablespaces must be
++					local. */
++					|| (!recv_recovery_on &&
++					    0 == strcmp(fileinfo.name
+ 						   + strlen(fileinfo.name) - 4,
+-						   ".isl"))) {
++							".isl")))) {
+ 					/* The name ends in .ibd or .isl;
+ 					try opening the file */
+ 					fil_load_single_table_tablespace(
+@@ -4538,6 +4671,7 @@
  {
  	fil_space_t*	fnamespace;
  	fil_space_t*	space;
@@ -388,7 +440,7 @@
  
  	ut_ad(fil_system);
  
-@@ -4615,6 +4737,10 @@
+@@ -4615,6 +4749,10 @@
  		if (fnamespace == NULL) {
  			if (print_error_if_does_not_exist) {
  				fil_report_missing_tablespace(name, id);
@@ -399,7 +451,7 @@
  			}
  		} else {
  			ut_print_timestamp(stderr);
-@@ -4638,6 +4764,10 @@
+@@ -4638,6 +4776,10 @@
  
  		mutex_exit(&fil_system->mutex);
  
@@ -410,7 +462,7 @@
  		return(FALSE);
  	}
  
-@@ -4728,6 +4858,7 @@
+@@ -4728,6 +4870,7 @@
  	ulint		page_size;
  	ulint		pages_added;
  	ibool		success;
@@ -418,7 +470,7 @@
  
  	ut_ad(!srv_read_only_mode);
  
-@@ -4772,13 +4903,17 @@
+@@ -4772,13 +4915,17 @@
  		goto retry;
  	}
  
@@ -437,7 +489,7 @@
  	start_page_no = space->size;
  	file_start_page_no = space->size - node->size;
  
-@@ -5024,7 +5159,7 @@
+@@ -5024,7 +5171,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -446,7 +498,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -5044,9 +5179,12 @@
+@@ -5044,9 +5191,12 @@
  	}
  
  	if (node->open == FALSE) {
@@ -460,7 +512,7 @@
  	}
  
  	if (node->n_pending == 0 && fil_space_belongs_in_lru(space)) {
-@@ -5058,6 +5196,8 @@
+@@ -5058,6 +5208,8 @@
  	}
  
  	node->n_pending++;
@@ -469,7 +521,7 @@
  }
  
  /********************************************************************//**
-@@ -5259,6 +5399,16 @@
+@@ -5259,6 +5411,16 @@
  
  	ut_ad(mode != OS_AIO_IBUF || space->purpose == FIL_TABLESPACE);
  
@@ -486,7 +538,7 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
-@@ -5290,7 +5440,11 @@
+@@ -5290,7 +5452,11 @@
  	}
  
  	/* Open file if closed */
@@ -499,7 +551,7 @@
  
  	/* Check that at least the start offset is within the bounds of a
  	single-table tablespace, including rollback tablespaces. */
-@@ -6164,6 +6318,7 @@
+@@ -6164,6 +6330,7 @@
  	return(err);
  }
  
@@ -507,7 +559,7 @@
  /****************************************************************//**
  Generate redo logs for swapping two .ibd files */
  UNIV_INTERN
-@@ -6187,4 +6342,4 @@
+@@ -6187,4 +6354,4 @@
  			 0, 0, new_name, old_name, &mtr);
  	mtr_commit(&mtr);
  }
@@ -847,10 +899,7 @@
  dberr_t
  open_or_create_data_files(
  /*======================*/
-<<<<<<< TREE
-@@ -2065,11 +2066,13 @@
-=======
-@@ -1204,12 +1204,16 @@
+@@ -1204,12 +1205,16 @@
  /********************************************************************
  Opens the configured number of undo tablespaces.
  @return	DB_SUCCESS or error code */
@@ -868,7 +917,7 @@
  	const ulint	n_conf_tablespaces,	/*!< in: configured undo
  						tablespaces */
  	ulint*		n_opened)		/*!< out: number of UNDO
-@@ -1225,6 +1229,7 @@
+@@ -1225,6 +1230,7 @@
  	*n_opened = 0;
  
  	ut_a(n_conf_tablespaces <= TRX_SYS_N_RSEGS);
@@ -876,7 +925,7 @@
  
  	memset(undo_tablespace_ids, 0x0, sizeof(undo_tablespace_ids));
  
-@@ -1258,12 +1263,13 @@
+@@ -1258,12 +1264,13 @@
  		}
  	}
  
@@ -894,7 +943,7 @@
  		n_undo_tablespaces = trx_rseg_get_n_undo_tablespaces(
  			undo_tablespace_ids);
  	} else {
-@@ -1369,7 +1375,7 @@
+@@ -1369,7 +1376,7 @@
  		ib_logf(IB_LOG_LEVEL_INFO, "Opened %lu undo tablespaces",
  			n_undo_tablespaces);
  
@@ -903,8 +952,7 @@
  			ib_logf(IB_LOG_LEVEL_WARN,
  				"Using the system tablespace for all UNDO "
  				"logging because innodb_undo_tablespaces=0");
-@@ -2065,11 +2071,13 @@
->>>>>>> MERGE-SOURCE
+@@ -2065,11 +2072,13 @@
  					max_flushed_lsn = min_flushed_lsn
  						= log_get_lsn();
  					goto files_checked;
@@ -918,10 +966,7 @@
  				}
  
  				/* opened all files */
-<<<<<<< TREE
-@@ -2326,6 +2329,10 @@
-=======
-@@ -2162,6 +2170,7 @@
+@@ -2162,6 +2171,7 @@
  
  	err = srv_undo_tablespaces_init(
  		create_new_db,
@@ -929,8 +974,7 @@
  		srv_undo_tablespaces,
  		&srv_undo_tablespaces_open);
  
-@@ -2326,6 +2335,10 @@
->>>>>>> MERGE-SOURCE
+@@ -2326,6 +2336,10 @@
  
  		recv_recovery_from_checkpoint_finish();
  
@@ -941,11 +985,7 @@
  		if (srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE) {
  			/* The following call is necessary for the insert
  			buffer to work with multiple tablespaces. We must
-<<<<<<< TREE
-@@ -2647,6 +2654,7 @@
-=======
-@@ -2647,6 +2660,7 @@
->>>>>>> MERGE-SOURCE
+@@ -2647,6 +2661,7 @@
  	    && srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes < tablespace_size_in_header) {
  
@@ -953,11 +993,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: tablespace size stored in header"
-<<<<<<< TREE
-@@ -2683,6 +2691,7 @@
-=======
-@@ -2683,6 +2697,7 @@
->>>>>>> MERGE-SOURCE
+@@ -2683,6 +2698,7 @@
  
  			return(DB_ERROR);
  		}
@@ -965,8 +1001,7 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-<<<<<<< TREE
-@@ -2707,6 +2716,10 @@
+@@ -2707,6 +2723,10 @@
  
  	os_fast_mutex_free(&srv_os_test_mutex);
  
@@ -977,10 +1012,7 @@
  	if (srv_print_verbose_log) {
  		ib_logf(IB_LOG_LEVEL_INFO,
  			"%s started; log sequence number " LSN_PF "",
-@@ -2739,6 +2752,7 @@
-=======
-@@ -2739,6 +2754,7 @@
->>>>>>> MERGE-SOURCE
+@@ -2739,6 +2759,7 @@
  		fts_optimize_init();
  	}
  
@@ -988,11 +1020,7 @@
  	srv_was_started = TRUE;
  
  	return(DB_SUCCESS);
-<<<<<<< TREE
-@@ -2794,7 +2808,7 @@
-=======
-@@ -2794,7 +2810,7 @@
->>>>>>> MERGE-SOURCE
+@@ -2794,7 +2815,7 @@
  		return(DB_SUCCESS);
  	}
  

=== modified file 'src/compact.cc'
--- src/compact.cc	2013-04-16 10:35:58 +0000
+++ src/compact.cc	2013-04-23 10:01:10 +0000
@@ -157,7 +157,7 @@
 			    "clustered index root page of tablespace %s. "
 			    "Will not be compacted.\n",
 			    cursor->thread_n,
-			    page_type, cursor->path);
+			    page_type, cursor->rel_path);
 
 			cp->skip = TRUE;
 

=== modified file 'src/fil_cur.cc'
--- src/fil_cur.cc	2013-04-16 10:35:58 +0000
+++ src/fil_cur.cc	2013-04-23 10:01:10 +0000
@@ -32,6 +32,48 @@
 /* Size of read buffer in pages */
 #define XB_FIL_CUR_PAGES 64
 
+/***********************************************************************
+Extracts the relative path ("database/table.ibd") of a tablespace from a
+specified possibly absolute path.
+
+For user tablespaces both "./database/table.ibd" and
+"/remote/dir/database/table.ibd" result in "database/table.ibd".
+
+For system tablepsaces (i.e. When is_system is TRUE) both "/remote/dir/ibdata1"
+and "./ibdata1" yield "ibdata1" in the output. */
+static
+const char *
+xb_get_relative_path(
+/*=================*/
+	const char*	path,		/*!< in: tablespace path (either
+			  		relative or absolute) */
+	ibool		is_system)	/*!< in: TRUE for system tablespaces,
+					i.e. when only the filename must be
+					returned. */
+{
+	const char *next;
+	const char *cur;
+	const char *prev;
+
+	prev = NULL;
+	cur = path;
+
+	while ((next = strchr(cur, SRV_PATH_SEPARATOR)) != NULL) {
+
+		prev = cur;
+		cur = next + 1;
+	}
+
+	if (is_system) {
+
+		return(cur);
+	} else {
+
+		return((prev == NULL) ? cur : prev);
+	}
+
+}
+
 /************************************************************************
 Open a source file cursor and initialize the associated read filter.
 
@@ -57,21 +99,15 @@
 	cursor->space_id = node->space->id;
 	cursor->is_system = trx_sys_sys_space(node->space->id);
 
-	/* Make the file path relative to the backup root,
-	i.e. "ibdata1" for system tablespace or database/table.ibd for
-	per-table spaces. */
-	if (cursor->is_system) {
-		char *next, *p;
+	strncpy(cursor->abs_path, node->space->name, sizeof(cursor->abs_path));
 
-		p = node->name;
-		while ((next = strstr(p, SRV_PATH_SEPARATOR_STR)) != NULL) {
-			p = next + 1;
-		}
-		strncpy(cursor->path, p, sizeof(cursor->path));
-	} else {
-		/* file per table style "./database/table.ibd" */
-		strncpy(cursor->path, node->name, sizeof(cursor->path));
-	}
+	/* Get the relative path for the destination tablespace name, i.e. the
+	one that can be appended to the backup root directory. Non-system
+	tablespaces may have absolute paths for remote tablespaces in MySQL
+	5.6+. We want to make "local" copies for the backup. */
+	strncpy(cursor->rel_path,
+		xb_get_relative_path(node->name, cursor->is_system),
+		sizeof(cursor->rel_path));
 
 	/* Open the file */
 
@@ -222,7 +258,7 @@
 					    "Error: failed to read page after "
 					    "10 retries. File %s seems to be "
 					    "corrupted.\n", cursor->thread_n,
-					    cursor->path);
+					    cursor->abs_path);
 					ret = XB_FIL_CUR_ERROR;
 					break;
 				}

=== modified file 'src/fil_cur.h'
--- src/fil_cur.h	2013-04-16 10:35:58 +0000
+++ src/fil_cur.h	2013-04-23 10:01:10 +0000
@@ -31,7 +31,10 @@
 
 struct xb_fil_cur_t {
 	os_file_t	file;		/*!< source file handle */
-	char		path[FN_REFLEN];/*!< normalized file path */
+	char		rel_path[FN_REFLEN];
+					/*!< normalized file path */
+	char		abs_path[FN_REFLEN];
+					/*!< absolute file path */
 	MY_STAT		statinfo;	/*!< information about the file */
 	ulint		zip_size;	/*!< compressed page size in bytes or 0
 					for uncompressed pages */

=== modified file 'src/innodb_int.h'
--- src/innodb_int.h	2013-04-16 10:35:58 +0000
+++ src/innodb_int.h	2013-04-23 10:01:10 +0000
@@ -212,8 +212,11 @@
 #  define ut_dulint_align_up(A, B) ((A + B - 1) & ~((ib_int64_t)B - 1))
 
 #ifndef XTRADB_BASED
-/* MySQL 5.1 - 5.6 */
-#define trx_sys_sys_space(id) (id == 0)
+# if MYSQL_VERSION_ID >= 50600
+#  define trx_sys_sys_space(id) (!fil_is_user_tablespace_id(id))
+# else
+#  define trx_sys_sys_space(id) (id == 0)
+# endif
 #endif /* XTRADB_BASED */
 
 #if (MYSQL_VERSION_ID >= 50500) && (MYSQL_VERSION_ID < 50600)
@@ -242,10 +245,8 @@
 
 #ifdef __WIN__
 #define SRV_PATH_SEPARATOR	'\\'
-#define SRV_PATH_SEPARATOR_STR	"\\"
 #else
 #define SRV_PATH_SEPARATOR	'/'
-#define SRV_PATH_SEPARATOR_STR	"/"
 #endif
 
 #ifndef UNIV_PAGE_SIZE_MAX

=== modified file 'src/write_filt.cc'
--- src/write_filt.cc	2013-03-22 09:14:31 +0000
+++ src/write_filt.cc	2013-04-23 10:01:10 +0000
@@ -91,7 +91,7 @@
 	if (!xb_write_delta_metadata(meta_name, &info)) {
 		msg("[%02u] xtrabackup: Error: "
 		    "failed to write meta info for %s\n",
-		    cursor->thread_n, cursor->path);
+		    cursor->thread_n, cursor->rel_path);
 		return(FALSE);
 	}
 

=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2013-04-23 10:01:10 +0000
+++ src/xtrabackup.cc	2013-04-23 10:01:10 +0000
@@ -1160,7 +1160,7 @@
 			char *p;
 
 			p = srv_data_file_names[i];
-			while ((p = strstr(p, SRV_PATH_SEPARATOR_STR)) != NULL)
+			while ((p = strchr(p, SRV_PATH_SEPARATOR)) != NULL)
 			{
 				p++;
 				srv_data_file_names[i] = p;
@@ -1691,30 +1691,29 @@
 }
 
 /************************************************************************
-Checks if a table specified as a path should be skipped from backup
-based on the --tables or --tables-file options.
+Checks if a table specified as a name in the form "database/name" (InnoDB 5.6)
+or "./database/name.ibd" (InnoDB 5.5-) should be skipped from backup based on
+the --tables or --tables-file options.
 
 @return TRUE if the table should be skipped. */
 static
 my_bool
 check_if_skip_table(
 /******************/
-	const char*	path,	/*!< in: path to the table */
-	const char*	suffix)	/*!< in: suffix */
+	const char*	name)	/*!< in: path to the table */
 {
 	char buf[FN_REFLEN];
 	const char *dbname, *tbname;
 	const char *ptr;
 	char *eptr;
-	int dbname_len;
 
 	if (xtrabackup_tables == NULL && xtrabackup_tables_file == NULL) {
 		return(FALSE);
 	}
 
 	dbname = NULL;
-	tbname = path;
-	while ((ptr = strstr(tbname, SRV_PATH_SEPARATOR_STR)) != NULL) {
+	tbname = name;
+	while ((ptr = strchr(tbname, SRV_PATH_SEPARATOR)) != NULL) {
 		dbname = tbname;
 		tbname = ptr + 1;
 	}
@@ -1724,14 +1723,16 @@
 	}
 
 	strncpy(buf, dbname, FN_REFLEN);
-	buf[FN_REFLEN - 1] = 0;
+	buf[FN_REFLEN - 1] = '\0';
 	buf[tbname - 1 - dbname] = '.';
 
-	dbname_len = strlen(dbname) - strlen(suffix);
-	if (dbname_len < 1) {
-		return(FALSE);
+	/* Check if there's a suffix in the table name. If so, truncate it. We
+	rely on the fact that a dot cannot be a part of a table name (it is
+	encoded by the server with the @NNNN syntax). */
+	if ((eptr = strchr(&buf[tbname - dbname], '.')) != NULL) {
+
+		*eptr = '\0';
 	}
-	buf[dbname_len - 1] = 0;
 
 	/* For partitioned tables first try to match against the regexp
 	without truncating the #P#... suffix so we can backup individual
@@ -1754,231 +1755,6 @@
 }
 
 /***********************************************************************
-<<<<<<< TREE
-=======
-Read meta info for an incremental delta.
-@return TRUE on success, FALSE on failure. */
-static my_bool
-xb_read_delta_metadata(const char *filepath, xb_delta_info_t *info)
-{
-	FILE*	fp;
-	char	key[51];
-	char	value[51];
-	my_bool	r			= TRUE;
-
-	/* set defaults */
-	info->page_size = ULINT_UNDEFINED;
-	info->zip_size = ULINT_UNDEFINED;
-	info->space_id = ULINT_UNDEFINED;
-
-	fp = fopen(filepath, "r");
-	if (!fp) {
-		/* Meta files for incremental deltas are optional */
-		return(TRUE);
-	}
-
-	while (!feof(fp)) {
-		if (fscanf(fp, "%50s = %50s\n", key, value) == 2) {
-			if (strcmp(key, "page_size") == 0) {
-				info->page_size = strtoul(value, NULL, 10);
-			} else if (strcmp(key, "zip_size") == 0) {
-				info->zip_size = strtoul(value, NULL, 10);
-			} else if (strcmp(key, "space_id") == 0) {
-				info->space_id = strtoul(value, NULL, 10);
-			}
-		}
-	}
-
-	fclose(fp);
-
-	if (info->page_size == ULINT_UNDEFINED) {
-		msg("xtrabackup: page_size is required in %s\n", filepath);
-		r = FALSE;
-	}
-	if (info->space_id == ULINT_UNDEFINED) {
-		msg("xtrabackup: Warning: This backup was taken with XtraBackup 2.0.1 "
-			"or earlier, some DDL operations between full and incremental "
-			"backups may be handled incorrectly\n");
-	}
-
-	return(r);
-}
-
-/***********************************************************************
-Write meta info for an incremental delta.
-@return TRUE on success, FALSE on failure. */
-static
-my_bool
-xb_write_delta_metadata(ds_ctxt_t *ds_ctxt, const char *filename,
-			const xb_delta_info_t *info)
-{
-	datasink_t	*ds = ds_ctxt->datasink;
-	ds_file_t	*f;
-	char		buf[64];
-	my_bool		ret;
-	size_t		len;
-	MY_STAT		mystat;
-
-	snprintf(buf, sizeof(buf),
-		 "page_size = %lu\n"
-		 "zip_size = %lu\n"
-		 "space_id = %lu\n",
-		 info->page_size, info->zip_size, info->space_id);
-	len = strlen(buf);
-
-	mystat.st_size = len;
-	mystat.st_mtime = my_time(0);
-
-	f = ds->open(ds_ctxt, filename, &mystat);
-	if (f == NULL) {
-		msg("xtrabackup: Error: cannot open output stream for %s\n",
-		    filename);
-		return(FALSE);
-	}
-
-	ret = ds->write(f, buf, len) == 0;
-
-	ds->close(f);
-
-	return(ret);
-}
-
-/* ================= backup ================= */
-static void
-xtrabackup_io_throttling(void)
-{
-	if (xtrabackup_throttle && (io_ticket--) < 0) {
-		os_event_reset(wait_throttle);
-		os_event_wait(wait_throttle);
-	}
-}
-
-#ifndef XTRADB_BASED
-# if MYSQL_VERSION_ID >= 50600
-#  define trx_sys_sys_space(id) (!fil_is_user_tablespace_id(id))
-# else
-#  define trx_sys_sys_space(id) (id == 0)
-# endif
-#endif
-
-/****************************************************************//**
-A simple function to open or create a file.
-@return own: handle to the file, not defined if error, error number
-can be retrieved with os_file_get_last_error */
-UNIV_INLINE
-os_file_t
-xb_file_create_no_error_handling(
-/*=============================*/
-	const char*	name,	/*!< in: name of the file or path as a
-				null-terminated string */
-	ulint		create_mode,/*!< in: OS_FILE_OPEN if an existing file
-				is opened (if does not exist, error), or
-				OS_FILE_CREATE if a new file is created
-				(if exists, error) */
-	ulint		access_type,/*!< in: OS_FILE_READ_ONLY,
-				OS_FILE_READ_WRITE, or
-				OS_FILE_READ_ALLOW_DELETE; the last option is
-				used by a backup program reading the file */
-	ibool*		success)/*!< out: TRUE if succeed, FALSE if error */
-{
-#if MYSQL_VERSION_ID > 50500
-	return os_file_create_simple_no_error_handling(
-		0, /* innodb_file_data_key */
-		name, create_mode, access_type, success);
-#else
-	return os_file_create_simple_no_error_handling(
-		name, create_mode, access_type, success);
-#endif
-}
-
-/****************************************************************//**
-Opens an existing file or creates a new.
-@return own: handle to the file, not defined if error, error number
-can be retrieved with os_file_get_last_error */
-UNIV_INLINE
-os_file_t
-xb_file_create(
-/*===========*/
-	const char*	name,	/*!< in: name of the file or path as a
-				null-terminated string */
-	ulint		create_mode,/*!< in: OS_FILE_OPEN if an existing file
-				is opened (if does not exist, error), or
-				OS_FILE_CREATE if a new file is created
-				(if exists, error),
-				OS_FILE_OVERWRITE if a new file is created
-				or an old overwritten;
-				OS_FILE_OPEN_RAW, if a raw device or disk
-				partition should be opened */
-	ulint		purpose,/*!< in: OS_FILE_AIO, if asynchronous,
-				non-buffered i/o is desired,
-				OS_FILE_NORMAL, if any normal file;
-				NOTE that it also depends on type, os_aio_..
-				and srv_.. variables whether we really use
-				async i/o or unbuffered i/o: look in the
-				function source code for the exact rules */
-	ulint		type,	/*!< in: OS_DATA_FILE or OS_LOG_FILE */
-	ibool*		success)/*!< out: TRUE if succeed, FALSE if error */
-{
-	os_file_t	result;
-#if MYSQL_VERSION_ID >= 50600
-	ibool	old_srv_read_only_mode = srv_read_only_mode;
-
-	srv_read_only_mode = FALSE;
-#endif
-#if MYSQL_VERSION_ID > 50500
-	result = os_file_create(0 /* innodb_file_data_key */,
-				name, create_mode, purpose, type, success);
-#else
-	result = os_file_create(name, create_mode, purpose, type, success);
-#endif
-#if MYSQL_VERSION_ID >= 50600
-	srv_read_only_mode = old_srv_read_only_mode;
-#endif
-	return result;
-}
-
-/***********************************************************************//**
-Renames a file (can also move it to another directory). It is safest that the
-file is closed before calling this function.
-@return	TRUE if success */
-UNIV_INLINE
-ibool
-xb_file_rename(
-/*===========*/
-	const char*	oldpath,/*!< in: old file path as a null-terminated
-				string */
-	const char*	newpath)/*!< in: new file path */
-{
-#if MYSQL_VERSION_ID > 50500
-	return os_file_rename(
-		0 /* innodb_file_data_key */, oldpath, newpath);
-#else
-	return os_file_rename(oldpath, newpath);
-#endif
-}
-
-UNIV_INLINE
-void
-xb_file_set_nocache(
-/*================*/
-	os_file_t	fd,		/* in: file descriptor to alter */
-	const char*	file_name,	/* in: used in the diagnostic message */
-	const char*	operation_name) /* in: used in the diagnostic message,
-					we call os_file_set_nocache()
-					immediately after opening or creating
-					a file, so this is either "open" or
-					"create" */
-{
-#ifndef __WIN__
-	if (srv_unix_file_flush_method == SRV_UNIX_O_DIRECT) {
-		os_file_set_nocache(fd, file_name, operation_name);
-	}
-#endif
-}
-
-#ifdef INNODB_VERSION_SHORT
-/***********************************************************************
->>>>>>> MERGE-SOURCE
 Reads the space flags from a given data file and returns the compressed
 page size, or 0 if the space is not compressed. */
 ulint
@@ -2021,10 +1797,24 @@
 	xb_write_filt_ctxt_t	 write_filt_ctxt;
 	const char		*action;
 	xb_read_filt_t		*read_filter;
-
-	if (!trx_sys_sys_space(node->space->id) && /* don't skip system space */
-	    check_if_skip_table(node->name, "ibd")) {
-		msg("[%02u] Skipping %s\n", thread_n, node->name);
+	ibool			is_system;
+
+	/* Get the name and the path for the tablespace. node->name always
+	contains the path (which may be absolute for remote tablespaces in
+	5.6+). space->name contains the tablespace name in the form
+	"./database/table.ibd" (in 5.5-) or "database/table" (in 5.6+). For a
+	multi-node shared tablespace, space->name contains the name of the first
+	node, but that's irrelevant, since we only need node_name to match them
+	against filters, and the shared tablespace is always copied regardless
+	of the filters value. */
+
+	const char* const node_name = node->space->name;
+	const char* const node_path = node->name;
+
+	is_system = trx_sys_sys_space(node->space->id);
+
+	if (!is_system && check_if_skip_table(node_name)) {
+		msg("[%02u] Skipping %s.\n", thread_n, node_name);
 		return(FALSE);
 	}
 
@@ -2041,7 +1831,7 @@
 		goto error;
 	}
 
-	strncpy(dst_name, cursor.path, sizeof(dst_name));
+	strncpy(dst_name, cursor.rel_path, sizeof(dst_name));
 
 	/* Setup the page write filter */
 	if (xtrabackup_incremental) {
@@ -2082,7 +1872,7 @@
 		} else {
 			action = "Streaming";
 		}
-		msg("[%02u] %s %s\n", thread_n, action, node->name);
+		msg("[%02u] %s %s\n", thread_n, action, node_path);
 	} else {
 		if (xtrabackup_compress) {
 			if (xtrabackup_encrypt) {
@@ -2096,7 +1886,7 @@
 			action = "Copying";
 		}
 		msg("[%02u] %s %s to %s\n", thread_n, action,
-		    node->name, dstfile->path);
+		    node_path, dstfile->path);
 	}
 
 	/* The main copy loop */
@@ -2147,8 +1937,8 @@
 	msg("[%02u] xtrabackup: Warning: We assume the "
 	    "table was dropped during xtrabackup execution "
 	    "and ignore the file.\n", thread_n);
-	msg("[%02u] xtrabackup: Warning: skipping file %s.\n",
-	    thread_n, node->name);
+	msg("[%02u] xtrabackup: Warning: skipping tablespace %s.\n",
+	    thread_n, node_name);
 	return(FALSE);
 }
 
@@ -3791,8 +3581,7 @@
 		table = dict_table_get_low(table_name);
 		mem_free(table_name);
 
-
-		if (table && check_if_skip_table(table->name, ""))
+		if (table && check_if_skip_table(table->name))
 			goto skip;
 
 
@@ -5038,7 +4827,7 @@
 
 			p = info_file_path;
 			prev = NULL;
-			while ((next = strstr(p, SRV_PATH_SEPARATOR_STR)) != NULL)
+			while ((next = strchr(p, SRV_PATH_SEPARATOR)) != NULL)
 			{
 				prev = p;
 				p = next + 1;

=== modified file 'test/inc/common.sh'
--- test/inc/common.sh	2013-04-23 10:01:10 +0000
+++ test/inc/common.sh	2013-04-23 10:01:10 +0000
@@ -220,17 +220,8 @@
     MYSQLD_PORT="${SRV_MYSQLD_PORT[$id]}"
     MYSQLD_SOCKET="${SRV_MYSQLD_SOCKET[$id]}"
 
-<<<<<<< TREE
-    MYSQL_ARGS="--no-defaults --socket=${MYSQLD_SOCKET} --user=root"
-    MYSQLD_ARGS="--no-defaults --basedir=${MYSQL_BASEDIR} \
---log-error=${MYSQLD_ERRFILE}
---socket=${MYSQLD_SOCKET} --port=${MYSQLD_PORT} --server-id=$id \
---datadir=${MYSQLD_DATADIR} --tmpdir=${MYSQLD_TMPDIR} --log-bin=mysql-bin \
---relay-log=mysql-relay-bin --pid-file=${MYSQLD_PIDFILE} ${MYSQLD_EXTRA_ARGS}"
-=======
     MYSQL_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf "
     MYSQLD_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf ${MYSQLD_EXTRA_ARGS}"
->>>>>>> MERGE-SOURCE
     if [ "`whoami`" = "root" ]
     then
 	MYSQLD_ARGS="$MYSQLD_ARGS --user=root"
@@ -280,6 +271,7 @@
 basedir=${MYSQL_BASEDIR}
 datadir=${MYSQLD_DATADIR}
 tmpdir=${MYSQLD_TMPDIR}
+log-error=${MYSQLD_ERRFILE}
 log-bin=mysql-bin
 relay-log=mysql-relay-bin
 pid-file=${MYSQLD_PIDFILE}

=== modified file 'test/t/bug977101.sh'
--- test/t/bug977101.sh	2013-04-23 10:01:10 +0000
+++ test/t/bug977101.sh	2013-04-23 10:01:10 +0000
@@ -17,27 +17,14 @@
 
 # Check that binlog info is correct with --safe-slave-backup
 innobackupex --no-timestamp --safe-slave-backup $topdir/backup
-<<<<<<< TREE
-run_cmd egrep -q '^mysql-bin.000001[[:space:]]+[0-9]+[[:space:]]+$' \
-=======
-egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
->>>>>>> MERGE-SOURCE
+run_cmd egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
     $topdir/backup/xtrabackup_binlog_info
 
 # Check that both binlog info and slave info are correct with 
 # --safe-slave-backup
 rm -rf $topdir/backup
 innobackupex --no-timestamp --slave-info --safe-slave-backup $topdir/backup
-<<<<<<< TREE
-run_cmd egrep -q '^mysql-bin.000001[[:space:]]+[0-9]+[[:space:]]+$' \
-=======
-egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
->>>>>>> MERGE-SOURCE
+run_cmd egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
     $topdir/backup/xtrabackup_binlog_info
-<<<<<<< TREE
-run_cmd egrep -q \
-    '^CHANGE MASTER TO MASTER_LOG_FILE='\''mysql-bin.000001'\'', MASTER_LOG_POS=[0-9]+$' \
-=======
-egrep -q '^CHANGE MASTER TO MASTER_LOG_FILE='\''mysql-bin.[0-9]+'\'', MASTER_LOG_POS=[0-9]+$' \
->>>>>>> MERGE-SOURCE
+run_cmd egrep -q '^CHANGE MASTER TO MASTER_LOG_FILE='\''mysql-bin.[0-9]+'\'', MASTER_LOG_POS=[0-9]+$' \
     $topdir/backup/xtrabackup_slave_info

=== modified file 'test/t/ib_doublewrite.sh'
--- test/t/ib_doublewrite.sh	2013-04-23 10:01:10 +0000
+++ test/t/ib_doublewrite.sh	2013-04-23 10:01:10 +0000
@@ -14,10 +14,6 @@
     exit $SKIPPED_EXIT_CODE
 fi
 
-<<<<<<< TREE
-DBLWR=${TEST_BASEDIR}/var1/data/dblwr.ibd
-start_server --innodb_file_per_table --innodb_doublewrite_file=${DBLWR}
-=======
 DBLWR=dblwr.ibd
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
@@ -25,7 +21,6 @@
 innodb_doublewrite_file=$DBLWR
 "
 start_server
->>>>>>> MERGE-SOURCE
 load_dbase_schema incremental_sample
 
 # Workaround for bug #1072695

=== modified file 'test/t/ib_part_include.sh'
--- test/t/ib_part_include.sh	2013-03-07 11:38:14 +0000
+++ test/t/ib_part_include.sh	2013-04-23 10:01:10 +0000
@@ -27,9 +27,9 @@
 
 # also test xtrabackup --stats work with --tables-file
 COUNT=`xtrabackup --stats --tables='test.test$' --datadir=$topdir/backup \
-       | grep table: | awk '{print $2}' | sort -u | wc -l`
+       | grep table: | grep -v SYS_ | awk '{print $2}' | sort -u | wc -l`
 
-if [ $COUNT != 7 ] ; then
+if [ $COUNT != 5 ] ; then
 	vlog "xtrabackup --stats does not work"
 	exit -1
 fi

=== modified file 'test/t/ib_part_tf_innodb.sh'
--- test/t/ib_part_tf_innodb.sh	2013-03-07 11:38:14 +0000
+++ test/t/ib_part_tf_innodb.sh	2013-04-23 10:01:10 +0000
@@ -30,9 +30,9 @@
 vlog "Backup taken"
 
 COUNT=`xtrabackup --stats --tables-file=$topdir/tables --datadir=$topdir/backup \
-       | grep table: | awk '{print $2}' | sort -u | wc -l`
+       | grep table: | grep -v SYS_ | awk '{print $2}' | sort -u | wc -l`
 echo "COUNT = $COUNT"
-if [ $COUNT != 7 ] ; then
+if [ $COUNT != 5 ] ; then
 	vlog "xtrabackup --stats does not work"
 	exit -1
 fi

=== added file 'test/t/remote_tablespaces.sh'
--- test/t/remote_tablespaces.sh	1970-01-01 00:00:00 +0000
+++ test/t/remote_tablespaces.sh	2013-04-23 10:01:10 +0000
@@ -0,0 +1,53 @@
+########################################################################
+# Test remote tablespaces in InnoDB 5.6
+########################################################################
+
+. inc/common.sh
+
+if [ ${MYSQL_VERSION:0:3} != "5.6" ]
+then
+    echo "Requires a 5.6 server" > $SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+start_server --innodb_file_per_table
+
+remote_dir=$TEST_BASEDIR/var1/remote_dir
+
+$MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE t(id INT AUTO_INCREMENT PRIMARY KEY, c INT)
+  DATA DIRECTORY = '$remote_dir' ENGINE=InnoDB;
+INSERT INTO t(c) VALUES (1), (2), (3), (4), (5), (6), (7), (8);
+EOF
+
+# Generate some log data, as we also want to test recovery of remote tablespaces
+for ((i=0; i<12; i++))
+do
+    $MYSQL $MYSQL_ARGS test <<EOF
+      INSERT INTO t(c) SELECT c FROM t;
+EOF
+done
+
+checksum_a=`checksum_table test t`
+
+innobackupex --no-timestamp $topdir/backup
+
+stop_server
+
+rm -rf $mysql_datadir/*
+
+innobackupex --apply-log $topdir/backup
+innobackupex --copy-back $topdir/backup
+
+start_server
+
+checksum_b=`checksum_table test t`
+
+vlog "Old checksum: $checksum_a"
+vlog "New checksum: $checksum_b"
+
+if [ "$checksum_a" != "$checksum_b"  ]
+then
+    vlog "Checksums do not match"
+    exit -1
+fi

=== modified file 'test/t/xb_basic.sh'
--- test/t/xb_basic.sh	2013-04-23 10:01:10 +0000
+++ test/t/xb_basic.sh	2013-03-11 19:11:29 +0000
@@ -1,39 +1,5 @@
-<<<<<<< TREE
 ############################################################################
 # Test basic local backup
 ############################################################################
 
 . inc/xb_local.sh
-=======
-. inc/common.sh
-
-start_server
-
-load_dbase_schema sakila
-load_dbase_data sakila
-
-mkdir -p $topdir/backup
-innobackupex $topdir/backup
-backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
-vlog "Backup created in directory $backup_dir"
-
-stop_server
-# Remove datadir
-rm -r $mysql_datadir
-# Restore sakila
-vlog "Applying log"
-vlog "###########"
-vlog "# PREPARE #"
-vlog "###########"
-innobackupex --apply-log $backup_dir
-vlog "Restoring MySQL datadir"
-mkdir -p $mysql_datadir
-vlog "###########"
-vlog "# RESTORE #"
-vlog "###########"
-innobackupex --copy-back $backup_dir
-
-start_server
-# Check sakila
-run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SELECT count(*) from actor" sakila
->>>>>>> MERGE-SOURCE