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

[Alexey Kopytov]

  Implementation of
  https://blueprints.launchpad.net/percona-xtrabackup/+spec/support-separate-undo-tablespace

  In order to backup separate undo tablespaces they must be added in the
  fil_system list of tablespaces on the backup stage. This is implemented
  in srv_undo_tablespaces_init(), which needs some modifications for
  XtraBackup. First, create_new_db is always FALSE in XtraBackup. We also
  need another argument to check if we can read the number of currently
  used undo tablespaces from the trx header. We can't do that on the
  backup stage, so we just do what srv_undo_tablespaces_init() would do in
  'create_new_db == TRUE' mode, i.e. just assume the number of available
  undo tablespaces is the number of used tablespaces.

  We also have to restore undo tablespaces on --copy-back (unlike
  e.g. separate doublewrite tablespace in PS). The reasons are that:

  1) the server would refuse to start if the number of available undo
  tablespaces is less than the number of configured ones.

  2) we can prepare the backup with --redo-only (i.e. let the server
  rollback uncommitted transactions)

  There were also some tweaks to the test suite required to create a test
  case. Previously my.cnf was only used by xtrabackup, but not the server
  itself (one had to pass arguments to start_server and then add the same
  arguments to my.cnf for xtrabackup to "see" them). Now my.cnf is used by
  both server and xtrabackup, and it is possible to add custom entries to
  my.cnf using the MYSQLD_EXTRA_MY_CNF_OPTS variable.

  This patch also fixes bug #1169971: "Lost InnoDB messages in
  xtrabackup_56".

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

[Stewart Smith (stewart)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-04-17 07:54:33 +0000
+++ innobackupex	2013-04-22 11:05:38 +0000
@@ -704,13 +704,16 @@
         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|' .
         '.*\.pmap|.*\.tmp|' .
-	$iblog_files;
+        $iblog_files . '|'.
+        $ibundo_files;
     my $compressed_data_file = '.*\.ibz$';
     my $file;
     my $backup_innodb_data_file_path;
@@ -722,6 +725,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 ?
@@ -733,6 +740,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
@@ -791,6 +802,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";
@@ -1730,7 +1757,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" .

=== modified file 'patches/innodb56.patch'
--- patches/innodb56.patch	2013-04-09 13:50:50 +0000
+++ patches/innodb56.patch	2013-04-22 11:05:38 +0000
@@ -86,16 +86,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
@@ -104,7 +107,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
@@ -113,7 +116,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 */
@@ -132,7 +135,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,
@@ -153,7 +156,7 @@
  		}
  
  		if (UNIV_UNLIKELY(space_id == ULINT_UNDEFINED
-@@ -825,8 +844,9 @@
+@@ -825,8 +841,9 @@
  		}
  
  		if (size_bytes >= 1024 * 1024) {
@@ -165,7 +168,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);
  	}
@@ -174,7 +177,7 @@
  }
  
  /**********************************************************************//**
-@@ -1491,7 +1513,12 @@
+@@ -1491,7 +1510,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -188,7 +191,7 @@
  		fil_node_complete_io(node, fil_system, OS_FILE_READ);
  	}
  
-@@ -2095,7 +2122,7 @@
+@@ -2095,7 +2119,7 @@
  	mem_free(path);
  }
  
@@ -197,7 +200,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) {
@@ -206,7 +209,7 @@
  			}
  		}
  
-@@ -2687,7 +2714,7 @@
+@@ -2687,7 +2711,7 @@
  	}
  
  	if (err == DB_SUCCESS) {
@@ -215,7 +218,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);
  
@@ -224,7 +227,7 @@
  	if (success && !recv_recovery_on) {
  		mtr_t		mtr;
  
-@@ -3426,7 +3453,7 @@
+@@ -3426,7 +3450,7 @@
  		goto error_exit_1;
  	}
  
@@ -233,7 +236,7 @@
  	{
  		mtr_t		mtr;
  		ulint		mlog_file_flag = 0;
-@@ -3504,6 +3531,97 @@
+@@ -3504,6 +3528,97 @@
  #endif /* UNIV_LOG_ARCHIVE */
  };
  
@@ -331,7 +334,7 @@
  /********************************************************************//**
  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 @@
+@@ -3712,11 +3827,15 @@
  		/* The following call prints an error message */
  		os_file_get_last_error(true);
  
@@ -348,7 +351,7 @@
  
  		err = DB_CORRUPTION;
  
-@@ -4135,7 +4257,7 @@
+@@ -4135,7 +4254,7 @@
  	cannot be ok. */
  	ulong minimum_size = FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE;
  	if (size < minimum_size) {
@@ -357,7 +360,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 +4382,7 @@
  idea is to read as much good data as we can and jump over bad data.
  @return 0 if ok, -1 if error even after the retries, 1 if at the end
  of the directory */
@@ -366,7 +369,7 @@
  int
  fil_file_readdir_next_file(
  /*=======================*/
-@@ -4359,7 +4481,9 @@
+@@ -4359,7 +4478,9 @@
  			    "%s/%s", fil_path_to_mysql_datadir, dbinfo.name);
  		srv_normalize_path_for_win(dbpath);
  
@@ -377,7 +380,7 @@
  
  		if (dbdir != NULL) {
  
-@@ -4538,6 +4662,7 @@
+@@ -4538,6 +4659,7 @@
  {
  	fil_space_t*	fnamespace;
  	fil_space_t*	space;
@@ -385,7 +388,7 @@
  
  	ut_ad(fil_system);
  
-@@ -4615,6 +4740,10 @@
+@@ -4615,6 +4737,10 @@
  		if (fnamespace == NULL) {
  			if (print_error_if_does_not_exist) {
  				fil_report_missing_tablespace(name, id);
@@ -396,7 +399,7 @@
  			}
  		} else {
  			ut_print_timestamp(stderr);
-@@ -4638,6 +4767,10 @@
+@@ -4638,6 +4764,10 @@
  
  		mutex_exit(&fil_system->mutex);
  
@@ -407,7 +410,7 @@
  		return(FALSE);
  	}
  
-@@ -4728,6 +4861,7 @@
+@@ -4728,6 +4858,7 @@
  	ulint		page_size;
  	ulint		pages_added;
  	ibool		success;
@@ -415,7 +418,7 @@
  
  	ut_ad(!srv_read_only_mode);
  
-@@ -4772,13 +4906,17 @@
+@@ -4772,13 +4903,17 @@
  		goto retry;
  	}
  
@@ -434,7 +437,7 @@
  	start_page_no = space->size;
  	file_start_page_no = space->size - node->size;
  
-@@ -5024,7 +5162,7 @@
+@@ -5024,7 +5159,7 @@
  off the LRU list if it is in the LRU list. The caller must hold the fil_sys
  mutex. */
  static
@@ -443,7 +446,7 @@
  fil_node_prepare_for_io(
  /*====================*/
  	fil_node_t*	node,	/*!< in: file node */
-@@ -5044,9 +5182,12 @@
+@@ -5044,9 +5179,12 @@
  	}
  
  	if (node->open == FALSE) {
@@ -457,7 +460,7 @@
  	}
  
  	if (node->n_pending == 0 && fil_space_belongs_in_lru(space)) {
-@@ -5058,6 +5199,8 @@
+@@ -5058,6 +5196,8 @@
  	}
  
  	node->n_pending++;
@@ -466,7 +469,7 @@
  }
  
  /********************************************************************//**
-@@ -5259,6 +5402,16 @@
+@@ -5259,6 +5399,16 @@
  
  	ut_ad(mode != OS_AIO_IBUF || space->purpose == FIL_TABLESPACE);
  
@@ -483,7 +486,7 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
-@@ -5290,7 +5443,11 @@
+@@ -5290,7 +5440,11 @@
  	}
  
  	/* Open file if closed */
@@ -496,7 +499,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 +6318,7 @@
  	return(err);
  }
  
@@ -504,7 +507,7 @@
  /****************************************************************//**
  Generate redo logs for swapping two .ibd files */
  UNIV_INTERN
-@@ -6187,4 +6345,4 @@
+@@ -6187,4 +6342,4 @@
  			 0, 0, new_name, old_name, &mtr);
  	mtr_commit(&mtr);
  }
@@ -521,6 +524,58 @@
  
  		if (thd && thd_sql_command(thd) == SQLCOM_DROP_TABLE) {
  
+@@ -16642,45 +16642,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 @@
@@ -743,7 +798,60 @@
  dberr_t
  open_or_create_data_files(
  /*======================*/
-@@ -2065,11 +2066,13 @@
+@@ -1204,12 +1205,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 +1230,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 +1264,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 +1376,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 +2072,13 @@
  					max_flushed_lsn = min_flushed_lsn
  						= log_get_lsn();
  					goto files_checked;
@@ -757,7 +865,15 @@
  				}
  
  				/* opened all files */
-@@ -2326,6 +2329,10 @@
+@@ -2162,6 +2171,7 @@
+ 
+ 	err = srv_undo_tablespaces_init(
+ 		create_new_db,
++		FALSE,
+ 		srv_undo_tablespaces,
+ 		&srv_undo_tablespaces_open);
+ 
+@@ -2326,6 +2336,10 @@
  
  		recv_recovery_from_checkpoint_finish();
  
@@ -768,7 +884,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 +2654,7 @@
+@@ -2647,6 +2661,7 @@
  	    && srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes < tablespace_size_in_header) {
  
@@ -776,7 +892,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: tablespace size stored in header"
-@@ -2683,6 +2691,7 @@
+@@ -2683,6 +2698,7 @@
  
  			return(DB_ERROR);
  		}
@@ -784,7 +900,7 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -2707,6 +2716,10 @@
+@@ -2707,6 +2723,10 @@
  
  	os_fast_mutex_free(&srv_os_test_mutex);
  
@@ -795,7 +911,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 +2759,7 @@
  		fts_optimize_init();
  	}
  
@@ -803,7 +919,7 @@
  	srv_was_started = TRUE;
  
  	return(DB_SUCCESS);
-@@ -2794,7 +2808,7 @@
+@@ -2794,7 +2815,7 @@
  		return(DB_SUCCESS);
  	}
  
@@ -972,3 +1088,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/innodb_int.h'
--- src/innodb_int.h	2013-04-16 10:35:58 +0000
+++ src/innodb_int.h	2013-04-22 11:05:38 +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)

=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2013-04-17 07:54:33 +0000
+++ src/xtrabackup.cc	2013-04-22 11:05:38 +0000
@@ -440,6 +440,7 @@
   OPT_XTRA_REBUILD_INDEXES,
 #if MYSQL_VERSION_ID >= 50600
   OPT_INNODB_CHECKSUM_ALGORITHM,
+  OPT_INNODB_UNDO_DIRECTORY,
   OPT_UNDO_TABLESPACES,
 #endif
   OPT_XTRA_INCREMENTAL_FORCE_SCAN,
@@ -805,14 +806,17 @@
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 
 #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
@@ -1205,7 +1209,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
@@ -1321,6 +1325,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:
@@ -2468,7 +2484,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);
 }
 
 /************************************************************************
@@ -5160,6 +5193,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-04-16 10:35:58 +0000
+++ test/inc/common.sh	2013-04-22 11:05:38 +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 -
 }
 
 ########################################################################
@@ -233,21 +220,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} \
---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}"
     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"
@@ -269,14 +250,49 @@
     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-error=${MYSQLD_ERRFILE}
+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
@@ -305,6 +321,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/t/bug1062684.sh'
--- test/t/bug1062684.sh	2013-03-08 04:37:16 +0000
+++ test/t/bug1062684.sh	2013-04-22 11:05:38 +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-22 11:05:38 +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-22 11:05:38 +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-22 11:05:38 +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-22 11:05:38 +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-22 11:05:38 +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-22 11:05:38 +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-22 11:05:38 +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	2013-02-05 11:54:27 +0000
+++ test/t/bug977101.sh	2013-04-22 11:05:38 +0000
@@ -17,16 +17,14 @@
 
 # Check that binlog info is correct with --safe-slave-backup
 innobackupex --no-timestamp --safe-slave-backup $topdir/backup
-run_cmd egrep -q '^mysql-bin.000001[[:space:]]+[0-9]+[[:space:]]+$' \
+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
-run_cmd egrep -q '^mysql-bin.000001[[:space:]]+[0-9]+[[:space:]]+$' \
+run_cmd egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
     $topdir/backup/xtrabackup_binlog_info
-run_cmd egrep -q \
-    '^CHANGE MASTER TO MASTER_LOG_FILE='\''mysql-bin.000001'\'', MASTER_LOG_POS=[0-9]+$' \
+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	2012-11-15 15:38:53 +0000
+++ test/t/ib_doublewrite.sh	2013-04-22 11:05:38 +0000
@@ -14,8 +14,13 @@
     exit $SKIPPED_EXIT_CODE
 fi
 
-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="
+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_slave_info.sh'
--- test/t/ib_slave_info.sh	2012-06-05 12:35:33 +0000
+++ test/t/ib_slave_info.sh	2013-04-22 11:05:38 +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/undo_tablespaces.sh'
--- test/t/undo_tablespaces.sh	1970-01-01 00:00:00 +0000
+++ test/t/undo_tablespaces.sh	2013-04-22 11:05:38 +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_version.sh'
--- test/t/xb_version.sh	2011-06-14 14:34:23 +0000
+++ test/t/xb_version.sh	2013-04-22 11:05:38 +0000
@@ -1,4 +1,3 @@
 . inc/common.sh
 
 xtrabackup --version
-

=== modified file 'test/testrun.sh'
--- test/testrun.sh	2013-04-09 07:13:17 +0000
+++ test/testrun.sh	2013-04-22 11:05:38 +0000
@@ -178,7 +178,7 @@
     then
 	INNODB_FLAVOR="XtraDB"
     else
-	INNODB_FLAVOR="innoDB"
+	INNODB_FLAVOR="InnoDB"
     fi
 
     if [ "$XB_BUILD" = "autodetect" ]