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

[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.0-param/412/

[Alexey Kopytov (akopytov)]

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

[Laurynas Biveinis (laurynas-biveinis)]

I assume rev 534 is not a part of this MP, and only reviewed rev 535.

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-04-03 07:04:25 +0000
+++ innobackupex	2013-04-23 10:01:01 +0000
@@ -230,6 +230,7 @@
 my $copy_dir_dst;
 my $copy_dir_exclude_regexp;
 my $copy_dir_overwrite;
+my $copy_dir_resolve_isl;
 
 ######################################################################
 # program execution begins here
@@ -618,11 +619,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") {
@@ -657,14 +678,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
 #
@@ -676,6 +699,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);
 }
@@ -686,7 +710,7 @@
 # SYNOPSIS
 #
 #     move_dir_recursively($src_dir, $dst_dir, $exclude_regexp,
-#                          $overwrite);
+#                          $overwrite, $resolve_isl);
 #
 # TODO
 #
@@ -698,6 +722,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);
 }
@@ -715,12 +740,15 @@
         get_option(\%config, $option_defaults_group, 'innodb_data_file_path');
     my $orig_iblog_dir =
         get_option(\%config, $option_defaults_group, 'innodb_log_group_home_dir');
+    my $orig_undo_dir = $orig_ibdata_dir;
     my $iblog_files = 'ib_logfile.*';
+    my $ibundo_files = 'undo[0-9]{3}';
     my $excluded_files = 
         '\.\.?|backup-my\.cnf|xtrabackup_logfile|' .
-	'xtrabackup_binary|xtrabackup_binlog_info|xtrabackup_checkpoints|' .
+        'xtrabackup_binary|xtrabackup_binlog_info|xtrabackup_checkpoints|' .
         '.*\.qp|' .
-	$iblog_files;
+        $iblog_files . '|'.
+        $ibundo_files;
     my $compressed_data_file = '.*\.ibz$';
     my $file;
     my $backup_innodb_data_file_path;
@@ -732,6 +760,10 @@
         $excluded_files = $excluded_files . '|' . $doublewrite_file;
     }
 
+    if (has_option(\%config, $option_defaults_group, 'innodb_undo_directory')) {
+        $orig_undo_dir = get_option(\%config, $option_defaults_group,
+                                    'innodb_undo_directory');
+    }
     # check whether files should be copied or moved to dest directory
     my $move_or_copy_file = $move_flag ? \&move_file : \&copy_file;
     my $move_or_copy_dir = $move_flag ?
@@ -743,6 +775,10 @@
     if_directory_exists_and_empty($orig_datadir, "Original data");
     if_directory_exists_and_empty($orig_ibdata_dir, "Original InnoDB data");
     if_directory_exists_and_empty($orig_iblog_dir, "Original InnoDB log");
+    if ($orig_undo_dir) {
+        if_directory_exists_and_empty($orig_undo_dir,
+                                      "Original undo directory");
+    }
 
     # check that the original options file and the backup options file have
     # the same value for "innodb_data_file_path" option
@@ -786,7 +822,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";
@@ -801,6 +837,22 @@
         &$move_or_copy_file($src_name, $dst_name);
     }
 
+    # copy InnoDB undo tablespaces to innodb_undo_directory (if specified), or
+    # to the InnoDB data directory
+    print STDERR "\n$prefix Starting to $operation InnoDB undo tablespaces\n";
+    print STDERR "$prefix in '$backup_dir'\n";
+    print STDERR "$prefix back to '$orig_undo_dir'\n";
+    opendir(DIR, $backup_dir)
+        || Die "Can't open directory '$backup_dir': $!\n";
+    while (defined($file = readdir(DIR))) {
+        if ($file =~ /^$ibundo_files$/ && -f "$backup_dir/$file") {
+            $src_name = escape_path("$backup_dir/$file");
+            $dst_name = escape_path("$orig_undo_dir");
+            &$move_or_copy_file($src_name, $dst_name);
+        }
+    }
+    closedir(DIR);
+
     # copy InnoDB log files to original InnoDB log directory
     opendir(DIR, $backup_dir) 
         || Die "Can't open directory '$backup_dir': $!\n";
@@ -897,7 +949,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.
@@ -1810,7 +1862,9 @@
         "innodb_log_file_size",
         "innodb_fast_checksum",
         "innodb_page_size",
-        "innodb_log_block_size"
+        "innodb_log_block_size",
+        "innodb_undo_directory",
+        "innodb_undo_tablespaces"
         );
 
     my $options_dump = "# This MySQL options file was generated by $innobackup_script.\n\n" .
@@ -2105,7 +2159,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 {
@@ -2114,7 +2168,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";
@@ -2172,7 +2226,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-09 13:44:38 +0000
+++ patches/innodb56.patch	2013-04-23 10:01:01 +0000
@@ -47,16 +47,19 @@
  #include "trx0sys.h"
  #include "row0mysql.h"
  #ifndef UNIV_HOTBACKUP
-@@ -311,7 +313,7 @@
+@@ -311,10 +313,7 @@
  
  /** The tablespace memory cache. This variable is NULL before the module is
  initialized. */
 -static fil_system_t*	fil_system	= NULL;
+-
+-/** Determine if (i) is a user tablespace id or not. */
+-# define fil_is_user_tablespace_id(i) ((i) > srv_undo_tablespaces_open)
 +fil_system_t*	fil_system	= NULL;
  
- /** Determine if (i) is a user tablespace id or not. */
- # define fil_is_user_tablespace_id(i) ((i) > srv_undo_tablespaces_open)
-@@ -376,7 +378,7 @@
+ /** Determine if user has explicitly disabled fsync(). */
+ #ifndef __WIN__
+@@ -376,7 +375,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -65,7 +68,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -691,7 +693,7 @@
+@@ -691,7 +690,7 @@
  Opens a file of a node of a tablespace. The caller must own the fil_system
  mutex. */
  static
@@ -74,7 +77,7 @@
  fil_node_open_file(
  /*===============*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -725,6 +727,18 @@
+@@ -725,6 +724,18 @@
  			OS_FILE_READ_ONLY, &success);
  		if (!success) {
  			/* The following call prints an error message */
@@ -93,7 +96,7 @@
  			os_file_get_last_error(true);
  
  			ut_print_timestamp(stderr);
-@@ -783,12 +797,17 @@
+@@ -783,12 +794,17 @@
  
  		if (UNIV_UNLIKELY(space_id != space->id)) {
  			fprintf(stderr,
@@ -114,7 +117,7 @@
  		}
  
  		if (UNIV_UNLIKELY(space_id == ULINT_UNDEFINED
-@@ -825,8 +844,9 @@
+@@ -825,8 +841,9 @@
  		}
  
  		if (size_bytes >= 1024 * 1024) {
@@ -126,7 +129,7 @@
  		}
  
  		if (!fsp_flags_is_compressed(flags)) {
-@@ -879,6 +899,8 @@
+@@ -879,6 +896,8 @@
  		/* Put the node to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
@@ -135,7 +138,7 @@
  }
  
  /**********************************************************************//**
-@@ -1491,7 +1513,12 @@
+@@ -1491,7 +1510,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -149,7 +152,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -2095,7 +2122,7 @@
+@@ -2095,7 +2119,7 @@
  	mem_free(path);
  }
  
@@ -158,7 +161,7 @@
  /********************************************************//**
  Writes a log record about an .ibd file create/rename/delete. */
  static
-@@ -2329,7 +2356,7 @@
+@@ -2329,7 +2353,7 @@
  				    space_id, name, path, flags,
  				    DICT_TF2_USE_TABLESPACE,
  				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
@@ -167,7 +170,7 @@
  			}
  		}
  
-@@ -2687,7 +2714,7 @@
+@@ -2687,7 +2711,7 @@
  	}
  
  	if (err == DB_SUCCESS) {
@@ -176,7 +179,7 @@
  		/* Write a log record about the deletion of the .ibd
  		file, so that ibbackup can replay it in the
  		--apply-log phase. We use a dummy mtr and the familiar
-@@ -3042,7 +3069,7 @@
+@@ -3042,7 +3066,7 @@
  
  	mutex_exit(&fil_system->mutex);
  
@@ -185,7 +188,7 @@
  	if (success && !recv_recovery_on) {
  		mtr_t		mtr;
  
-@@ -3426,7 +3453,7 @@
+@@ -3426,7 +3450,7 @@
  		goto error_exit_1;
  	}
  
@@ -194,7 +197,7 @@
  	{
  		mtr_t		mtr;
  		ulint		mlog_file_flag = 0;
-@@ -3504,6 +3531,97 @@
+@@ -3504,6 +3528,97 @@
  #endif /* UNIV_LOG_ARCHIVE */
  };
  
@@ -292,7 +295,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 +3830,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);
  
@@ -309,7 +330,25 @@
  
  		err = DB_CORRUPTION;
  
-@@ -4135,7 +4257,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) {
@@ -318,7 +357,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 +4385,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 */
@@ -327,7 +366,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4359,7 +4481,9 @@
+@@ -4359,7 +4486,9 @@
  			    "%s/%s", fil_path_to_mysql_datadir, dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -338,7 +377,23 @@
  
  		if (dbdir != NULL) {
  
-@@ -4538,6 +4662,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;
@@ -346,7 +401,7 @@
  
  	ut_ad(fil_system);
  
-@@ -4615,6 +4740,10 @@
+@@ -4615,6 +4749,10 @@
  		if (fnamespace == NULL) {
  			if (print_error_if_does_not_exist) {
  				fil_report_missing_tablespace(name, id);
@@ -357,7 +412,7 @@
  			}
  		} else {
  			ut_print_timestamp(stderr);
-@@ -4638,6 +4767,10 @@
+@@ -4638,6 +4776,10 @@
  
  		mutex_exit(&fil_system->mutex);
  
@@ -368,7 +423,7 @@
  		return(FALSE);
  	}
  
-@@ -4728,6 +4861,7 @@
+@@ -4728,6 +4870,7 @@
  	ulint		page_size;
  	ulint		pages_added;
  	ibool		success;
@@ -376,7 +431,7 @@
  
  	ut_ad(!srv_read_only_mode);
  
-@@ -4772,13 +4906,17 @@
+@@ -4772,13 +4915,17 @@
  		goto retry;
  	}
  
@@ -395,7 +450,7 @@
  	start_page_no = space->size;
  	file_start_page_no = space->size - node->size;
  
-@@ -5024,7 +5162,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
@@ -404,7 +459,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -5044,9 +5182,12 @@
+@@ -5044,9 +5191,12 @@
  	}
  
  	if (node->open == FALSE) {
@@ -418,7 +473,7 @@
  	}
  
  	if (node->n_pending == 0 && fil_space_belongs_in_lru(space)) {
-@@ -5058,6 +5199,8 @@
+@@ -5058,6 +5208,8 @@
  	}
  
  	node->n_pending++;
@@ -427,7 +482,7 @@
  }
  
  /********************************************************************//**
-@@ -5259,6 +5402,16 @@
+@@ -5259,6 +5411,16 @@
  
  	ut_ad(mode != OS_AIO_IBUF || space->purpose == FIL_TABLESPACE);
  
@@ -444,7 +499,7 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
-@@ -5290,7 +5443,11 @@
+@@ -5290,7 +5452,11 @@
  	}
  
  	/* Open file if closed */
@@ -457,7 +512,7 @@
  
  	/* Check that at least the start offset is within the bounds of a
  	single-table tablespace, including rollback tablespaces. */
-@@ -6164,6 +6321,7 @@
+@@ -6164,6 +6330,7 @@
  	return(err);
  }
  
@@ -465,7 +520,7 @@
  /****************************************************************//**
  Generate redo logs for swapping two .ibd files */
  UNIV_INTERN
-@@ -6187,4 +6345,4 @@
+@@ -6187,4 +6354,4 @@
  			 0, 0, new_name, old_name, &mtr);
  	mtr_commit(&mtr);
  }
@@ -482,6 +537,107 @@
  
  		if (thd && thd_sql_command(thd) == SQLCOM_DROP_TABLE) {
  
+@@ -2423,43 +2423,19 @@
+ 	ulint		buflen,	/*!< in: length of buf, in bytes */
+ 	const char*	id,	/*!< in: identifier to convert */
+ 	ulint		idlen,	/*!< in: length of id, in bytes */
+-	THD*		thd,	/*!< in: MySQL connection thread, or NULL */
+-	ibool		file_id)/*!< in: TRUE=id is a table or database name;
++	THD*		thd __attribute__((unused)),
++				/*!< in: MySQL connection thread, or NULL */
++	ibool		file_id __attribute__((unused)))
++				/*!< in: TRUE=id is a table or database name;
+ 				FALSE=id is an UTF-8 string */
+ {
+-	char nz[NAME_LEN + 1];
+-	char nz2[NAME_LEN + 1 + EXPLAIN_FILENAME_MAX_EXTRA_LENGTH];
+-
+ 	const char*	s	= id;
+ 	int		q;
+ 
+-	if (file_id) {
+-		/* Decode the table name.  The MySQL function expects
+-		a NUL-terminated string.  The input and output strings
+-		buffers must not be shared. */
+-
+-		if (UNIV_UNLIKELY(idlen > (sizeof nz) - 1)) {
+-			idlen = (sizeof nz) - 1;
+-		}
+-
+-		memcpy(nz, id, idlen);
+-		nz[idlen] = 0;
+-
+-		s = nz2;
+-		idlen = explain_filename(thd, nz, nz2, sizeof nz2,
+-					 EXPLAIN_PARTITIONS_AS_COMMENT);
+-		goto no_quote;
+-	}
+-
+ 	/* See if the identifier needs to be quoted. */
+-	if (UNIV_UNLIKELY(!thd)) {
+-		q = '"';
+-	} else {
+-		q = get_quote_char_for_identifier(thd, s, (int) idlen);
+-	}
++	q = '"';
+ 
+ 	if (q == EOF) {
+-no_quote:
+ 		if (UNIV_UNLIKELY(idlen > buflen)) {
+ 			idlen = buflen;
+ 		}
+@@ -16642,45 +16618,21 @@
+ void
+ ib_logf(
+ /*====*/
+-	ib_log_level_t	level,		/*!< in: warning level */
++	ib_log_level_t	level __attribute__((unused)),
++					/*!< in: warning level */
+ 	const char*	format,		/*!< printf format */
+ 	...)				/*!< Args */
+ {
+-	char*		str;
+ 	va_list         args;
+ 
+ 	va_start(args, format);
+ 
+-#ifdef __WIN__
+-	int		size = _vscprintf(format, args) + 1;
+-	str = static_cast<char*>(malloc(size));
+-	str[size - 1] = 0x0;
+-	vsnprintf(str, size, format, args);
+-#elif HAVE_VASPRINTF
+-	(void) vasprintf(&str, format, args);
+-#else
+-	/* Use a fixed length string. */
+-	str = static_cast<char*>(malloc(BUFSIZ));
+-	my_vsnprintf(str, BUFSIZ, format, args);
+-#endif /* __WIN__ */
+-
+-	switch(level) {
+-	case IB_LOG_LEVEL_INFO:
+-		sql_print_information("InnoDB: %s", str);
+-		break;
+-	case IB_LOG_LEVEL_WARN:
+-		sql_print_warning("InnoDB: %s", str);
+-		break;
+-	case IB_LOG_LEVEL_ERROR:
+-		sql_print_error("InnoDB: %s", str);
+-		break;
+-	case IB_LOG_LEVEL_FATAL:
+-		sql_print_error("InnoDB: %s", str);
+-		break;
+-	}
++	/* Don't use server logger for XtraBackup, just print to stderr. */
++	vfprintf(stderr, format, args);
+ 
+ 	va_end(args);
+-	free(str);
++
++	fputc('\n', stderr);
+ 
+ 	if (level == IB_LOG_LEVEL_FATAL) {
+ 		ut_error;
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
 @@ -353,6 +353,9 @@
@@ -676,7 +832,60 @@
  dberr_t
  open_or_create_data_files(
  /*======================*/
-@@ -2065,11 +2065,13 @@
+@@ -1204,12 +1204,16 @@
+ /********************************************************************
+ Opens the configured number of undo tablespaces.
+ @return	DB_SUCCESS or error code */
+-static
++UNIV_INTERN
+ dberr_t
+ srv_undo_tablespaces_init(
+ /*======================*/
+ 	ibool		create_new_db,		/*!< in: TRUE if new db being
+ 						created */
++	ibool		backup_mode,		/*!< in: TRUE disables reading
++						the system tablespace (used in
++						XtraBackup), FALSE is passed on
++						recovery. */
+ 	const ulint	n_conf_tablespaces,	/*!< in: configured undo
+ 						tablespaces */
+ 	ulint*		n_opened)		/*!< out: number of UNDO
+@@ -1225,6 +1229,7 @@
+ 	*n_opened = 0;
+ 
+ 	ut_a(n_conf_tablespaces <= TRX_SYS_N_RSEGS);
++	ut_a(!create_new_db || !backup_mode);
+ 
+ 	memset(undo_tablespace_ids, 0x0, sizeof(undo_tablespace_ids));
+ 
+@@ -1258,12 +1263,13 @@
+ 		}
+ 	}
+ 
+-	/* Get the tablespace ids of all the undo segments excluding
+-	the system tablespace (0). If we are creating a new instance then
++	/* Get the tablespace ids of all the undo segments excluding the system
++	tablespace (0). If we are creating a new instance then
+ 	we build the undo_tablespace_ids ourselves since they don't
+-	already exist. */
++	already exist. If we are in the backup mode, don't read the trx header,
++	we just need to add all available undo tablespaces to fil_system. */
+ 
+-	if (!create_new_db) {
++	if (!create_new_db && !backup_mode) {
+ 		n_undo_tablespaces = trx_rseg_get_n_undo_tablespaces(
+ 			undo_tablespace_ids);
+ 	} else {
+@@ -1369,7 +1375,7 @@
+ 		ib_logf(IB_LOG_LEVEL_INFO, "Opened %lu undo tablespaces",
+ 			n_undo_tablespaces);
+ 
+-		if (n_conf_tablespaces == 0) {
++		if (n_conf_tablespaces == 0 && !backup_mode) {
+ 			ib_logf(IB_LOG_LEVEL_WARN,
+ 				"Using the system tablespace for all UNDO "
+ 				"logging because innodb_undo_tablespaces=0");
+@@ -2065,11 +2071,13 @@
  					max_flushed_lsn = min_flushed_lsn
  						= log_get_lsn();
  					goto files_checked;
@@ -690,7 +899,15 @@
  				}
  
  				/* opened all files */
-@@ -2326,6 +2328,10 @@
+@@ -2162,6 +2170,7 @@
+ 
+ 	err = srv_undo_tablespaces_init(
+ 		create_new_db,
++		FALSE,
+ 		srv_undo_tablespaces,
+ 		&srv_undo_tablespaces_open);
+ 
+@@ -2326,6 +2335,10 @@
  
  		recv_recovery_from_checkpoint_finish();
  
@@ -701,7 +918,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
-@@ -2647,6 +2653,7 @@
+@@ -2647,6 +2660,7 @@
  	    && srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes < tablespace_size_in_header) {
  
@@ -709,7 +926,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: tablespace size stored in header"
-@@ -2683,6 +2690,7 @@
+@@ -2683,6 +2697,7 @@
  
  			return(DB_ERROR);
  		}
@@ -717,7 +934,7 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -2739,6 +2747,7 @@
+@@ -2739,6 +2754,7 @@
  		fts_optimize_init();
  	}
  
@@ -725,7 +942,7 @@
  	srv_was_started = TRUE;
  
  	return(DB_SUCCESS);
-@@ -2794,7 +2803,7 @@
+@@ -2794,7 +2810,7 @@
  		return(DB_SUCCESS);
  	}
  
@@ -844,3 +1061,41 @@
  
  	UNIV_MEM_FREE(buf, n);
  }
+--- a/storage/innobase/include/fil0fil.h
++++ b/storage/innobase/include/fil0fil.h
+@@ -163,6 +163,9 @@
+ #define FIL_LOG			502	/*!< redo log */
+ /* @} */
+ 
++/** Determine if (i) is a user tablespace id or not. */
++#define fil_is_user_tablespace_id(i) ((i) > srv_undo_tablespaces_open)
++
+ /** The number of fsyncs done to the log */
+ extern ulint	fil_n_log_flushes;
+ 
+--- a/storage/innobase/include/srv0start.h
++++ b/storage/innobase/include/srv0start.h
+@@ -77,6 +77,23 @@
+ srv_add_path_separator_if_needed(
+ /*=============================*/
+ 	char*	str);	/*!< in: null-terminated character string */
++/********************************************************************
++Opens the configured number of undo tablespaces.
++@return	DB_SUCCESS or error code */
++UNIV_INTERN
++dberr_t
++srv_undo_tablespaces_init(
++/*======================*/
++	ibool		create_new_db,		/*!< in: TRUE if new db being
++						created */
++	ibool		backup_mode,		/*!< in: TRUE disables reading
++						the system tablespace (used in
++						XtraBackup), FALSE is passed on
++						recovery. */
++	const ulint	n_conf_tablespaces,	/*!< in: configured undo
++						tablespaces */
++	ulint*		n_opened);		/*!< out: number of UNDO
++						tablespaces successfully */
+ #ifndef UNIV_HOTBACKUP
+ /****************************************************************//**
+ Starts Innobase and creates a new database if database files
 
=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2013-04-17 07:50:37 +0000
+++ src/xtrabackup.cc	2013-04-23 10:01:01 +0000
@@ -286,10 +286,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
@@ -1643,6 +1641,7 @@
   OPT_XTRA_DEBUG_SYNC,
 #if MYSQL_VERSION_ID >= 50600
   OPT_INNODB_CHECKSUM_ALGORITHM,
+  OPT_INNODB_UNDO_DIRECTORY,
   OPT_UNDO_TABLESPACES,
 #endif
   OPT_DEFAULTS_GROUP
@@ -1962,14 +1961,17 @@
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
 #if MYSQL_VERSION_ID >= 50600
-  {"checksum-algorithm", OPT_INNODB_CHECKSUM_ALGORITHM,
+  {"innodb_checksum_algorithm", OPT_INNODB_CHECKSUM_ALGORITHM,
   "The algorithm InnoDB uses for page checksumming. [CRC32, STRICT_CRC32, "
    "INNODB, STRICT_INNODB, NONE, STRICT_NONE]", &srv_checksum_algorithm,
    &srv_checksum_algorithm, &innodb_checksum_algorithm_typelib, GET_ENUM,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"undo-tablespaces", OPT_UNDO_TABLESPACES,
-   "Number of undo tablespaces to use. NON-ZERO VALUES ARE NOT "
-   "CURRENTLY SUPPORTED",
+  {"innodb_undo_directory", OPT_INNODB_UNDO_DIRECTORY,
+   "Directory where undo tablespace files live, this path can be absolute.",
+   (G_PTR*) &srv_undo_dir, (G_PTR*) &srv_undo_dir,
+   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"innodb_undo_tablespaces", OPT_UNDO_TABLESPACES,
+   "Number of undo tablespaces to use.",
    (G_PTR*)&srv_undo_tablespaces, (G_PTR*)&srv_undo_tablespaces,
    0, GET_ULONG, REQUIRED_ARG, 0, 0, 126, 0, 1, 0},
 #endif
@@ -3066,7 +3068,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;
@@ -3152,7 +3154,7 @@
 	srv_log_file_size = (ulint) innobase_log_file_size;
 	msg("xtrabackup:   innodb_log_files_in_group = %ld\n",
 	    srv_n_log_files);
-	msg("xtrabackup:   innodb_log_file_size = %ld\n",
+	msg("xtrabackup:   innodb_log_file_size = %lld\n",
 	    srv_log_file_size);
 
 #ifdef UNIV_LOG_ARCHIVE
@@ -3308,6 +3310,18 @@
 #endif
 #endif /* MYSQL_VERSION_ID */
 
+#if MYSQL_VERSION_ID >= 50600
+	/* Assign the default value to srv_undo_dir if it's not specified, as
+	my_getopt does not support default values for string options. We also
+	ignore the option and override innodb_undo_directory on --prepare,
+	because separate undo tablespaces are copied to the root backup
+	directory. */
+
+	if (!srv_undo_dir || !xtrabackup_backup) {
+		srv_undo_dir = (char *) ".";
+	}
+#endif
+
 	return(FALSE);
 
 error:
@@ -3590,26 +3604,26 @@
 }
 
 /************************************************************************
-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, const char *suffix)
+check_if_skip_table(const char *name)
 {
 	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;
 	}
@@ -3619,14 +3633,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
@@ -3747,7 +3763,11 @@
 }
 
 #ifndef XTRADB_BASED
-#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
 
 /****************************************************************//**
@@ -3897,6 +3917,48 @@
 }
 #endif
 
+/***********************************************************************
+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);
+	}
+
+}
+
 /* TODO: We may tune the behavior (e.g. by fil_aio)*/
 #define COPY_CHUNK 64
 
@@ -3922,34 +3984,41 @@
 	xb_delta_info_t info;
 	datasink_t	*ds = ds_ctxt->datasink;
 	ds_file_t	*dstfile = NULL;
+	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;
 
 	info.page_size = 0;
 	info.zip_size = 0;
 	info.space_id = 0;
 
-	if ((!trx_sys_sys_space(node->space->id))
-		&& check_if_skip_table(node->name, "ibd")) {
-		msg("[%02u] Skipping %s.\n", thread_n, 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);
 	}
 
-	if (trx_sys_sys_space(node->space->id))
-	{
-		char *next, *p;
-		/* system datafile "/fullpath/datafilename.ibd" or "./datafilename.ibd" */
-		p = node->name;
-		while ((next = strstr(p, SRV_PATH_SEPARATOR_STR)) != NULL)
-		{
-			p = next + 1;
-		}
-		strncpy(dst_name, p, sizeof(dst_name));
-	} else {
-		/* file per table style "./database/table.ibd" */
-		strncpy(dst_name, node->name, sizeof(dst_name));
-	}
+	/* Get the relative path for the destination tablespace name. Non-system
+	tablespaces may have absolute paths for remote tablespaces in MySQL
+	5.6+. We want to make "local" copies for the backup. We don't use
+	node_name here, because in MySQL 5.6+ it doesn't contain the .ibd
+	suffix */
+	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->name,
+	src_file = xb_file_create_no_error_handling(node_path,
 						    OS_FILE_OPEN,
 						    OS_FILE_READ_ONLY,
 						    &success);
@@ -3961,11 +4030,11 @@
 		    "[%02u] xtrabackup: Warning: We assume the "
 		    "table was dropped or renamed during "
 		    "xtrabackup execution and ignore the file.\n",
-		    thread_n, node->name, thread_n);
+		    thread_n, node_path, thread_n);
 		goto skip;
 	}
 
-	xb_file_set_nocache(src_file, node->name, "OPEN");
+	xb_file_set_nocache(src_file, node_path, "OPEN");
 
 #ifdef USE_POSIX_FADVISE
 	posix_fadvise(src_file, 0, 0, POSIX_FADV_SEQUENTIAL);
@@ -3982,7 +4051,7 @@
 		page_size = info.zip_size;
 		page_size_shift = get_bit_shift(page_size);
 		msg("[%02u] %s is compressed with page size = "
-		    "%lu bytes\n", thread_n, node->name, page_size);
+		    "%lu bytes\n", thread_n, node_name, page_size);
 		if (page_size_shift < 10 || page_size_shift > 14) {
 			msg("[%02u] xtrabackup: Error: Invalid "
 			    "page size: %lu.\n", thread_n, page_size);
@@ -4019,9 +4088,9 @@
 	} else
 		info.page_size = 0;
 
-	if (my_stat(node->name, &src_stat, MYF(MY_WME)) == NULL) {
+	if (my_stat(node_path, &src_stat, MYF(MY_WME)) == NULL) {
 		msg("[%02u] xtrabackup: Warning: cannot stat %s\n",
-		    thread_n, node->name);
+		    thread_n, node_path);
 		goto skip;
 	}
 	dstfile = ds->open(ds_ctxt, dst_name, &src_stat);
@@ -4035,7 +4104,7 @@
 	if (xtrabackup_stream) {
 		const char *action = xtrabackup_compress ?
 			"Compressing and streaming" : "Streaming";
-		msg("[%02u] %s %s\n", thread_n, action, node->name);
+		msg("[%02u] %s %s\n", thread_n, action, node_path);
 	} else {
 		const char *action;
 
@@ -4045,7 +4114,7 @@
 			action = "Copying";
 		}
 		msg("[%02u] %s %s to %s\n", thread_n, action,
-		    node->name, dstfile->path);
+		    node_path, dstfile->path);
 	}
 
 	buf2 = static_cast<byte *>(ut_malloc(COPY_CHUNK
@@ -4112,7 +4181,7 @@
 						    "resulted in fail. File "
 						    "%s seems to be "
 						    "corrupted.\n",
-						    thread_n, node->name);
+						    thread_n, node_path);
 						goto error;
 					}
 					msg("[%02u] xtrabackup: "
@@ -4237,8 +4306,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);
 }
 
@@ -4691,7 +4760,24 @@
 		return(DB_ERROR);
 	}
 
-	return(fil_load_single_table_tablespaces());
+	err = fil_load_single_table_tablespaces();
+	if (err != DB_SUCCESS) {
+		return(err);
+	}
+
+#if MYSQL_VERSION_ID >= 50600
+	/* Add separate undo tablespaces to fil_system */
+
+	err = srv_undo_tablespaces_init(FALSE,
+					TRUE,
+					srv_undo_tablespaces,
+					&srv_undo_tablespaces_open);
+	if (err != DB_SUCCESS) {
+		return(err);
+	}
+#endif
+
+	return(DB_SUCCESS);
 }
 
 /*********************************************************************//**
@@ -6056,7 +6142,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;
 
 		if (table == NULL) {
@@ -7454,7 +7540,9 @@
 
 					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;
@@ -7895,6 +7983,14 @@
 		printf("innodb_file_per_table = %d\n",
 		       (int) innobase_file_per_table);
 #endif
+#if MYSQL_VERSION_ID >= 50600
+		if (srv_undo_dir) {
+
+			printf("innodb_undo_directory = \"%s\"\n",
+			       srv_undo_dir);
+		}
+		printf("innodb_undo_tablespaces = %lu\n", srv_undo_tablespaces);
+#endif
 		exit(EXIT_SUCCESS);
 	}
 
 
=== modified file 'test/inc/common.sh'
--- test/inc/common.sh	2013-03-08 04:37:16 +0000
+++ test/inc/common.sh	2013-04-23 10:01:01 +0000
@@ -27,25 +27,12 @@
   exit 1
 }
 
-function init_mysql_dir()
+function call_mysql_install_db()
 {
-    if [ ! -d "$MYSQLD_VARDIR" ]
-    then
-	vlog "Creating server root directory: $MYSQLD_VARDIR"
-	mkdir "$MYSQLD_VARDIR"
-    fi
-    if [ ! -d "$MYSQLD_TMPDIR" ]
-    then
-	vlog "Creating server temporary directory: $MYSQLD_TMPDIR"
-	mkdir "$MYSQLD_TMPDIR"
-    fi
-    if [ ! -d "$MYSQLD_DATADIR" ]
-    then
-	vlog "Creating server data directory: $MYSQLD_DATADIR"
-	mkdir -p "$MYSQLD_DATADIR"
 	vlog "Calling mysql_install_db"
-	$MYSQL_INSTALL_DB --no-defaults --basedir=$MYSQL_BASEDIR --datadir="$MYSQLD_DATADIR" --tmpdir="$MYSQLD_TMPDIR" ${MYSQLD_EXTRA_ARGS}
-    fi
+	cd $MYSQL_BASEDIR
+	$MYSQL_INSTALL_DB --defaults-file=${MYSQLD_VARDIR}/my.cnf ${MYSQLD_EXTRA_ARGS}
+	cd -
 }
 
 ########################################################################
@@ -230,20 +217,15 @@
     MYSQLD_PORT="${SRV_MYSQLD_PORT[$id]}"
     MYSQLD_SOCKET="${SRV_MYSQLD_SOCKET[$id]}"
 
-    MYSQL_ARGS="--no-defaults --socket=${MYSQLD_SOCKET} --user=root"
-    MYSQLD_ARGS="--no-defaults --basedir=${MYSQL_BASEDIR} \
---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}"
     if [ "`whoami`" = "root" ]
     then
 	MYSQLD_ARGS="$MYSQLD_ARGS --user=root"
     fi
 
-    export MYSQL_HOME=$MYSQLD_VARDIR
-
-    IB_ARGS="--user=root --socket=${MYSQLD_SOCKET} --ibbackup=$XB_BIN"
-    XB_ARGS="--no-defaults"
+    IB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf --ibbackup=$XB_BIN"
+    XB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf"
 
     # Some aliases for compatibility, as tests use the following names
     topdir="$MYSQLD_VARDIR"
@@ -265,14 +247,48 @@
     init_server_variables $id
     switch_server $id
 
-    init_mysql_dir
+    if [ ! -d "$MYSQLD_VARDIR" ]
+    then
+	vlog "Creating server root directory: $MYSQLD_VARDIR"
+	mkdir "$MYSQLD_VARDIR"
+    fi
+    if [ ! -d "$MYSQLD_TMPDIR" ]
+    then
+	vlog "Creating server temporary directory: $MYSQLD_TMPDIR"
+	mkdir "$MYSQLD_TMPDIR"
+    fi
+
+    # Create the configuration file used by mysql_install_db, the server
+    # and the xtrabackup binary
     cat > ${MYSQLD_VARDIR}/my.cnf <<EOF
 [mysqld]
+socket=${MYSQLD_SOCKET}
+port=${MYSQLD_PORT}
+server-id=$id
+basedir=${MYSQL_BASEDIR}
 datadir=${MYSQLD_DATADIR}
 tmpdir=${MYSQLD_TMPDIR}
+log-bin=mysql-bin
+relay-log=mysql-relay-bin
+pid-file=${MYSQLD_PIDFILE}
+replicate-ignore-db=mysql
+${MYSQLD_EXTRA_MY_CNF_OPTS:-}
+
+[client]
+socket=${MYSQLD_SOCKET}
+user=root
 EOF
 
+    # Create datadir and call mysql_install_db if it doesn't exist
+    if [ ! -d "$MYSQLD_DATADIR" ]
+    then
+	vlog "Creating server data directory: $MYSQLD_DATADIR"
+	mkdir -p "$MYSQLD_DATADIR"
+	call_mysql_install_db
+    fi
+
     # Start the server
+    echo "Starting ${MYSQLD} ${MYSQLD_ARGS} $* "
     ${MYSQLD} ${MYSQLD_ARGS} $* &
     if ! mysql_ping
     then
@@ -301,6 +317,10 @@
         vlog "Server PID file '${MYSQLD_PIDFILE}' doesn't exist!"
     fi
 
+    # Reset XB_ARGS so we can call xtrabackup in tests even without starting the
+    # server
+    XB_ARGS="--no-defaults"
+
     # unlock the port number
     free_reserved_port $MYSQLD_PORT
 
 
=== modified file 'test/inc/ib_part.sh'
--- test/inc/ib_part.sh	2013-03-07 11:38:14 +0000
+++ test/inc/ib_part.sh	2013-04-23 10:01:01 +0000
@@ -2,15 +2,15 @@
 
 function check_partitioning()
 {
-   $MYSQL $MYSQL_ARGS -Ns -e "show variables like 'have_partitioning'"
+    $MYSQL $MYSQL_ARGS -Ns -e "SHOW PLUGINS" 2> /dev/null |
+      egrep -q "^partition"
 }
 
 function require_partitioning()
 {
-	PARTITION_CHECK=`check_partitioning`
-
-	if [ -z "$PARTITION_CHECK" ]; then
-	    echo "Requires Partitioning." > $SKIPPED_REASON
+	if ! check_partitioning
+	then
+	    echo "Requires support for partitioning." > $SKIPPED_REASON
 	    exit $SKIPPED_EXIT_CODE
 	fi
 }
 
=== modified file 'test/t/bug1062684.sh'
--- test/t/bug1062684.sh	2013-03-08 04:37:16 +0000
+++ test/t/bug1062684.sh	2013-04-23 10:01:01 +0000
@@ -1,11 +1,18 @@
-MYSQLD_EXTRA_ARGS=--innodb-data-file-path="ibdata1:${DEFAULT_IBDATA_SIZE};ibdata2:5M:autoextend"
+################################################################################
+# Bug #1062684: Applying incremental backup using xtrabackup 2.0.3 fails when
+#               innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend is
+#               set in [mysqld]
+################################################################################
+
 . inc/common.sh
 
-start_server --innodb-data-file-path="ibdata1:${DEFAULT_IBDATA_SIZE};ibdata2:5M:autoextend"
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb-data-file-path=ibdata1:${DEFAULT_IBDATA_SIZE};ibdata2:5M:autoextend
+"
+
+start_server
 load_dbase_schema incremental_sample
 
-echo "innodb-data-file-path=ibdata1:${DEFAULT_IBDATA_SIZE};ibdata2:5M:autoextend" >>$topdir/my.cnf
-
 # Adding initial rows
 vlog "Adding initial rows to database..."
 ${MYSQL} ${MYSQL_ARGS} -e "insert into test values (1, 1);" incremental_sample
 
=== modified file 'test/t/bug483827.sh'
--- test/t/bug483827.sh	2012-06-05 12:35:33 +0000
+++ test/t/bug483827.sh	2013-04-23 10:01:01 +0000
@@ -18,10 +18,7 @@
 modify_args
 
 # make my_multi.cnf
-echo "
-[mysqld1]
-datadir=${mysql_datadir}
-tmpdir=$mysql_tmpdir" > $topdir/my_multi.cnf
+sed -e 's/\[mysqld\]/[mysqld1]/' $topdir/my.cnf > $topdir/my_multi.cnf
 
 # Backup
 innobackupex --no-timestamp --defaults-group=mysqld1 $backup_dir
 
=== modified file 'test/t/bug606981.sh'
--- test/t/bug606981.sh	2012-06-19 06:00:44 +0000
+++ test/t/bug606981.sh	2013-04-23 10:01:01 +0000
@@ -6,12 +6,16 @@
     exit $SKIPPED_EXIT_CODE
 fi
 
-start_server --innodb_file_per_table
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_file_per_table=1
+innodb_flush_method=O_DIRECT
+"
+
+start_server
 
 load_sakila
 
 # Take backup
-echo "innodb_flush_method=O_DIRECT" >> $topdir/my.cnf
 mkdir -p $topdir/backup
 innobackupex --stream=tar $topdir/backup > $topdir/backup/out.tar
 stop_server
@@ -30,11 +34,11 @@
 backup_dir=$topdir/backup
 cd $backup_dir
 $TAR -ixvf out.tar
-cd - >/dev/null 2>&1 
-innobackupex --apply-log --defaults-file=$topdir/my.cnf $backup_dir
+cd - >/dev/null 2>&1
+innobackupex --apply-log $backup_dir
 vlog "Restoring MySQL datadir"
 mkdir -p $mysql_datadir
-innobackupex --copy-back --defaults-file=$topdir/my.cnf $backup_dir
+innobackupex --copy-back $backup_dir
 
 start_server
 # Check sakila
 
=== modified file 'test/t/bug740489.sh'
--- test/t/bug740489.sh	2013-01-07 19:14:19 +0000
+++ test/t/bug740489.sh	2013-04-23 10:01:01 +0000
@@ -6,26 +6,34 @@
 start_server --innodb_file_per_table
 load_sakila
 
-run_cmd ${MYSQL} ${MYSQL_ARGS} -e "UPDATE mysql.user SET Password=PASSWORD('password') WHERE User='root'; FLUSH PRIVILEGES;"
-
-defaults_extra_file=${TEST_BASEDIR}/740489.cnf
-
-echo "[client]" > $defaults_extra_file
-echo "user=root" >> $defaults_extra_file
-echo "password=password" >> $defaults_extra_file
-
-mkdir -p $topdir/backup
-cat ${MYSQLD_VARDIR}/my.cnf
-run_cmd $IB_BIN --defaults-extra-file=$defaults_extra_file --socket=${MYSQLD_SOCKET} --ibbackup=$XB_BIN $topdir/backup
-backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
+run_cmd ${MYSQL} ${MYSQL_ARGS} <<EOF
+SET PASSWORD FOR 'root'@'localhost' = PASSWORD('password');
+EOF
+
+defaults_extra_file=$topdir/740489.cnf
+
+cat > $defaults_extra_file <<EOF
+[mysqld]
+datadir=${MYSQLD_DATADIR}
+
+[client]
+user=root
+password=password
+EOF
+
+backup_dir=$topdir/backup
+run_cmd $IB_BIN \
+    --defaults-extra-file=$defaults_extra_file --socket=${MYSQLD_SOCKET} \
+    --ibbackup=$XB_BIN --no-timestamp $backup_dir
 vlog "Backup created in directory $backup_dir"
 
-run_cmd ${MYSQL} ${MYSQL_ARGS} --password=password -e "UPDATE mysql.user SET Password=PASSWORD('') WHERE User='root'; FLUSH PRIVILEGES;"
+run_cmd ${MYSQL} ${MYSQL_ARGS} --password=password <<EOF
+SET PASSWORD FOR 'root'@'localhost' = PASSWORD('');
+EOF
 
 stop_server
 # Remove datadir
 rm -r $mysql_datadir
-#init_mysql_dir
 # Restore sakila
 vlog "Applying log"
 vlog "###########"
 
=== modified file 'test/t/bug759225.sh'
--- test/t/bug759225.sh	2012-06-19 06:00:44 +0000
+++ test/t/bug759225.sh	2013-04-23 10:01:01 +0000
@@ -16,11 +16,13 @@
     exit $SKIPPED_EXIT_CODE
 fi
 
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_flush_method=ALL_O_DIRECT
+"
 start_server
 load_sakila
 
 # Take backup
-echo "innodb_flush_method=ALL_O_DIRECT" >> $topdir/my.cnf
 mkdir -p $topdir/backup
 innobackupex --stream=tar $topdir/backup > $topdir/backup/out.tar
 stop_server
@@ -39,11 +41,11 @@
 backup_dir=$topdir/backup
 cd $backup_dir
 $TAR -ixvf out.tar
-cd - >/dev/null 2>&1 
-innobackupex --apply-log --defaults-file=$topdir/my.cnf $backup_dir
+cd - >/dev/null 2>&1
+innobackupex --apply-log $backup_dir
 vlog "Restoring MySQL datadir"
 mkdir -p $mysql_datadir
-innobackupex --copy-back --defaults-file=$topdir/my.cnf $backup_dir
+innobackupex --copy-back $backup_dir
 
 start_server
 # Check sakila
 
=== modified file 'test/t/bug870119.sh'
--- test/t/bug870119.sh	2013-03-05 13:07:11 +0000
+++ test/t/bug870119.sh	2013-04-23 10:01:01 +0000
@@ -4,10 +4,13 @@
 
 . inc/common.sh
 
-start_server --innodb_file_per_table
-
 # Set the minimum value for innodb_open_files to be used by xtrabackup
-echo "innodb_open_files=10" >>$topdir/my.cnf
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_file_per_table=1
+innodb_open_files=10
+"
+
+start_server
 
 load_dbase_schema sakila
 load_dbase_data sakila
 
=== modified file 'test/t/bug891496.sh'
--- test/t/bug891496.sh	2013-03-08 04:37:16 +0000
+++ test/t/bug891496.sh	2013-04-23 10:01:01 +0000
@@ -5,13 +5,11 @@
 
 . inc/common.sh
 
-innodb_data_file_path="ibdata1:3M;ibdata2:10M:autoextend"
-
-start_server --innodb_data_file_path=$innodb_data_file_path
-
-cat >> $topdir/my.cnf <<EOF
-innodb_data_file_path=$innodb_data_file_path
-EOF
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_data_file_path=ibdata1:3M;ibdata2:10M:autoextend
+"
+
+start_server
 
 load_dbase_schema sakila
 load_dbase_data sakila
@@ -40,6 +38,6 @@
 vlog "###########"
 innobackupex  --copy-back $backup_dir
 
-start_server --innodb_data_file_path=$innodb_data_file_path
+start_server
 # Check sakila
 run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SELECT count(*) from actor" sakila
 
=== modified file 'test/t/bug976945.sh'
--- test/t/bug976945.sh	2012-06-18 03:38:41 +0000
+++ test/t/bug976945.sh	2013-04-23 10:01:01 +0000
@@ -8,8 +8,10 @@
     exit $SKIPPED_EXIT_CODE
 fi
 
-start_server --innodb_log_block_size=4096
-echo innodb_log_block_size=4096 >> ${MYSQLD_VARDIR}/my.cnf
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_log_block_size=4096
+"
+start_server
 load_sakila
 
 # Full backup
 
=== modified file 'test/t/bug977101.sh'
--- test/t/bug977101.sh	2012-06-08 18:46:19 +0000
+++ test/t/bug977101.sh	2013-04-23 10:01:01 +0000
@@ -17,15 +17,14 @@
 
 # Check that binlog info is correct with --safe-slave-backup
 innobackupex --no-timestamp --safe-slave-backup $topdir/backup
-egrep -q '^mysql-bin.000001[[:space:]]+[0-9]+[[:space:]]+$' \
+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
-egrep -q '^mysql-bin.000001[[:space:]]+[0-9]+[[:space:]]+$' \
+egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
     $topdir/backup/xtrabackup_binlog_info
-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]+$' \
     $topdir/backup/xtrabackup_slave_info
-
 
=== modified file 'test/t/ib_doublewrite.sh'
--- test/t/ib_doublewrite.sh	2012-11-15 15:27:58 +0000
+++ test/t/ib_doublewrite.sh	2013-04-23 10:01:01 +0000
@@ -15,7 +15,12 @@
 fi
 
 DBLWR=dblwr.ibd
-start_server --innodb_file_per_table --innodb_doublewrite_file=${DBLWR}
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_file_per_table=1
+innodb_doublewrite_file=$DBLWR
+"
+start_server
 load_dbase_schema incremental_sample
 
 # Workaround for bug #1072695
@@ -25,8 +30,6 @@
 	run_cmd $IB_BIN $IB_ARGS_NO_DEFAULTS_FILE $*
 }
 
-echo "innodb_doublewrite_file=${DBLWR}" >>$topdir/my.cnf
-
 # Adding initial rows
 vlog "Adding initial rows to database..."
 ${MYSQL} ${MYSQL_ARGS} -e "insert into test values (1, 1);" incremental_sample
 
=== 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:01 +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:01 +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
 
=== modified file 'test/t/ib_slave_info.sh'
--- test/t/ib_slave_info.sh	2012-06-05 12:35:33 +0000
+++ test/t/ib_slave_info.sh	2013-04-23 10:01:01 +0000
@@ -30,7 +30,7 @@
   $topdir/backup
 
 innobackupex --no-timestamp --slave-info $topdir/backup
-egrep -q '^mysql-bin.000001[[:space:]]+[0-9]+[[:space:]]+$' \
+egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
     $topdir/backup/xtrabackup_binlog_info
-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]+$' \
     $topdir/backup/xtrabackup_slave_info
 
=== 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:01 +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
 
=== added file 'test/t/undo_tablespaces.sh'
--- test/t/undo_tablespaces.sh	1970-01-01 00:00:00 +0000
+++ test/t/undo_tablespaces.sh	2013-04-23 10:01:01 +0000
@@ -0,0 +1,75 @@
+########################################################################
+# Test support for separate UNDO tablespace
+########################################################################
+
+. 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 an uncommitted transaction pause "indefinitely" to keep the connection
+# open
+################################################################################
+function start_uncomitted_transaction()
+{
+    run_cmd $MYSQL $MYSQL_ARGS sakila <<EOF
+START TRANSACTION;
+DELETE FROM payment;
+SELECT SLEEP(10000);
+EOF
+}
+
+undo_directory=$TEST_BASEDIR/var1/undo_dir
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_file_per_table=1
+innodb_undo_directory=$undo_directory
+innodb_undo_tablespaces=4
+"
+
+start_server
+load_sakila
+
+checksum1=`checksum_table sakila payment`
+test -n "$checksum1" || die "Failed to checksum table sakila.payment"
+
+# Start a transaction, modify some data and keep it uncommitted for the backup
+# stage. InnoDB avoids using the rollback segment in the system tablespace, if
+# separate undo tablespaces are used, so the test would fail if we did not
+# handle separate undo tablespaces correctly.
+start_uncomitted_transaction &
+job_master=$!
+
+innobackupex --no-timestamp $topdir/backup
+
+kill -SIGKILL $job_master
+stop_server
+
+rm -rf $MYSQLD_DATADIR/*
+rm -rf $undo_directory/*
+
+innobackupex --apply-log $topdir/backup
+
+innobackupex --copy-back $topdir/backup
+
+
+
+start_server
+
+# Check that the uncommitted transaction has been rolled back
+
+checksum2=`checksum_table sakila payment`
+test -n "$checksum2" || die "Failed to checksum table sakila.payment"
+
+vlog "Old checksum: $checksum1"
+vlog "New checksum: $checksum2"
+
+if [ "$checksum1" != "$checksum2"  ]
+then
+    vlog "Checksums do not match"
+    exit -1
+fi
 
=== modified file 'test/t/xb_basic.sh'
--- test/t/xb_basic.sh	2012-10-15 16:14:59 +0000
+++ test/t/xb_basic.sh	2013-04-23 10:01:01 +0000
@@ -13,7 +13,6 @@
 stop_server
 # Remove datadir
 rm -r $mysql_datadir
-#init_mysql_dir
 # Restore sakila
 vlog "Applying log"
 vlog "###########"
 
=== modified file 'test/t/xb_version.sh'
--- test/t/xb_version.sh	2011-06-14 14:34:23 +0000
+++ test/t/xb_version.sh	2013-04-23 10:01:01 +0000
@@ -1,4 +1,3 @@
 . inc/common.sh
 
 xtrabackup --version
-
 
=== modified file 'test/testrun.sh'
--- test/testrun.sh	2013-03-13 05:05:16 +0000
+++ test/testrun.sh	2013-04-23 10:01:01 +0000
@@ -176,7 +176,7 @@
     then
 	INNODB_FLAVOR="XtraDB"
     else
-	INNODB_FLAVOR="innoDB"
+	INNODB_FLAVOR="InnoDB"
     fi
 
     if [ "$XB_BUILD" = "autodetect" ]