Merge lp:~akopytov/percona-xtrabackup/compact-backups into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

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

compact_compressed failures in debug builds is a result of index creating taking too long with all debug options turned on (in particular, UNIV_SYNC_DEBUG).

[Vadim Tkachenko (vadim-tk)]

Included Hrvoje to make sure that documentation is updated

[Sergei Glushchenko (sergei.glushchenko)]

This is not review. Just revision comment for rev. 460 caught my eye.

[Alexey Kopytov (akopytov)]

Another Jenkins build with recent bugfixes and merges with sporadic test suite failures: http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/148/

I also had to disable UNIV_SYNC_DEBUG and UNIV_MEM_DEBUG for debug builds, as compact_compress alone took more than 30 minutes on my not-so-slow laptop with most time spent in UNIV_SYNC_DEBUG and UNIV_MEM_DEBUG code paths when rebuilding indexes.

[Stewart Smith (stewart)]

So, I have some thoughts about if we should just use sparse files instead and be done with it, and also we naturally have more QA to do, but I'm pretty happy that this is able to be merged now without adversely impacting other features.

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-01-14 04:46:19 +0000
+++ innobackupex	2013-01-14 11:06:22 +0000
@@ -118,6 +118,7 @@
 my $option_safe_slave_backup_timeout = 300;
 
 my $option_compact = '';
+my $option_rebuild_indexes = '';
 
 # name of the my.cnf configuration file
 #my $config_file = '';
@@ -699,6 +700,7 @@
         '\.\.?|backup-my\.cnf|xtrabackup_logfile|' .
 	'xtrabackup_binary|xtrabackup_binlog_info|xtrabackup_checkpoints|' .
         '.*\.qp|' .
+        '.*\.pmap|.*\.tmp|' .
 	$iblog_files;
     my $compressed_data_file = '.*\.ibz$';
     my $file;
@@ -806,6 +808,7 @@
 sub apply_log {
     my $rcode;
     my $cmdline = '';
+    my $cmdline_copy = '';
     my $options = '';
 
     if ($option_defaults_file) {
@@ -839,6 +842,13 @@
 
     # run ibbackup as a child process
     $cmdline = "$option_ibbackup_binary $options";
+
+    # Only use --rebuild-indexes in the first xtrabackup call
+    $cmdline_copy = $cmdline;
+    if ($option_rebuild_indexes) {
+        $cmdline = $cmdline . " --rebuild-indexes"
+    }
+
     $now = current_time();
     print STDERR "\n$now  $prefix Starting ibbackup with command: $cmdline\n\n";
     $rcode = system("$cmdline");
@@ -850,6 +860,7 @@
     # We should not create ib_logfile files if we prepare for following incremental applies
     # Also we do not prepare ib_logfile if we applied incremental changes
     if (!( ($option_redo_only) or ($option_incremental_dir))) { 
+        $cmdline = $cmdline_copy;
         $now = current_time();
         print STDERR "\n$now  $prefix Restarting xtrabackup with command: $cmdline\nfor creating ib_logfile*\n\n";
         $rcode = system("$cmdline");
@@ -1036,8 +1047,12 @@
     if ($option_stream) {
 	$options = $options . " --stream=$option_stream";
     }
+
     if ($option_compact) {
-	$options = $options. " --compact";
+	$options = $options . " --compact";
+    }
+    if ($option_rebuild_indexes) {
+        $options = $options . " --rebuild-indexes";
     }
 
     $cmdline = "$option_ibbackup_binary $options";
@@ -1753,7 +1768,8 @@
                         'parallel=i' => \$option_parallel,
                         'safe-slave-backup' => \$option_safe_slave_backup,
                         'safe-slave-backup-timeout=i' => \$option_safe_slave_backup_timeout,
-                        'compact' => \$option_compact
+                        'compact' => \$option_compact,
+                        'rebuild-indexes' => \$option_rebuild_indexes
     );
                         
     if (!$rcode) {
@@ -2800,6 +2816,10 @@
 
 This option specifies the port to use when connecting to the database server with TCP/IP.  The option accepts a string argument. It is passed to the mysql child process. It is passed to the mysql child process without alteration. See mysql --help for details.
 
+=item --rebuild-indexes
+
+This option only has effect when used together with the --apply-log option and is passed directly to xtrabackup. When used, makes xtrabackup rebuild all secondary indexes after applying the log. This option is normally used to prepare compact backups. See the XtraBackup manual for more information.
+
 =item --redo-only
 
 This option is passed directly to xtrabackup's --apply-log-only option. This forces xtrabackup to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the xtrabackup documentation for details. 

=== modified file 'patches/innodb51.patch'
--- patches/innodb51.patch	2012-11-14 04:46:11 +0000
+++ patches/innodb51.patch	2013-01-14 11:06:22 +0000
@@ -30,7 +30,15 @@
  			n_not_null[i]++;
 --- a/storage/innodb_plugin/buf/buf0buf.c
 +++ b/storage/innodb_plugin/buf/buf0buf.c
-@@ -358,7 +358,7 @@
+@@ -51,6 +51,7 @@
+ #include "dict0dict.h"
+ #include "log0recv.h"
+ #include "page0zip.h"
++#include "xb0xb.h"
+ 
+ /*
+ 		IMPLEMENTATION OF THE BUFFER POOL
+@@ -358,7 +359,7 @@
  		return(TRUE);
  	}
  
@@ -39,7 +47,15 @@
  	if (recv_lsn_checks_on) {
  		ib_uint64_t	current_lsn;
  
-@@ -1690,7 +1690,9 @@
+@@ -670,6 +671,7 @@
+ 	block->page.in_flush_list = FALSE;
+ 	block->page.in_free_list = FALSE;
+ 	block->page.in_LRU_list = FALSE;
++	block->page.is_compacted = FALSE;
+ 	block->in_unzip_LRU_list = FALSE;
+ #endif /* UNIV_DEBUG */
+ #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
+@@ -1690,7 +1692,9 @@
  	ut_ad(zip_size == fil_space_get_zip_size(space));
  	ut_ad(ut_is_2pow(zip_size));
  #ifndef UNIV_LOG_DEBUG
@@ -50,12 +66,26 @@
  #endif
  	buf_pool->stat.n_page_gets++;
  loop:
-@@ -2894,7 +2896,7 @@
+@@ -2802,6 +2806,12 @@
+ 			frame = ((buf_block_t*) bpage)->frame;
+ 		}
+ 
++		/* Do not validate, recover and apply change buffer entries to
++		bogus pages which replace skipped pages in compact backups. */
++		if (srv_compact_backup && buf_page_is_compacted(frame)) {
++			bpage->is_compacted = TRUE;
++		}
++
+ 		/* If this page is not uninitialized and not in the
+ 		doublewrite buffer, then the page number and space id
+ 		should be the same as in block. */
+@@ -2894,7 +2904,8 @@
  			recv_recover_page(TRUE, (buf_block_t*) bpage);
  		}
  
 -		if (uncompressed && !recv_no_ibuf_operations) {
-+		if (uncompressed && !recv_no_ibuf_operations && !srv_fake_write) {
++		if (uncompressed && !recv_no_ibuf_operations &&
++		    !srv_fake_write && !bpage->is_compacted) {
  			ibuf_merge_or_delete_for_page(
  				(buf_block_t*) bpage, bpage->space,
  				bpage->offset, buf_page_get_zip_size(bpage),
@@ -783,7 +813,7 @@
  		/* In this fastest shutdown we do not flush the buffer pool:
 --- a/storage/innodb_plugin/log/log0recv.c
 +++ b/storage/innodb_plugin/log/log0recv.c
-@@ -42,27 +42,27 @@
+@@ -42,27 +42,28 @@
  #include "trx0undo.h"
  #include "trx0rec.h"
  #include "fil0fil.h"
@@ -797,6 +827,7 @@
  # include "sync0sync.h"
 -#else /* !UNIV_HOTBACKUP */
 +//#else /* !UNIV_HOTBACKUP */
++#include "xb0xb.h"
  
  /** This is set to FALSE if the backup was originally taken with the
  ibbackup --include regexp option: then we do not want to create tables in
@@ -815,7 +846,7 @@
  
  /** The recovery system */
  UNIV_INTERN recv_sys_t*	recv_sys = NULL;
-@@ -251,7 +251,7 @@
+@@ -251,7 +252,7 @@
  {
  	recv_lsn_checks_on = FALSE;
  
@@ -824,7 +855,7 @@
  
  	recv_recovery_on = FALSE;
  
-@@ -277,7 +277,7 @@
+@@ -277,7 +278,7 @@
  
  	recv_max_parsed_page_no	= 0;
  
@@ -833,7 +864,7 @@
  
  	recv_max_page_lsn = 0;
  }
-@@ -613,7 +613,7 @@
+@@ -613,7 +614,7 @@
  /***********************************************************************//**
  Checks the consistency of the checkpoint info
  @return	TRUE if ok */
@@ -842,7 +873,7 @@
  ibool
  recv_check_cp_is_consistent(
  /*========================*/
-@@ -643,7 +643,7 @@
+@@ -643,7 +644,7 @@
  /********************************************************//**
  Looks for the maximum consistent checkpoint from the log groups.
  @return	error code or DB_SUCCESS */
@@ -851,7 +882,7 @@
  ulint
  recv_find_max_checkpoint(
  /*=====================*/
-@@ -818,7 +818,7 @@
+@@ -818,7 +819,7 @@
  InnoDB-3.23.52 where the checksum field contains the log block number.
  @return TRUE if ok, or if the log block may be in the format of InnoDB
  version predating 3.23.52 */
@@ -860,7 +891,7 @@
  ibool
  log_block_checksum_is_ok_or_old_format(
  /*===================================*/
-@@ -1486,6 +1486,7 @@
+@@ -1486,6 +1487,7 @@
  					     buf_block_get_page_no(block));
  
  	if ((recv_addr == NULL)
@@ -868,7 +899,25 @@
  	    || (recv_addr->state == RECV_BEING_PROCESSED)
  	    || (recv_addr->state == RECV_PROCESSED)) {
  
-@@ -2297,7 +2298,7 @@
+@@ -1575,9 +1577,16 @@
+ 			if (page_zip) {
+ 				memset(FIL_PAGE_LSN + page_zip->data, 0, 8);
+ 			}
++
++			if (block->page.is_compacted) {
++
++				ut_ad(srv_compact_backup);
++
++				block->page.is_compacted = FALSE;
++			}
+ 		}
+ 
+-		if (recv->start_lsn >= page_lsn) {
++		if (!block->page.is_compacted && recv->start_lsn >= page_lsn) {
+ 
+ 			ib_uint64_t	end_lsn;
+ 
+@@ -2297,7 +2306,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -877,7 +926,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2320,7 +2321,7 @@
+@@ -2320,7 +2329,7 @@
  					ut_error;
  				}
  			}
@@ -886,7 +935,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2737,8 +2738,11 @@
+@@ -2737,8 +2746,11 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -900,7 +949,7 @@
  		}
  	}
  
-@@ -2850,12 +2854,14 @@
+@@ -2850,12 +2862,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -916,7 +965,7 @@
  	}
  }
  
-@@ -3005,6 +3011,7 @@
+@@ -3005,6 +3019,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -924,7 +973,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3286,6 +3293,7 @@
+@@ -3286,6 +3301,7 @@
  	that the data dictionary tables will be free of any locks.
  	The data dictionary latch should guarantee that there is at
  	most one data dictionary transaction active at a time. */
@@ -1007,46 +1056,6 @@
  #endif
  }
  
---- a/storage/innodb_plugin/row/row0merge.c
-+++ b/storage/innodb_plugin/row/row0merge.c
-@@ -453,7 +453,9 @@
- 	rec = rec_convert_dtuple_to_rec(*buf, index, tuple, n_ext);
- 	offsets = rec_get_offsets(rec, index, NULL, ULINT_UNDEFINED, &heap);
- 
--	innobase_rec_to_mysql(dup->table, rec, index, offsets);
-+	//innobase_rec_to_mysql(dup->table, rec, index, offsets);
-+	fprintf(stderr, "InnoDB: Error: row_merge_dup_report() is called.\n");
-+	ut_error;
- 
- 	mem_heap_free(heap);
- }
-@@ -1457,8 +1459,12 @@
- 		case 0:
- 			if (UNIV_UNLIKELY
- 			    (dict_index_is_unique(index) && !null_eq)) {
--				innobase_rec_to_mysql(table, mrec0,
--						      index, offsets0);
-+				//innobase_rec_to_mysql(table, mrec0,
-+				//		      index, offsets0);
-+				(void) table;
-+				fprintf(stderr, "InnoDB: Error: "
-+					"row_merge_blocks() is called.\n");
-+				ut_error;
- 				mem_heap_free(heap);
- 				return(DB_DUPLICATE_KEY);
- 			}
-@@ -2584,7 +2590,10 @@
- 
- 	/* Reset the MySQL row buffer that is used when reporting
- 	duplicate keys. */
--	innobase_rec_reset(table);
-+	//innobase_rec_reset(table);
-+	fprintf(stderr, "InnoDB: Error: row_merge_build_indexes() is called."
-+		"\n");
-+	ut_error;
- 
- 	/* Read clustered index of the table and create files for
- 	secondary index entries for merge sort */
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -374,6 +374,9 @@
@@ -1086,7 +1095,15 @@
  /*********************************************************************//**
 --- a/storage/innodb_plugin/srv/srv0start.c
 +++ b/storage/innodb_plugin/srv/srv0start.c
-@@ -94,6 +94,8 @@
+@@ -62,6 +62,7 @@
+ #include "ibuf0ibuf.h"
+ #include "srv0start.h"
+ #include "srv0srv.h"
++#include "xb0xb.h"
+ #ifndef UNIV_HOTBACKUP
+ # include "os0proc.h"
+ # include "sync0sync.h"
+@@ -94,6 +95,8 @@
  /** Log sequence number at shutdown */
  UNIV_INTERN ib_uint64_t	srv_shutdown_lsn;
  
@@ -1095,7 +1112,7 @@
  #ifdef HAVE_DARWIN_THREADS
  # include <sys/utsname.h>
  /** TRUE if the F_FULLFSYNC option is available */
-@@ -544,7 +546,7 @@
+@@ -544,7 +547,7 @@
  /*********************************************************************//**
  Creates or opens the log files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1104,7 +1121,7 @@
  ulint
  open_or_create_log_file(
  /*====================*/
-@@ -702,7 +704,7 @@
+@@ -702,7 +705,7 @@
  /*********************************************************************//**
  Creates or opens database data files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1113,7 +1130,7 @@
  ulint
  open_or_create_data_files(
  /*======================*/
-@@ -1359,7 +1361,7 @@
+@@ -1359,7 +1362,7 @@
  	}
  #endif /* UNIV_LOG_ARCHIVE */
  
@@ -1122,7 +1139,7 @@
  		fprintf(stderr,
  			"InnoDB: Error: combined size of log files"
  			" must be < 4 GB\n");
-@@ -1601,6 +1603,10 @@
+@@ -1601,6 +1604,10 @@
  		are initialized in trx_sys_init_at_db_start(). */
  
  		recv_recovery_from_checkpoint_finish();
@@ -1133,7 +1150,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
-@@ -1747,7 +1753,18 @@
+@@ -1747,7 +1754,18 @@
  
  	if (srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes < tablespace_size_in_header) {
@@ -1152,7 +1169,7 @@
  		fprintf(stderr,
  			"InnoDB: Error: tablespace size stored in header"
  			" is %lu pages, but\n"
-@@ -1772,6 +1789,7 @@
+@@ -1772,6 +1790,7 @@
  
  			return(DB_ERROR);
  		}
@@ -1160,7 +1177,18 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -1867,6 +1885,7 @@
+@@ -1793,6 +1812,10 @@
+ 
+ 	os_fast_mutex_free(&srv_os_test_mutex);
+ 
++	if (srv_rebuild_indexes) {
++		xb_compact_rebuild_indexes();
++	}
++
+ 	if (srv_print_verbose_log) {
+ 		ut_print_timestamp(stderr);
+ 		fprintf(stderr,
+@@ -1867,6 +1890,7 @@
  		ibuf_update_max_tablespace_id();
  	}
  
@@ -1251,3 +1279,38 @@
  						} else {
  							fprintf(stderr,
  								"InnoDB: Since"
+--- a/storage/innodb_plugin/sync/sync0arr.c
++++ b/storage/innodb_plugin/sync/sync0arr.c
+@@ -40,6 +40,7 @@
+ #include "os0sync.h"
+ #include "os0file.h"
+ #include "srv0srv.h"
++#include "xb0xb.h"
+ 
+ /*
+ 			WAIT ARRAY
+@@ -927,6 +928,13 @@
+ 	ibool		fatal = FALSE;
+ 	double		longest_diff = 0;
+ 
++	if (srv_rebuild_indexes) {
++
++		/* Avoid long semaphore warnings when rebuilding indexes */
++
++		return(FALSE);
++	}
++
+ 	for (i = 0; i < sync_primary_wait_array->n_cells; i++) {
+ 
+ 		double	diff;
+--- a/storage/innodb_plugin/include/buf0buf.h
++++ b/storage/innodb_plugin/include/buf0buf.h
+@@ -1191,6 +1191,8 @@
+ 					frees a page in buffer pool */
+ # endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
+ #endif /* !UNIV_HOTBACKUP */
++	ibool		is_compacted;	/*!< TRUE if the page was skipped in
++					compact backups */
+ };
+ 
+ /** The buffer control block structure */

=== modified file 'patches/innodb55.patch'
--- patches/innodb55.patch	2012-02-22 16:37:18 +0000
+++ patches/innodb55.patch	2013-01-14 11:06:22 +0000
@@ -20,7 +20,15 @@
  /*===================*/
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -518,7 +518,7 @@
+@@ -51,6 +51,7 @@
+ #include "dict0dict.h"
+ #include "log0recv.h"
+ #include "page0zip.h"
++#include "xb0xb.h"
+ 
+ /*
+ 		IMPLEMENTATION OF THE BUFFER POOL
+@@ -518,7 +519,7 @@
  		return(TRUE);
  	}
  
@@ -29,7 +37,15 @@
  	if (recv_lsn_checks_on) {
  		ib_uint64_t	current_lsn;
  
-@@ -2299,7 +2299,8 @@
+@@ -881,6 +882,7 @@
+ 	block->page.in_flush_list = FALSE;
+ 	block->page.in_free_list = FALSE;
+ 	block->page.in_LRU_list = FALSE;
++	block->page.is_compacted = FALSE;
+ 	block->in_unzip_LRU_list = FALSE;
+ #endif /* UNIV_DEBUG */
+ #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
+@@ -2299,7 +2301,8 @@
  	ut_ad(zip_size == fil_space_get_zip_size(space));
  	ut_ad(ut_is_2pow(zip_size));
  #ifndef UNIV_LOG_DEBUG
@@ -39,12 +55,27 @@
  	      || ibuf_page_low(space, zip_size, offset,
  			       FALSE, file, line, NULL));
  #endif
-@@ -3668,7 +3669,7 @@
+@@ -3567,6 +3570,13 @@
+ 			frame = ((buf_block_t*) bpage)->frame;
+ 		}
+ 
++		/* Do not validate, recover and apply change buffer entries to
++		bogus pages which replace skipped pages in compact backups. */
++		if (srv_compact_backup && buf_page_is_compacted(frame)) {
++
++			bpage->is_compacted = TRUE;
++		}
++
+ 		/* If this page is not uninitialized and not in the
+ 		doublewrite buffer, then the page number and space id
+ 		should be the same as in block. */
+@@ -3668,7 +3678,8 @@
  			recv_recover_page(TRUE, (buf_block_t*) bpage);
  		}
  
 -		if (uncompressed && !recv_no_ibuf_operations) {
-+		if (uncompressed && !recv_no_ibuf_operations && !srv_fake_write) {
++		if (uncompressed && !recv_no_ibuf_operations &&
++		    !srv_fake_write && !bpage->is_compacted) {
  			ibuf_merge_or_delete_for_page(
  				(buf_block_t*) bpage, bpage->space,
  				bpage->offset, buf_page_get_zip_size(bpage),
@@ -695,7 +726,7 @@
  	server_busy = log_sys->n_pending_checkpoint_writes
 --- a/storage/innobase/log/log0recv.c
 +++ b/storage/innobase/log/log0recv.c
-@@ -42,27 +42,27 @@
+@@ -42,27 +42,28 @@
  #include "trx0undo.h"
  #include "trx0rec.h"
  #include "fil0fil.h"
@@ -709,6 +740,7 @@
  # include "sync0sync.h"
 -#else /* !UNIV_HOTBACKUP */
 +//#else /* !UNIV_HOTBACKUP */
++#include "xb0xb.h"
  
  /** This is set to FALSE if the backup was originally taken with the
  ibbackup --include regexp option: then we do not want to create tables in
@@ -727,7 +759,7 @@
  
  /** The recovery system */
  UNIV_INTERN recv_sys_t*	recv_sys = NULL;
-@@ -259,7 +259,7 @@
+@@ -259,7 +260,7 @@
  {
  	recv_lsn_checks_on = FALSE;
  
@@ -736,7 +768,7 @@
  
  	recv_recovery_on = FALSE;
  
-@@ -285,7 +285,7 @@
+@@ -285,7 +286,7 @@
  
  	recv_max_parsed_page_no	= 0;
  
@@ -745,7 +777,7 @@
  
  	recv_max_page_lsn = 0;
  }
-@@ -623,7 +623,7 @@
+@@ -623,7 +624,7 @@
  /***********************************************************************//**
  Checks the consistency of the checkpoint info
  @return	TRUE if ok */
@@ -754,7 +786,7 @@
  ibool
  recv_check_cp_is_consistent(
  /*========================*/
-@@ -653,7 +653,7 @@
+@@ -653,7 +654,7 @@
  /********************************************************//**
  Looks for the maximum consistent checkpoint from the log groups.
  @return	error code or DB_SUCCESS */
@@ -763,7 +795,7 @@
  ulint
  recv_find_max_checkpoint(
  /*=====================*/
-@@ -828,7 +828,7 @@
+@@ -828,7 +829,7 @@
  InnoDB-3.23.52 where the checksum field contains the log block number.
  @return TRUE if ok, or if the log block may be in the format of InnoDB
  version predating 3.23.52 */
@@ -772,7 +804,7 @@
  ibool
  log_block_checksum_is_ok_or_old_format(
  /*===================================*/
-@@ -1496,6 +1496,7 @@
+@@ -1496,6 +1497,7 @@
  					     buf_block_get_page_no(block));
  
  	if ((recv_addr == NULL)
@@ -780,7 +812,25 @@
  	    || (recv_addr->state == RECV_BEING_PROCESSED)
  	    || (recv_addr->state == RECV_PROCESSED)) {
  
-@@ -2308,7 +2309,7 @@
+@@ -1585,9 +1587,16 @@
+ 			if (page_zip) {
+ 				memset(FIL_PAGE_LSN + page_zip->data, 0, 8);
+ 			}
++
++			if (block->page.is_compacted) {
++
++				ut_ad(srv_compact_backup);
++
++				block->page.is_compacted = FALSE;
++			}
+ 		}
+ 
+-		if (recv->start_lsn >= page_lsn) {
++		if (!block->page.is_compacted && recv->start_lsn >= page_lsn) {
+ 
+ 			ib_uint64_t	end_lsn;
+ 
+@@ -2308,7 +2317,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -789,7 +839,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2331,7 +2332,7 @@
+@@ -2331,7 +2340,7 @@
  					ut_error;
  				}
  			}
@@ -798,7 +848,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2748,8 +2749,11 @@
+@@ -2748,8 +2757,11 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -812,7 +862,7 @@
  		}
  	}
  
-@@ -2863,12 +2867,14 @@
+@@ -2863,12 +2875,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -828,7 +878,7 @@
  	}
  }
  
-@@ -3018,6 +3024,7 @@
+@@ -3018,6 +3032,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -836,7 +886,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3299,6 +3306,7 @@
+@@ -3299,6 +3314,7 @@
  	that the data dictionary tables will be free of any locks.
  	The data dictionary latch should guarantee that there is at
  	most one data dictionary transaction active at a time. */
@@ -918,44 +968,6 @@
 +*/
  #endif
  }
---- a/storage/innobase/row/row0merge.c
-+++ b/storage/innobase/row/row0merge.c
-@@ -459,7 +459,9 @@
- 	rec = rec_convert_dtuple_to_rec(*buf, index, tuple, n_ext);
- 	offsets = rec_get_offsets(rec, index, NULL, ULINT_UNDEFINED, &heap);
- 
--	innobase_rec_to_mysql(dup->table, rec, index, offsets);
-+	//innobase_rec_to_mysql(dup->table, rec, index, offsets);
-+	fprintf(stderr, "InnoDB: Error: row_merge_dup_report() is called.\n");
-+	ut_error;
- 
- 	mem_heap_free(heap);
- }
-@@ -1478,8 +1480,12 @@
- 		case 0:
- 			if (UNIV_UNLIKELY
- 			    (dict_index_is_unique(index) && !null_eq)) {
--				innobase_rec_to_mysql(table, mrec0,
-+				/* innobase_rec_to_mysql(table, mrec0,
- 						      index, offsets0);
-+				*/
-+				(void) table;
-+				fprintf(stderr, "InnoDB: Error: row_merge_blocks() is called.\n");
-+				ut_error;
- 				mem_heap_free(heap);
- 				return(DB_DUPLICATE_KEY);
- 			}
-@@ -2627,7 +2633,9 @@
- 
- 	/* Reset the MySQL row buffer that is used when reporting
- 	duplicate keys. */
--	innobase_rec_reset(table);
-+	//innobase_rec_reset(table);
-+	fprintf(stderr, "InnoDB: Error: row_merge_build_indexes() is called.\n");
-+	ut_error;
- 
- 	/* Read clustered index of the table and create files for
- 	secondary index entries for merge sort */
 --- a/storage/innobase/srv/srv0srv.c
 +++ b/storage/innobase/srv/srv0srv.c
 @@ -399,6 +399,9 @@
@@ -1004,7 +1016,15 @@
  	if (trx->was_chosen_as_deadlock_victim) {
 --- a/storage/innobase/srv/srv0start.c
 +++ b/storage/innobase/srv/srv0start.c
-@@ -93,6 +93,8 @@
+@@ -62,6 +62,7 @@
+ #include "ibuf0ibuf.h"
+ #include "srv0start.h"
+ #include "srv0srv.h"
++#include "xb0xb.h"
+ #ifndef UNIV_HOTBACKUP
+ # include "os0proc.h"
+ # include "sync0sync.h"
+@@ -93,6 +94,8 @@
  /** Log sequence number at shutdown */
  UNIV_INTERN ib_uint64_t	srv_shutdown_lsn;
  
@@ -1013,7 +1033,7 @@
  #ifdef HAVE_DARWIN_THREADS
  # include <sys/utsname.h>
  /** TRUE if the F_FULLFSYNC option is available */
-@@ -548,7 +550,7 @@
+@@ -548,7 +551,7 @@
  /*********************************************************************//**
  Creates or opens the log files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1022,7 +1042,7 @@
  ulint
  open_or_create_log_file(
  /*====================*/
-@@ -708,7 +710,7 @@
+@@ -708,7 +711,7 @@
  /*********************************************************************//**
  Creates or opens database data files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1031,7 +1051,7 @@
  ulint
  open_or_create_data_files(
  /*======================*/
-@@ -1419,7 +1421,7 @@
+@@ -1419,7 +1422,7 @@
  	}
  #endif /* UNIV_LOG_ARCHIVE */
  
@@ -1040,7 +1060,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: combined size of log files"
-@@ -1714,6 +1716,10 @@
+@@ -1714,6 +1717,10 @@
  		are initialized in trx_sys_init_at_db_start(). */
  
  		recv_recovery_from_checkpoint_finish();
@@ -1051,7 +1071,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
-@@ -1873,6 +1879,17 @@
+@@ -1873,6 +1880,17 @@
  	if (!srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes != tablespace_size_in_header) {
  
@@ -1069,7 +1089,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: tablespace size"
-@@ -1952,6 +1969,7 @@
+@@ -1952,6 +1970,7 @@
  
  			return(DB_ERROR);
  		}
@@ -1077,7 +1097,18 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -2064,6 +2082,7 @@
+@@ -1976,6 +1995,10 @@
+ 
+ 	os_fast_mutex_free(&srv_os_test_mutex);
+ 
++	if (srv_rebuild_indexes) {
++		xb_compact_rebuild_indexes();
++	}
++
+ 	if (srv_print_verbose_log) {
+ 		ut_print_timestamp(stderr);
+ 		fprintf(stderr,
+@@ -2064,6 +2087,7 @@
  		ibuf_update_max_tablespace_id();
  	}
  
@@ -1168,3 +1199,51 @@
  	ut_a(purge_sys->trx->n_active_thrs == 0);
  
  	rw_lock_x_lock(&purge_sys->latch);
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -149,7 +149,9 @@
+   SET(CMAKE_REQUIRED_LIBRARIES 
+     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
+ 
+-  LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
++  IF(CMAKE_REQUIRED_LIBRARIES)
++    LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
++  ENDIF()
+   LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
+   
+   OPTION(WITH_LIBWRAP "Compile with tcp wrappers support" OFF)
+--- a/storage/innobase/sync/sync0arr.c
++++ b/storage/innobase/sync/sync0arr.c
+@@ -41,6 +41,7 @@
+ #include "os0file.h"
+ #include "srv0srv.h"
+ #include "ha_prototypes.h"
++#include "xb0xb.h"
+ 
+ /*
+ 			WAIT ARRAY
+@@ -928,6 +929,13 @@
+ 	ibool		fatal = FALSE;
+ 	double		longest_diff = 0;
+ 
++	if (srv_rebuild_indexes) {
++
++		/* Avoid long semaphore warnings when rebuilding indexes */
++
++		return(FALSE);
++	}
++
+ #ifdef UNIV_DEBUG_VALGRIND
+ 	/* Increase the timeouts if running under valgrind because it executes
+ 	extremely slowly. UNIV_DEBUG_VALGRIND does not necessary mean that
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
+@@ -1441,6 +1441,8 @@
+ 					frees a page in buffer pool */
+ # endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
+ #endif /* !UNIV_HOTBACKUP */
++	ibool		is_compacted;	/*!< TRUE if the page was skipped in
++					compact backups */
+ };
+ 
+ /** The buffer control block structure */

=== modified file 'patches/xtradb51.patch'
--- patches/xtradb51.patch	2012-02-22 16:37:18 +0000
+++ patches/xtradb51.patch	2013-01-14 11:06:22 +0000
@@ -20,7 +20,15 @@
  /*===================*/
 --- a/storage/innodb_plugin/buf/buf0buf.c
 +++ b/storage/innodb_plugin/buf/buf0buf.c
-@@ -412,7 +412,7 @@
+@@ -53,6 +53,7 @@
+ #include "page0zip.h"
+ #include "trx0trx.h"
+ #include "srv0start.h"
++#include "xb0xb.h"
+ 
+ /* prototypes for new functions added to ha_innodb.cc */
+ trx_t* innobase_get_trx();
+@@ -412,7 +413,7 @@
  		return(TRUE);
  	}
  
@@ -29,7 +37,15 @@
  	if (recv_lsn_checks_on) {
  		ib_uint64_t	current_lsn;
  
-@@ -1888,7 +1888,9 @@
+@@ -744,6 +745,7 @@
+ 	block->page.zip_list.prev = NULL;
+ 	block->page.zip_list.next = NULL;
+ 	block->page.in_LRU_list = FALSE;
++	block->page.is_compacted = FALSE;
+ 	block->in_unzip_LRU_list = FALSE;
+ #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
+ 	block->n_pointers = 0;
+@@ -1888,7 +1890,9 @@
  	ut_ad(zip_size == fil_space_get_zip_size(space));
  	ut_ad(ut_is_2pow(zip_size));
  #ifndef UNIV_LOG_DEBUG
@@ -40,12 +56,27 @@
  #endif
  	if (innobase_get_slow_log()) {
  		trx = innobase_get_trx();
-@@ -3302,7 +3304,7 @@
+@@ -3190,6 +3194,13 @@
+ 			frame = ((buf_block_t*) bpage)->frame;
+ 		}
+ 
++		/* Do not validate, recover and apply change buffer entries to
++		bogus pages which replace skipped pages in compact backups. */
++		if (srv_compact_backup && buf_page_is_compacted(frame)) {
++
++			bpage->is_compacted = TRUE;
++		}
++
+ 		/* If this page is not uninitialized and not in the
+ 		doublewrite buffer, then the page number and space id
+ 		should be the same as in block. */
+@@ -3302,7 +3313,8 @@
  			recv_recover_page(TRUE, (buf_block_t*) bpage);
  		}
  
 -		if (uncompressed && !recv_no_ibuf_operations) {
-+		if (uncompressed && !recv_no_ibuf_operations && !srv_fake_write) {
++		if (uncompressed && !recv_no_ibuf_operations &&
++		    !srv_fake_write && !bpage->is_compacted) {
  			ibuf_merge_or_delete_for_page(
  				/* Delete possible entries, if bpage is_corrupt */
  				(srv_pass_corrupt_table && bpage->is_corrupt) ? NULL :
@@ -723,7 +754,7 @@
  		/* In this fastest shutdown we do not flush the buffer pool:
 --- a/storage/innodb_plugin/log/log0recv.c
 +++ b/storage/innodb_plugin/log/log0recv.c
-@@ -42,27 +42,27 @@
+@@ -42,27 +42,28 @@
  #include "trx0undo.h"
  #include "trx0rec.h"
  #include "fil0fil.h"
@@ -737,6 +768,7 @@
  # include "sync0sync.h"
 -#else /* !UNIV_HOTBACKUP */
 +//#else /* !UNIV_HOTBACKUP */
++#include "xb0xb.h"
  
  /** This is set to FALSE if the backup was originally taken with the
  ibbackup --include regexp option: then we do not want to create tables in
@@ -755,7 +787,7 @@
  
  /** The recovery system */
  UNIV_INTERN recv_sys_t*	recv_sys = NULL;
-@@ -621,7 +621,7 @@
+@@ -621,7 +622,7 @@
  /***********************************************************************//**
  Checks the consistency of the checkpoint info
  @return	TRUE if ok */
@@ -764,7 +796,7 @@
  ibool
  recv_check_cp_is_consistent(
  /*========================*/
-@@ -651,7 +651,7 @@
+@@ -651,7 +652,7 @@
  /********************************************************//**
  Looks for the maximum consistent checkpoint from the log groups.
  @return	error code or DB_SUCCESS */
@@ -773,7 +805,7 @@
  ulint
  recv_find_max_checkpoint(
  /*=====================*/
-@@ -840,7 +840,7 @@
+@@ -840,7 +841,7 @@
  InnoDB-3.23.52 where the checksum field contains the log block number.
  @return TRUE if ok, or if the log block may be in the format of InnoDB
  version predating 3.23.52 */
@@ -782,7 +814,25 @@
  ibool
  log_block_checksum_is_ok_or_old_format(
  /*===================================*/
-@@ -2369,7 +2369,7 @@
+@@ -1629,9 +1630,16 @@
+ 			if (page_zip) {
+ 				memset(FIL_PAGE_LSN + page_zip->data, 0, 8);
+ 			}
++
++			if (block->page.is_compacted) {
++
++				ut_ad(srv_compact_backup);
++
++				block->page.is_compacted = FALSE;
++			}
+ 		}
+ 
+-		if (recv->start_lsn >= page_lsn) {
++		if (!block->page.is_compacted && recv->start_lsn >= page_lsn) {
+ 
+ 			ib_uint64_t	end_lsn;
+ 
+@@ -2369,7 +2377,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -791,7 +841,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2392,7 +2392,7 @@
+@@ -2392,7 +2400,7 @@
  					ut_error;
  				}
  			}
@@ -800,7 +850,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2809,8 +2809,11 @@
+@@ -2809,8 +2817,11 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -814,7 +864,7 @@
  		}
  	}
  
-@@ -2922,12 +2925,14 @@
+@@ -2922,12 +2933,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -830,7 +880,7 @@
  	}
  }
  
-@@ -3095,6 +3100,7 @@
+@@ -3095,6 +3108,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -838,7 +888,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3453,6 +3459,7 @@
+@@ -3453,6 +3467,7 @@
  	that the data dictionary tables will be free of any locks.
  	The data dictionary latch should guarantee that there is at
  	most one data dictionary transaction active at a time. */
@@ -921,44 +971,6 @@
  #endif
  }
  
---- a/storage/innodb_plugin/row/row0merge.c
-+++ b/storage/innodb_plugin/row/row0merge.c
-@@ -454,7 +454,9 @@
- 	rec = rec_convert_dtuple_to_rec(*buf, index, tuple, n_ext);
- 	offsets = rec_get_offsets(rec, index, NULL, ULINT_UNDEFINED, &heap);
- 
--	innobase_rec_to_mysql(dup->table, rec, index, offsets);
-+	//innobase_rec_to_mysql(dup->table, rec, index, offsets);
-+	fprintf(stderr, "InnoDB: Error: row_merge_dup_report() is called.\n");
-+	ut_error;
- 
- 	mem_heap_free(heap);
- }
-@@ -1465,8 +1467,11 @@
- 		case 0:
- 			if (UNIV_UNLIKELY
- 			    (dict_index_is_unique(index) && !null_eq)) {
--				innobase_rec_to_mysql(table, mrec0,
--						      index, offsets0);
-+				//innobase_rec_to_mysql(table, mrec0,
-+				//		      index, offsets0);
-+				(void) table;
-+				fprintf(stderr, "InnoDB: Error: row_merge_blocks() is called.\n");
-+				ut_error;
- 				mem_heap_free(heap);
- 				return(DB_DUPLICATE_KEY);
- 			}
-@@ -2594,7 +2599,9 @@
- 
- 	/* Reset the MySQL row buffer that is used when reporting
- 	duplicate keys. */
--	innobase_rec_reset(table);
-+	//innobase_rec_reset(table);
-+	fprintf(stderr, "InnoDB: Error: row_merge_build_indexes() is called.\n");
-+	ut_error;
- 
- 	/* Read clustered index of the table and create files for
- 	secondary index entries for merge sort */
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -86,11 +86,6 @@
@@ -1048,7 +1060,15 @@
  
 --- a/storage/innodb_plugin/srv/srv0start.c
 +++ b/storage/innodb_plugin/srv/srv0start.c
-@@ -95,6 +95,8 @@
+@@ -62,6 +62,7 @@
+ #include "ibuf0ibuf.h"
+ #include "srv0start.h"
+ #include "srv0srv.h"
++#include "xb0xb.h"
+ #ifndef UNIV_HOTBACKUP
+ # include "os0proc.h"
+ # include "sync0sync.h"
+@@ -95,6 +96,8 @@
  /** Log sequence number at shutdown */
  UNIV_INTERN ib_uint64_t	srv_shutdown_lsn;
  
@@ -1057,7 +1077,7 @@
  #ifdef HAVE_DARWIN_THREADS
  # include <sys/utsname.h>
  /** TRUE if the F_FULLFSYNC option is available */
-@@ -545,7 +547,7 @@
+@@ -545,7 +548,7 @@
  /*********************************************************************//**
  Creates or opens the log files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1066,7 +1086,7 @@
  ulint
  open_or_create_log_file(
  /*====================*/
-@@ -703,7 +705,7 @@
+@@ -703,7 +706,7 @@
  /*********************************************************************//**
  Creates or opens database data files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1075,7 +1095,7 @@
  ulint
  open_or_create_data_files(
  /*======================*/
-@@ -1782,6 +1784,10 @@
+@@ -1782,6 +1785,10 @@
  		are initialized in trx_sys_init_at_db_start(). */
  
  		recv_recovery_from_checkpoint_finish();
@@ -1086,7 +1106,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
-@@ -1962,7 +1968,18 @@
+@@ -1962,7 +1969,18 @@
  
  	if (srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes < tablespace_size_in_header) {
@@ -1105,7 +1125,7 @@
  		fprintf(stderr,
  			"InnoDB: Error: tablespace size stored in header"
  			" is %lu pages, but\n"
-@@ -1987,6 +2004,7 @@
+@@ -1987,6 +2005,7 @@
  
  			return(DB_ERROR);
  		}
@@ -1113,7 +1133,18 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -2089,6 +2107,7 @@
+@@ -2008,6 +2027,10 @@
+ 
+ 	os_fast_mutex_free(&srv_os_test_mutex);
+ 
++	if (srv_rebuild_indexes) {
++		xb_compact_rebuild_indexes();
++	}
++
+ 	if (!srv_file_per_table_original_value
+ 	    && srv_pass_corrupt_table) {
+ 		fprintf(stderr, "InnoDB: Warning:"
+@@ -2089,6 +2112,7 @@
  		ibuf_update_max_tablespace_id();
  	}
  
@@ -1334,3 +1365,38 @@
  
  			/* Write the log but do not flush it to disk */
  
+--- a/storage/innodb_plugin/sync/sync0arr.c
++++ b/storage/innodb_plugin/sync/sync0arr.c
+@@ -40,6 +40,7 @@
+ #include "os0sync.h"
+ #include "os0file.h"
+ #include "srv0srv.h"
++#include "xb0xb.h"
+ 
+ /*
+ 			WAIT ARRAY
+@@ -926,6 +927,13 @@
+ 	ibool		fatal = FALSE;
+ 	double		longest_diff = 0;
+ 
++	if (srv_rebuild_indexes) {
++
++		/* Avoid long semaphore warnings when rebuilding indexes */
++
++		return(FALSE);
++	}
++
+ 	for (i = 0; i < sync_primary_wait_array->n_cells; i++) {
+ 
+ 		double	diff;
+--- a/storage/innodb_plugin/include/buf0buf.h
++++ b/storage/innodb_plugin/include/buf0buf.h
+@@ -1211,6 +1211,8 @@
+ 					frees a page in buffer pool */
+ # endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
+ #endif /* !UNIV_HOTBACKUP */
++	ibool		is_compacted;	/*!< TRUE if the page was skipped in
++					compact backups */
+ };
+ 
+ /** The buffer control block structure */

=== modified file 'patches/xtradb55.patch'
--- patches/xtradb55.patch	2012-02-22 16:37:18 +0000
+++ patches/xtradb55.patch	2013-01-14 11:06:22 +0000
@@ -20,7 +20,15 @@
  /*===================*/
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -581,7 +581,7 @@
+@@ -53,6 +53,7 @@
+ #include "page0zip.h"
+ #include "trx0trx.h"
+ #include "srv0start.h"
++#include "xb0xb.h"
+ 
+ /* prototypes for new functions added to ha_innodb.cc */
+ trx_t* innobase_get_trx();
+@@ -581,7 +582,7 @@
  		return(TRUE);
  	}
  
@@ -29,7 +37,15 @@
  	if (recv_lsn_checks_on) {
  		ib_uint64_t	current_lsn;
  
-@@ -2542,7 +2542,8 @@
+@@ -965,6 +966,7 @@
+ 	block->page.zip_list.prev = NULL;
+ 	block->page.zip_list.next = NULL;
+ 	block->page.in_LRU_list = FALSE;
++	block->page.is_compacted = FALSE;
+ 	block->in_unzip_LRU_list = FALSE;
+ #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
+ 	block->n_pointers = 0;
+@@ -2542,7 +2544,8 @@
  	ut_ad(zip_size == fil_space_get_zip_size(space));
  	ut_ad(ut_is_2pow(zip_size));
  #ifndef UNIV_LOG_DEBUG
@@ -39,12 +55,27 @@
  	      || ibuf_page_low(space, zip_size, offset,
  			       FALSE, file, line, NULL));
  #endif
-@@ -4064,7 +4065,7 @@
+@@ -3952,6 +3955,13 @@
+ 			frame = ((buf_block_t*) bpage)->frame;
+ 		}
+ 
++		/* Do not validate, recover and apply change buffer entries to
++		bogus pages which replace skipped pages in compact backups. */
++		if (srv_compact_backup && buf_page_is_compacted(frame)) {
++
++			bpage->is_compacted = TRUE;
++		}
++
+ 		/* If this page is not uninitialized and not in the
+ 		doublewrite buffer, then the page number and space id
+ 		should be the same as in block. */
+@@ -4064,7 +4074,8 @@
  			recv_recover_page(TRUE, (buf_block_t*) bpage);
  		}
  
 -		if (uncompressed && !recv_no_ibuf_operations) {
-+		if (uncompressed && !recv_no_ibuf_operations && !srv_fake_write) {
++		if (uncompressed && !recv_no_ibuf_operations &&
++		    !srv_fake_write && !bpage->is_compacted) {
  			ibuf_merge_or_delete_for_page(
  				/* Delete possible entries, if bpage is_corrupt */
  				(srv_pass_corrupt_table && bpage->is_corrupt) ? NULL :
@@ -687,7 +718,7 @@
  	server_busy = log_sys->n_pending_checkpoint_writes
 --- a/storage/innobase/log/log0recv.c
 +++ b/storage/innobase/log/log0recv.c
-@@ -42,27 +42,27 @@
+@@ -42,27 +42,28 @@
  #include "trx0undo.h"
  #include "trx0rec.h"
  #include "fil0fil.h"
@@ -701,6 +732,7 @@
  # include "sync0sync.h"
 -#else /* !UNIV_HOTBACKUP */
 +//#else /* !UNIV_HOTBACKUP */
++#include "xb0xb.h"
  
  /** This is set to FALSE if the backup was originally taken with the
  ibbackup --include regexp option: then we do not want to create tables in
@@ -719,7 +751,7 @@
  
  /** The recovery system */
  UNIV_INTERN recv_sys_t*	recv_sys = NULL;
-@@ -631,7 +631,7 @@
+@@ -631,7 +632,7 @@
  /***********************************************************************//**
  Checks the consistency of the checkpoint info
  @return	TRUE if ok */
@@ -728,7 +760,7 @@
  ibool
  recv_check_cp_is_consistent(
  /*========================*/
-@@ -661,7 +661,7 @@
+@@ -661,7 +662,7 @@
  /********************************************************//**
  Looks for the maximum consistent checkpoint from the log groups.
  @return	error code or DB_SUCCESS */
@@ -737,7 +769,7 @@
  ulint
  recv_find_max_checkpoint(
  /*=====================*/
-@@ -850,7 +850,7 @@
+@@ -850,7 +851,7 @@
  InnoDB-3.23.52 where the checksum field contains the log block number.
  @return TRUE if ok, or if the log block may be in the format of InnoDB
  version predating 3.23.52 */
@@ -746,7 +778,25 @@
  ibool
  log_block_checksum_is_ok_or_old_format(
  /*===================================*/
-@@ -2380,7 +2380,7 @@
+@@ -1639,9 +1640,16 @@
+ 			if (page_zip) {
+ 				memset(FIL_PAGE_LSN + page_zip->data, 0, 8);
+ 			}
++
++			if (block->page.is_compacted) {
++
++				ut_ad(srv_compact_backup);
++
++				block->page.is_compacted = FALSE;
++			}
+ 		}
+ 
+-		if (recv->start_lsn >= page_lsn) {
++		if (!block->page.is_compacted && recv->start_lsn >= page_lsn) {
+ 
+ 			ib_uint64_t	end_lsn;
+ 
+@@ -2380,7 +2388,7 @@
  			   || type == MLOG_FILE_RENAME
  			   || type == MLOG_FILE_DELETE) {
  			ut_a(space);
@@ -755,7 +805,7 @@
  			if (recv_replay_file_ops) {
  
  				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2403,7 +2403,7 @@
+@@ -2403,7 +2411,7 @@
  					ut_error;
  				}
  			}
@@ -764,7 +814,7 @@
  			/* In normal mysqld crash recovery we do not try to
  			replay file operations */
  #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2820,8 +2820,11 @@
+@@ -2820,8 +2828,11 @@
  
  			fprintf(stderr,
  				"InnoDB: Doing recovery: scanned up to"
@@ -778,7 +828,7 @@
  		}
  	}
  
-@@ -2935,12 +2938,14 @@
+@@ -2935,12 +2946,14 @@
  
  	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
  
@@ -794,7 +844,7 @@
  	}
  }
  
-@@ -3109,6 +3114,7 @@
+@@ -3109,6 +3122,7 @@
  		recv_sys->recovered_lsn = checkpoint_lsn;
  
  		srv_start_lsn = checkpoint_lsn;
@@ -802,7 +852,7 @@
  	}
  
  	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3474,6 +3480,7 @@
+@@ -3474,6 +3488,7 @@
  	that the data dictionary tables will be free of any locks.
  	The data dictionary latch should guarantee that there is at
  	most one data dictionary transaction active at a time. */
@@ -902,44 +952,6 @@
 +*/
  #endif
  }
---- a/storage/innobase/row/row0merge.c
-+++ b/storage/innobase/row/row0merge.c
-@@ -460,7 +460,9 @@
- 	rec = rec_convert_dtuple_to_rec(*buf, index, tuple, n_ext);
- 	offsets = rec_get_offsets(rec, index, NULL, ULINT_UNDEFINED, &heap);
- 
--	innobase_rec_to_mysql(dup->table, rec, index, offsets);
-+	//innobase_rec_to_mysql(dup->table, rec, index, offsets);
-+	fprintf(stderr, "InnoDB: Error: row_merge_dup_report() is called.\n");
-+	ut_error;
- 
- 	mem_heap_free(heap);
- }
-@@ -1486,8 +1488,11 @@
- 		case 0:
- 			if (UNIV_UNLIKELY
- 			    (dict_index_is_unique(index) && !null_eq)) {
--				innobase_rec_to_mysql(table, mrec0,
--						      index, offsets0);
-+				//innobase_rec_to_mysql(table, mrec0,
-+				//		      index, offsets0);
-+				(void) table;
-+				fprintf(stderr, "InnoDB: Error: row_merge_blocks() is called.\n");
-+				ut_error;
- 				mem_heap_free(heap);
- 				return(DB_DUPLICATE_KEY);
- 			}
-@@ -2636,7 +2641,9 @@
- 
- 	/* Reset the MySQL row buffer that is used when reporting
- 	duplicate keys. */
--	innobase_rec_reset(table);
-+	//innobase_rec_reset(table);
-+	fprintf(stderr, "InnoDB: Error: row_merge_build_indexes() is called.\n");
-+	ut_error;
- 
- 	/* Read clustered index of the table and create files for
- 	secondary index entries for merge sort */
 --- a/storage/innobase/srv/srv0srv.c
 +++ b/storage/innobase/srv/srv0srv.c
 @@ -87,11 +87,6 @@
@@ -1048,7 +1060,15 @@
  
 --- a/storage/innobase/srv/srv0start.c
 +++ b/storage/innobase/srv/srv0start.c
-@@ -94,6 +94,8 @@
+@@ -62,6 +62,7 @@
+ #include "ibuf0ibuf.h"
+ #include "srv0start.h"
+ #include "srv0srv.h"
++#include "xb0xb.h"
+ #ifndef UNIV_HOTBACKUP
+ # include "os0proc.h"
+ # include "sync0sync.h"
+@@ -94,6 +95,8 @@
  /** Log sequence number at shutdown */
  UNIV_INTERN ib_uint64_t	srv_shutdown_lsn;
  
@@ -1057,7 +1077,7 @@
  #ifdef HAVE_DARWIN_THREADS
  # include <sys/utsname.h>
  /** TRUE if the F_FULLFSYNC option is available */
-@@ -549,7 +551,7 @@
+@@ -549,7 +552,7 @@
  /*********************************************************************//**
  Creates or opens the log files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1066,7 +1086,7 @@
  ulint
  open_or_create_log_file(
  /*====================*/
-@@ -709,7 +711,7 @@
+@@ -709,7 +712,7 @@
  /*********************************************************************//**
  Creates or opens database data files and closes them.
  @return	DB_SUCCESS or error code */
@@ -1075,7 +1095,7 @@
  ulint
  open_or_create_data_files(
  /*======================*/
-@@ -1875,6 +1877,10 @@
+@@ -1875,6 +1878,10 @@
  		are initialized in trx_sys_init_at_db_start(). */
  
  		recv_recovery_from_checkpoint_finish();
@@ -1086,7 +1106,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
-@@ -2054,6 +2060,17 @@
+@@ -2054,6 +2061,17 @@
  	if (!srv_auto_extend_last_data_file
  	    && sum_of_data_file_sizes != tablespace_size_in_header) {
  
@@ -1104,7 +1124,7 @@
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
  			" InnoDB: Error: tablespace size"
-@@ -2133,6 +2150,7 @@
+@@ -2133,6 +2151,7 @@
  
  			return(DB_ERROR);
  		}
@@ -1112,7 +1132,18 @@
  	}
  
  	/* Check that os_fast_mutexes work as expected */
-@@ -2252,6 +2270,7 @@
+@@ -2157,6 +2176,10 @@
+ 
+ 	os_fast_mutex_free(&srv_os_test_mutex);
+ 
++	if (srv_rebuild_indexes) {
++		xb_compact_rebuild_indexes();
++	}
++
+ 	if (!srv_file_per_table_original_value
+ 	    && srv_pass_corrupt_table) {
+ 		fprintf(stderr, "InnoDB: Warning:"
+@@ -2252,6 +2275,7 @@
  		ibuf_update_max_tablespace_id();
  	}
  
@@ -1315,3 +1346,51 @@
  
  			/* Write the log but do not flush it to disk */
  
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -149,7 +149,9 @@
+   SET(CMAKE_REQUIRED_LIBRARIES 
+     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
+ 
+-  LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
++  IF(CMAKE_REQUIRED_LIBRARIES)
++    LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
++  ENDIF()
+   LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
+   
+   OPTION(WITH_LIBWRAP "Compile with tcp wrappers support" OFF)
+--- a/storage/innobase/sync/sync0arr.c
++++ b/storage/innobase/sync/sync0arr.c
+@@ -41,6 +41,7 @@
+ #include "os0file.h"
+ #include "srv0srv.h"
+ #include "ha_prototypes.h"
++#include "xb0xb.h"
+ 
+ /*
+ 			WAIT ARRAY
+@@ -926,6 +927,13 @@
+ 	ibool		fatal = FALSE;
+ 	double		longest_diff = 0;
+ 
++	if (srv_rebuild_indexes) {
++
++		/* Avoid long semaphore warnings when rebuilding indexes */
++
++		return(FALSE);
++	}
++
+ #ifdef UNIV_DEBUG_VALGRIND
+ 	/* Increase the timeouts if running under valgrind because it executes
+ 	extremely slowly. UNIV_DEBUG_VALGRIND does not necessary mean that
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
+@@ -1509,6 +1509,8 @@
+ 					frees a page in buffer pool */
+ # endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
+ #endif /* !UNIV_HOTBACKUP */
++	ibool		is_compacted;	/*!< TRUE if the page was skipped in
++					compact backups */
+ };
+ 
+ /** The buffer control block structure */

=== modified file 'src/Makefile'
--- src/Makefile	2013-01-07 06:19:24 +0000
+++ src/Makefile	2013-01-14 11:06:22 +0000
@@ -31,6 +31,7 @@
 	ds_buffer.o \
 	datasink.o \
 	write_filt.o \
+	compact.o \
 	fil_cur.o \
 	innodb_int.o \
 	xbstream_write.o \
@@ -92,7 +93,7 @@
 
 # XtraBackup for MySQL 5.5
 5.5: INC = $(COMMON_INC) $(addprefix -isystem$(MYSQL_ROOT_DIR)/, \
-	include storage/innobase/include)
+	include storage/innobase/include sql)
 5.5: INNODBOBJS = $(MYSQL_ROOT_DIR)/storage/innobase/libinnobase.a
 
 ifeq "$(wildcard $(MYSQL_ROOT_DIR)/zlib/.libs/libzlt.a)" ""
@@ -157,7 +158,7 @@
 
 # XtraBackup for XtraDB 5.5
 xtradb55: INC = $(COMMON_INC) $(addprefix -isystem$(MYSQL_ROOT_DIR)/, \
-	include storage/innobase/include)
+	include storage/innobase/include sql)
 xtradb55: INNODBOBJS = $(MYSQL_ROOT_DIR)/storage/innobase/libinnobase.a
 ifeq ($(shell uname -s),Linux)
 xtradb55: LIBS += -laio
@@ -189,7 +190,7 @@
 xbstream: $(XBSTREAMOBJS) $(MYSQLOBJS) ds_local.o ds_buffer.o datasink.o
 	$(CC) $(CFLAGS) $^ $(INC) $(MYSQLOBJS) $(LIBS) -o $@
 
-xtrabackup.o: xtrabackup.c xb_regex.h write_filt.h fil_cur.h xtrabackup.h
+xtrabackup.o: xtrabackup.c xb_regex.h write_filt.h fil_cur.h xtrabackup.h compact.h
 
 $(TARGET): $(XTRABACKUPOBJS) $(INNODBOBJS) $(MYSQLOBJS) $(LIBARCHIVE_A)
 	$(CC) $(CFLAGS) $(XTRABACKUPOBJS) $(INNODBOBJS) $(MYSQLOBJS) $(LIBS) \

=== added file 'src/compact.c'
--- src/compact.c	1970-01-01 00:00:00 +0000
+++ src/compact.c	2013-01-14 11:06:22 +0000
@@ -0,0 +1,960 @@
+/******************************************************
+XtraBackup: hot backup tool for InnoDB
+(c) 2009-2013 Percona Ireland Ltd.
+Originally Created 3/3/2009 Yasufumi Kinoshita
+Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
+Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*******************************************************/
+
+/* Compact backups implementation */
+
+#include <my_base.h>
+#include <page0page.h>
+#include <dict0dict.h>
+#include <dict0load.h>
+#include <btr0pcur.h>
+#include <ibuf0ibuf.h>
+#include <row0merge.h>
+#include <trx0trx.h>
+#include <srv0srv.h>
+#include "common.h"
+#include "write_filt.h"
+#include "fil_cur.h"
+#include "xtrabackup.h"
+#include "ds_buffer.h"
+#include "xb0xb.h"
+
+/* Number of the first primary key page in an .ibd file */
+#define XB_FIRST_CLUSTERED_INDEX_PAGE_NO 3
+
+/* Suffix for page map files */
+#define XB_PAGE_MAP_SUFFIX ".pmap"
+#define XB_TMPFILE_SUFFIX ".tmp"
+
+/* Page range */
+typedef struct {
+	ulint	from;			/*!< range start */
+	ulint	to;			/*!< range end */
+} page_range_t;
+
+/* Cursor in a page map file */
+typedef struct {
+	File		fd;	/*!< file descriptor */
+	IO_CACHE	cache;	/*!< IO_CACHE associated with fd */
+} page_map_cursor_t;
+
+/* Empty page use to replace skipped pages in the data files */
+static byte		empty_page[UNIV_PAGE_SIZE_MAX];
+static const char	compacted_page_magic[] = "COMPACTP";
+static const size_t	compacted_page_magic_size =
+	sizeof(compacted_page_magic) - 1;
+static const ulint	compacted_page_magic_offset = FIL_PAGE_DATA;
+
+/************************************************************************
+Compact page filter. */
+static my_bool wf_compact_init(xb_write_filt_ctxt_t *ctxt, char *dst_name,
+			       xb_fil_cur_t *cursor);
+static my_bool wf_compact_process(xb_write_filt_ctxt_t *ctxt,
+				  ds_file_t *dstfile);
+static my_bool wf_compact_finalize(xb_write_filt_ctxt_t *ctxt,
+				   ds_file_t *dstfile);
+xb_write_filt_t wf_compact = {
+	&wf_compact_init,
+	&wf_compact_process,
+	&wf_compact_finalize,
+	NULL
+};
+
+/************************************************************************
+Initialize the compact page filter.
+
+@return TRUE on success, FALSE on error. */
+static my_bool
+wf_compact_init(xb_write_filt_ctxt_t *ctxt,
+		char *dst_name __attribute__((unused)), xb_fil_cur_t *cursor)
+{
+	xb_wf_compact_ctxt_t	*cp = &(ctxt->u.wf_compact_ctxt);
+	char			 page_map_name[FN_REFLEN];
+	MY_STAT			 mystat;
+
+	ctxt->cursor = cursor;
+	cp->clustered_index_found = FALSE;
+	cp->inside_skipped_range = FALSE;
+	cp->free_limit = 0;
+
+	/* Don't compact the system table space */
+	cp->skip = cursor->is_system;
+	if (cp->skip) {
+		return(TRUE);
+	}
+
+	snprintf(page_map_name, sizeof(page_map_name), "%s%s", dst_name,
+		 XB_PAGE_MAP_SUFFIX);
+
+	cp->ds_buffer = ds_create(xtrabackup_target_dir, DS_TYPE_BUFFER);
+	if (cp->ds_buffer == NULL) {
+		return(FALSE);
+	}
+
+	ds_set_pipe(cp->ds_buffer, ds_meta);
+
+	memset(&mystat, 0, sizeof(mystat));
+	mystat.st_mtime = my_time(0);
+	cp->buffer = ds_open(cp->ds_buffer, page_map_name, &mystat);
+	if (cp->buffer == NULL) {
+		msg("xtrabackup: Error: cannot open output stream for %s\n",
+		    page_map_name);
+		return(FALSE);
+	}
+
+	return(TRUE);
+}
+
+/************************************************************************
+Check if the specified page should be skipped. We currently skip all
+non-clustered index pages for compact backups.
+
+@return TRUE if the page should be skipped. */
+static my_bool
+check_if_skip_page(xb_wf_compact_ctxt_t *cp, xb_fil_cur_t *cursor, ulint offset)
+{
+	byte		*page;
+	ulint		 page_no;
+	ulint		 page_type;
+	INDEX_ID_T	 index_id;
+
+
+	xb_ad(cursor->is_system == FALSE);
+
+	page = cursor->buf + cursor->page_size * offset;
+	page_no = cursor->buf_page_no + offset;
+	page_type = fil_page_get_type(page);
+
+	if (UNIV_UNLIKELY(page_no == 0)) {
+
+		cp->free_limit = mach_read_from_4(page + FSP_HEADER_OFFSET +
+						  FSP_FREE_LIMIT);
+	} else if (UNIV_UNLIKELY(page_no == XB_FIRST_CLUSTERED_INDEX_PAGE_NO)) {
+
+		xb_ad(cp->clustered_index_found == FALSE);
+
+		if (page_type != FIL_PAGE_INDEX) {
+
+			/* Uninitialized clustered index root page, there's
+			nothing we can do to compact the space.*/
+
+			msg("[%02u] Uninitialized page type value (%lu) in the "
+			    "clustered index root page of tablespace %s. "
+			    "Will not be compacted.\n",
+			    cursor->thread_n,
+			    page_type, cursor->path);
+
+			cp->skip = TRUE;
+
+			return(FALSE);
+		}
+
+		cp->clustered_index =
+			mach_read_from_8(page + PAGE_HEADER + PAGE_INDEX_ID);
+		cp->clustered_index_found = TRUE;
+	} else if (UNIV_UNLIKELY(page_no >= cp->free_limit)) {
+
+		/* Skip unused pages above free limit, if that value is set in
+		the FSP header.*/
+
+		return(cp->free_limit > 0);
+	} else if (cp->clustered_index_found && page_type == FIL_PAGE_INDEX) {
+
+		index_id = mach_read_from_8(page + PAGE_HEADER + PAGE_INDEX_ID);
+		if (INDEX_ID_CMP(index_id, cp->clustered_index) != 0) {
+			ulint	fseg_hdr_space =
+				mach_read_from_4(page + PAGE_HEADER +
+						 PAGE_BTR_SEG_TOP);
+			ulint	fseg_hdr_page_no =
+				mach_read_from_4(page + PAGE_HEADER +
+						 PAGE_BTR_SEG_TOP + 4);
+			ulint fseg_hdr_offset =
+				mach_read_from_2(page + PAGE_HEADER +
+						 PAGE_BTR_SEG_TOP + 8);
+
+			/* Don't skip root index pages, i.e. the ones where the
+			above fields are defined. We need root index pages to be
+			able to correctly drop the indexes later, as they
+			contain fseg inode pointers. */
+
+			return(fseg_hdr_space == 0 &&
+			       fseg_hdr_page_no == 0 &&
+			       fseg_hdr_offset == 0);
+		}
+	}
+
+	return(FALSE);
+}
+
+/************************************************************************
+Run the next batch of pages through the compact page filter.
+
+@return TRUE on success, FALSE on error. */
+static my_bool
+wf_compact_process(xb_write_filt_ctxt_t *ctxt, ds_file_t *dstfile)
+{
+	xb_fil_cur_t		*cursor = ctxt->cursor;
+	ulint			 page_size = cursor->page_size;
+	byte			*page;
+	byte 			*buf_end;
+	byte			*write_from;
+	xb_wf_compact_ctxt_t	*cp = &(ctxt->u.wf_compact_ctxt);
+	ulint 			i;
+	ulint			page_no;
+	byte			tmp[4];
+
+	if (cp->skip) {
+		return(!ds_write(dstfile, cursor->buf, cursor->buf_read));
+	}
+
+	write_from = NULL;
+	buf_end = cursor->buf + cursor->buf_read;
+	for (i = 0, page = cursor->buf; page < buf_end;
+	     i++, page += page_size) {
+
+		page_no = cursor->buf_page_no + i;
+
+		if (!check_if_skip_page(cp, cursor, i)) {
+
+			if (write_from == NULL) {
+				write_from = page;
+			}
+
+			if (cp->inside_skipped_range) {
+				cp->inside_skipped_range = FALSE;
+
+				/* Write the last range endpoint to the
+				skipped pages map */
+
+				xb_ad(page_no > 0);
+				mach_write_to_4(tmp, page_no - 1);
+				if (ds_write(cp->buffer, tmp, sizeof(tmp))) {
+					return(FALSE);
+				}
+			}
+			continue;
+		}
+
+		if (write_from != NULL) {
+
+			/* The first skipped page in this block, write the
+			non-skipped ones to the data file */
+
+			if (ds_write(dstfile, write_from, page - write_from)) {
+				return(FALSE);
+			}
+
+			write_from = NULL;
+		}
+
+		if (!cp->inside_skipped_range) {
+
+			/* The first skipped page in range, write the first
+			range endpoint to the skipped pages map */
+
+			cp->inside_skipped_range = TRUE;
+
+			mach_write_to_4(tmp, page_no);
+			if (ds_write(cp->buffer, tmp, sizeof(tmp))) {
+				return(FALSE);
+			}
+		}
+	}
+
+	/* Write the remaining pages in the buffer, if any */
+	if (write_from != NULL &&
+	    ds_write(dstfile, write_from, buf_end - write_from)) {
+		return(FALSE);
+	}
+
+	return(TRUE);
+}
+
+/************************************************************************
+Close the compact filter's page map stream.
+
+@return TRUE on success, FALSE on error. */
+static my_bool
+wf_compact_finalize(xb_write_filt_ctxt_t *ctxt,
+		    ds_file_t *dstfile __attribute__((unused)))
+{
+	xb_fil_cur_t		*cursor = ctxt->cursor;
+	xb_wf_compact_ctxt_t	*cp = &(ctxt->u.wf_compact_ctxt);
+
+	/* Write the last endpoint of the current range, if the last pages of
+	the space have been skipped. */
+	if (cp->inside_skipped_range) {
+		byte	tmp[4];
+
+		mach_write_to_4(tmp, cursor->space_size - 1);
+		if (ds_write(cp->buffer, tmp, sizeof(tmp))) {
+			return(FALSE);
+		}
+
+		cp->inside_skipped_range = FALSE;
+	}
+
+	if (cp->buffer) {
+		ds_close(cp->buffer);
+	}
+	if (cp->ds_buffer) {
+		ds_destroy(cp->ds_buffer);
+	}
+
+	return(TRUE);
+}
+
+/************************************************************************
+Open a page map file and return a cursor.
+
+@return page map cursor, or NULL if the file doesn't exist. */
+static page_map_cursor_t *
+page_map_file_open(const char *path)
+{
+	MY_STAT			 statinfo;
+	page_map_cursor_t	*pmap_cur;
+	int			 rc;
+
+	if (my_stat(path, &statinfo, MYF(0)) == NULL) {
+
+		return(NULL);
+	}
+
+	/* The maximum possible page map file corresponds to a 64 TB tablespace
+	and the worst case when every other page was skipped. That is, 2^32/2
+	page ranges = 16 GB. */
+	xb_a(statinfo.st_size < (off_t) 16 * 1024 * 1024 * 1024);
+
+	/* Must be a series of 8-byte tuples */
+	xb_a(statinfo.st_size % 8 == 0);
+
+	pmap_cur = (page_map_cursor_t *) my_malloc(sizeof(page_map_cursor_t),
+						   MYF(MY_FAE));
+
+	pmap_cur->fd = my_open(path, O_RDONLY, MYF(MY_WME));
+	xb_a(pmap_cur->fd != 0);
+
+	rc = init_io_cache(&pmap_cur->cache, pmap_cur->fd, 0, READ_CACHE,
+			   0, 0, MYF(MY_WME));
+	xb_a(rc == 0);
+
+	return(pmap_cur);
+}
+
+/************************************************************************
+Read the next range from a page map file and update the cursor.
+
+@return TRUE on success, FALSE on end-of-file. */
+static ibool
+page_map_file_next(page_map_cursor_t *pmap_cur, page_range_t *range)
+{
+	byte buf[8];
+
+	xb_ad(pmap_cur != NULL);
+
+	if (my_b_read(&pmap_cur->cache, buf, sizeof(buf))) {
+		return(FALSE);
+	}
+
+	range->from = mach_read_from_4(buf);
+	range->to = mach_read_from_4(buf + 4);
+
+	return(TRUE);
+}
+
+/************************************************************************
+Close the page map cursor.*/
+static void
+page_map_file_close(page_map_cursor_t *pmap_cur)
+{
+	int	rc;
+
+	xb_ad(pmap_cur != NULL);
+
+	rc = end_io_cache(&pmap_cur->cache);
+	xb_a(rc == 0);
+
+	posix_fadvise(pmap_cur->fd, 0, 0, POSIX_FADV_DONTNEED);
+
+	rc = my_close(pmap_cur->fd, MY_WME);
+	xb_a(rc == 0);
+}
+
+/****************************************************************************
+Expand a single data file according to the skipped pages maps created by
+--compact.
+
+@return TRUE on success, FALSE on failure. */
+static my_bool
+xb_expand_file(fil_node_t *node)
+{
+	char			 pmapfile_path[FN_REFLEN];
+	char			 tmpfile_path[FN_REFLEN];
+	xb_fil_cur_t		 cursor;
+	xb_fil_cur_result_t	 res;
+	ds_ctxt_t		*ds_local;
+	ds_ctxt_t		*ds_buffer;
+	ds_file_t		*tmpfile;
+	my_bool			 success = FALSE;
+	ulint			 i;
+	byte			*page;
+	ulint			 page_expected_no;
+	page_map_cursor_t	*pmap_cur;
+	ibool			 have_next_range;
+	page_range_t		 pmap_range;
+
+	xb_ad(trx_sys_sys_space(node->space->id) == FALSE);
+
+	snprintf(pmapfile_path, sizeof(pmapfile_path), "%s%s",
+		 node->name, XB_PAGE_MAP_SUFFIX);
+
+	/* Skip files that don't have a corresponding page map file */
+
+	if (!(pmap_cur = page_map_file_open(pmapfile_path))) {
+
+		msg("Not expanding %s\n", node->name);
+
+		return(FALSE);
+	}
+
+	msg("Expanding %s\n", node->name);
+
+	ds_local = ds_create(".", DS_TYPE_LOCAL);
+	ds_buffer = ds_create(".", DS_TYPE_BUFFER);
+
+	xb_a(ds_local != NULL && ds_buffer != NULL);
+
+	ds_buffer_set_size(ds_buffer, FSP_EXTENT_SIZE * UNIV_PAGE_SIZE_MAX);
+
+	ds_set_pipe(ds_buffer, ds_local);
+
+	res = xb_fil_cur_open(&cursor, node, 1);
+	xb_a(res == XB_FIL_CUR_SUCCESS);
+
+	snprintf(tmpfile_path, sizeof(tmpfile_path), "%s%s",
+		 node->name, XB_TMPFILE_SUFFIX);
+
+	tmpfile = ds_open(ds_buffer, tmpfile_path, &cursor.statinfo);
+	if (tmpfile == NULL) {
+
+		msg("Could not open temporary file '%s'\n", tmpfile_path);
+		goto error;
+	}
+
+	have_next_range = page_map_file_next(pmap_cur, &pmap_range);
+
+	page_expected_no = 0;
+
+	/* Initialize and mark the empty page which is used to replace
+	skipped pages. */
+	memset(empty_page, 0, cursor.page_size);
+	memcpy(empty_page + compacted_page_magic_offset,
+	       compacted_page_magic, compacted_page_magic_size);
+	mach_write_to_4(empty_page + FIL_PAGE_SPACE_OR_CHKSUM,
+			BUF_NO_CHECKSUM_MAGIC);
+	mach_write_to_4(empty_page + cursor.page_size -
+			FIL_PAGE_END_LSN_OLD_CHKSUM,
+			BUF_NO_CHECKSUM_MAGIC);
+
+
+	/* Main copy loop */
+
+	while ((res = xb_fil_cur_read(&cursor)) == XB_FIL_CUR_SUCCESS) {
+
+		for (i = 0, page = cursor.buf; i < cursor.buf_npages;
+		     i++, page += cursor.page_size) {
+
+			ulint	page_read_no;
+
+			page_read_no = mach_read_from_4(page + FIL_PAGE_OFFSET);
+			xb_a(!page_read_no || page_expected_no <= page_read_no);
+
+			if (have_next_range &&
+			    page_expected_no == pmap_range.from) {
+
+				xb_a(pmap_range.from <= pmap_range.to);
+
+				/* Write empty pages instead of skipped ones, if
+				necessary. */
+
+				while (page_expected_no <= pmap_range.to) {
+
+					if (ds_write(tmpfile, empty_page,
+						     cursor.page_size)) {
+
+						goto write_error;
+					}
+
+					page_expected_no++;
+				}
+
+				have_next_range =
+					page_map_file_next(pmap_cur,
+							   &pmap_range);
+			}
+
+			/* Write the current page */
+
+			if (ds_write(tmpfile, page, cursor.page_size)) {
+
+				goto write_error;
+			}
+
+			page_expected_no++;
+		}
+	}
+
+	if (res != XB_FIL_CUR_EOF) {
+
+		goto error;
+	}
+
+	/* Write empty pages instead of trailing skipped ones, if any */
+
+	if (have_next_range) {
+
+		xb_a(page_expected_no == pmap_range.from);
+		xb_a(pmap_range.from <= pmap_range.to);
+
+		while (page_expected_no <= pmap_range.to) {
+
+			if (ds_write(tmpfile, empty_page,
+				     cursor.page_size)) {
+
+				goto write_error;
+			}
+
+			page_expected_no++;
+		}
+
+		xb_a(!page_map_file_next(pmap_cur, &pmap_range));
+	}
+
+	/* Replace the original .ibd file with the expanded file */
+	if (my_rename(tmpfile_path, node->name, MYF(MY_WME))) {
+
+		msg("Failed to rename '%s' to '%s'\n",
+		    tmpfile_path, node->name);
+		goto error;
+	}
+
+	my_delete(pmapfile_path, MYF(MY_WME));
+
+	ds_close(tmpfile);
+	tmpfile = NULL;
+
+	success = TRUE;
+
+	goto end;
+
+write_error:
+	msg("Write to '%s' failed\n", tmpfile_path);
+
+error:
+	if (tmpfile != NULL) {
+
+		ds_close(tmpfile);
+		my_delete(tmpfile_path, MYF(MY_WME));
+	}
+
+end:
+	ds_destroy(ds_buffer);
+	ds_destroy(ds_local);
+
+	page_map_file_close(pmap_cur);
+
+	return(success);
+}
+
+/******************************************************************************
+Expand the data files according to the skipped pages maps created by --compact.
+@return TRUE on success, FALSE on failure. */
+my_bool
+xb_expand_datafiles(void)
+/*=====================*/
+{
+	ulint			 nfiles;
+	datafiles_iter_t	*it = NULL;
+	fil_node_t		*node;
+	fil_space_t		*space;
+
+	msg("Starting to expand compacted .ibd files.\n");
+
+	/* Initialize the tablespace cache */
+	if (xb_data_files_init() != DB_SUCCESS) {
+		return(FALSE);
+	}
+
+	nfiles = UT_LIST_GET_LEN(fil_system->space_list);
+	xb_a(nfiles > 0);
+
+	it = datafiles_iter_new(fil_system);
+	if (it == NULL) {
+		msg("xtrabackup: error: datafiles_iter_new() failed.\n");
+		goto error;
+	}
+
+	while ((node = datafiles_iter_next(it)) != NULL) {
+
+		space = node->space;
+
+		/* System tablespace cannot be compacted */
+		if (trx_sys_sys_space(space->id)) {
+
+			continue;
+		}
+
+		if (!xb_expand_file(node)) {
+
+			goto error;
+		}
+	}
+
+	datafiles_iter_free(it);
+	xb_data_files_close();
+
+	return(TRUE);
+
+error:
+	if (it != NULL) {
+		datafiles_iter_free(it);
+	}
+
+	xb_data_files_close();
+
+	return(FALSE);
+}
+
+/******************************************************************************
+Callback used in buf_page_io_complete() to detect compacted pages.
+@return TRUE if the page is marked as compacted, FALSE otherwise. */
+ibool
+buf_page_is_compacted(
+/*==================*/
+	const byte*	page)	/*!< in: a database page */
+{
+	return !memcmp(page + compacted_page_magic_offset,
+		       compacted_page_magic, compacted_page_magic_size);
+}
+
+/********************************************************************//**
+Determine the flags of a table described in SYS_TABLES.
+@return compressed page size in kilobytes; or 0 if the tablespace is
+uncompressed, ULINT_UNDEFINED on error */
+static
+ulint
+dict_sys_tables_get_flags(
+/*======================*/
+	const rec_t*	rec)	/*!< in: a record of SYS_TABLES */
+{
+	const byte*	field;
+	ulint		len;
+	ulint		n_cols;
+	ulint		flags;
+
+	field = rec_get_nth_field_old(rec, 5, &len);
+	ut_a(len == 4);
+
+	flags = mach_read_from_4(field);
+
+	if (UNIV_LIKELY(flags == DICT_TABLE_ORDINARY)) {
+		return(0);
+	}
+
+	field = rec_get_nth_field_old(rec, 4/*N_COLS*/, &len);
+	n_cols = mach_read_from_4(field);
+
+	if (UNIV_UNLIKELY(!(n_cols & 0x80000000UL))) {
+		/* New file formats require ROW_FORMAT=COMPACT. */
+		return(ULINT_UNDEFINED);
+	}
+
+	switch (flags & (DICT_TF_FORMAT_MASK | DICT_TF_COMPACT)) {
+	default:
+	case DICT_TF_FORMAT_51 << DICT_TF_FORMAT_SHIFT:
+	case DICT_TF_FORMAT_51 << DICT_TF_FORMAT_SHIFT | DICT_TF_COMPACT:
+		/* flags should be DICT_TABLE_ORDINARY,
+		or DICT_TF_FORMAT_MASK should be nonzero. */
+		return(ULINT_UNDEFINED);
+
+	case DICT_TF_FORMAT_ZIP << DICT_TF_FORMAT_SHIFT | DICT_TF_COMPACT:
+		/* We support this format. */
+		break;
+	}
+
+	if (UNIV_UNLIKELY((flags & DICT_TF_ZSSIZE_MASK)
+			  > (DICT_TF_ZSSIZE_MAX << DICT_TF_ZSSIZE_SHIFT))) {
+		/* Unsupported compressed page size. */
+		return(ULINT_UNDEFINED);
+	}
+
+	if (UNIV_UNLIKELY(flags & (~0 << DICT_TF_BITS))) {
+		/* Some unused bits are set. */
+		return(ULINT_UNDEFINED);
+	}
+
+	return(flags);
+}
+
+/*****************************************************************************
+Builds an index definition corresponding to an index object. It is roughly
+similar to innobase_create_index_def() / innobase_create_index_field_def() and
+the opposite to dict_mem_index_create() / dict_mem_index_add_field(). */
+static
+void
+xb_build_index_def(
+/*=======================*/
+	mem_heap_t*		heap,		/*!< in: heap */
+	const dict_index_t*	index,		/*!< in: index */
+	merge_index_def_t*	index_def)	/*!< out: index definition */
+{
+	merge_index_field_t*	fields;
+	ulint			n_fields;
+	ulint			i;
+
+	ut_a(index->n_fields);
+	ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
+
+	/* Use n_user_defined_cols instead of n_fields, as the index will
+	contain a part of the primary key after n_user_defined_cols, and those
+	columns will be created automatically in
+	dict_index_build_internal_clust(). */
+	n_fields = index->n_user_defined_cols;
+
+	memset(index_def, 0, sizeof(*index_def));
+
+	index_def->name = mem_heap_strdup(heap, index->name);
+	index_def->ind_type = index->type;
+
+	fields = mem_heap_alloc(heap, n_fields * sizeof(*fields));
+
+	for (i = 0; i < n_fields; i++) {
+		dict_field_t*	field;
+
+		field = dict_index_get_nth_field(index, i);
+
+		fields[i].field_name = mem_heap_strdup(heap, field->name);
+		fields[i].prefix_len = field->prefix_len;
+	}
+
+	index_def->fields = fields;
+	index_def->n_fields = n_fields;
+}
+
+/********************************************************************//**
+Rebuild secondary indexes for a given table. */
+static
+void
+xb_rebuild_indexes_for_table(
+/*=======================*/
+	dict_table_t*	table,	/*!< in: table */
+	trx_t*		trx)	/*!< in: transaction handle */
+{
+	dict_index_t*		index;
+	dict_index_t**		indexes;
+	ulint			n_indexes;
+	merge_index_def_t*	index_defs;
+	ulint			i;
+	mem_heap_t*		heap;
+	ulint			error;
+
+	ut_ad(mutex_own(&(dict_sys->mutex)));
+	ut_ad(table);
+
+	ut_a(UT_LIST_GET_LEN(table->indexes) > 0);
+
+	n_indexes = UT_LIST_GET_LEN(table->indexes) - 1;
+	if (!n_indexes) {
+		/* Only the primary key, nothing to do. */
+		return;
+	}
+
+	heap = mem_heap_create(1024);
+
+	indexes = (dict_index_t**) mem_heap_alloc(heap,
+						  n_indexes * sizeof(*indexes));
+	index_defs = (merge_index_def_t*) mem_heap_alloc(heap,
+							 n_indexes *
+							 sizeof(*index_defs));
+
+	/* Skip the primary key. */
+	index = dict_table_get_first_index(table);
+	ut_a(dict_index_is_clust(index));
+
+	for (i = 0; (index = dict_table_get_next_index(index)); i++) {
+
+		msg("  Found index %s\n", index->name);
+
+		indexes[i] = index;
+
+		xb_build_index_def(heap, index, &index_defs[i]);
+	}
+
+	ut_ad(i == n_indexes);
+
+	msg("  Dropping %lu index(es).\n", n_indexes);
+
+	row_merge_drop_indexes(trx, table, indexes, n_indexes);
+
+	msg("  Rebuilding %lu index(es).\n", n_indexes);
+
+	row_merge_lock_table(trx, table, LOCK_X);
+
+	for (i = 0; i < n_indexes; i++) {
+		indexes[i] = row_merge_create_index(trx, table, &index_defs[i]);
+	}
+
+	error = row_merge_build_indexes(trx, table, table, indexes, n_indexes,
+					NULL);
+	ut_a(error == DB_SUCCESS);
+
+	mem_heap_free(heap);
+}
+
+/******************************************************************************
+Rebuild all secondary indexes in all tables in separate spaces. Called from
+innobase_start_or_create_for_mysql(). */
+void
+xb_compact_rebuild_indexes(void)
+/*=============================*/
+{
+	dict_table_t*	sys_tables;
+	dict_index_t*	sys_index;
+	btr_pcur_t	pcur;
+	const rec_t*	rec;
+	mtr_t		mtr;
+	const byte*	field;
+	ulint		len;
+	ulint		space_id;
+	ulint		flags;
+	char*		name;
+	dict_table_t*	table;
+	trx_t*		trx;
+
+	/* Iterate all tables that are not in the system tablespace. */
+
+	trx = trx_allocate_for_mysql();
+
+	/* Suppress foreign key checks, as we are going to drop and recreate all
+	secondary keys. */
+	trx->check_foreigns = FALSE;
+
+	row_mysql_lock_data_dictionary(trx);
+
+	/* Enlarge the fatal lock wait timeout during index rebuild
+	operation. */
+	mutex_enter(&kernel_mutex);
+	srv_fatal_semaphore_wait_threshold += 7200; /* 2 hours */
+	mutex_exit(&kernel_mutex);
+
+	mtr_start(&mtr);
+
+	sys_tables = dict_table_get_low("SYS_TABLES");
+	sys_index = UT_LIST_GET_FIRST(sys_tables->indexes);
+	ut_a(!dict_table_is_comp(sys_tables));
+
+	btr_pcur_open_at_index_side(TRUE, sys_index, BTR_SEARCH_LEAF, &pcur,
+				    TRUE, &mtr);
+	for (;;) {
+		btr_pcur_move_to_next_user_rec(&pcur, &mtr);
+
+		rec = btr_pcur_get_rec(&pcur);
+
+		if (!btr_pcur_is_on_user_rec(&pcur)) {
+			/* end of index */
+
+			break;
+		}
+
+		if (rec_get_deleted_flag(rec, 0)) {
+			continue;
+		}
+
+		field = rec_get_nth_field_old(rec, 9, &len);
+		ut_a(len == 4);
+
+		space_id = mach_read_from_4(field);
+
+		/* Don't touch tables in the system tablespace */
+		if (trx_sys_sys_space(space_id)) {
+
+			continue;
+		}
+
+		field = rec_get_nth_field_old(rec, 0, &len);
+		name = mem_strdupl((char*) field, len);
+
+		flags = dict_sys_tables_get_flags(rec);
+		if (UNIV_UNLIKELY(flags == ULINT_UNDEFINED)) {
+
+			field = rec_get_nth_field_old(rec, 5, &len);
+			flags = mach_read_from_4(field);
+
+			ut_print_timestamp(stderr);
+			fputs("  InnoDB: Error: table ", stderr);
+			ut_print_filename(stderr, name);
+			fprintf(stderr, "\n"
+				"InnoDB: in InnoDB data dictionary"
+				" has unknown type %lx.\n",
+				(ulong) flags);
+
+			mem_free(name);
+
+			continue;
+		}
+
+		btr_pcur_store_position(&pcur, &mtr);
+
+		mtr_commit(&mtr);
+
+		table = dict_table_get_low(name);
+		ut_a(table != NULL);
+
+		/* Discard change buffer entries for this space */
+		ibuf_delete_for_discarded_space(space_id);
+
+		msg("Rebuilding indexes for table %s (space id: %lu)\n", name,
+		    space_id);
+
+		xb_rebuild_indexes_for_table(table, trx);
+
+		mem_free(name);
+
+		/* Temporarily unlock the data dictionary to avoid long
+		semaphore waits. */
+		row_mysql_unlock_data_dictionary(trx);
+		row_mysql_lock_data_dictionary(trx);
+
+		mtr_start(&mtr);
+
+		btr_pcur_restore_position(BTR_SEARCH_LEAF, &pcur, &mtr);
+	}
+
+	btr_pcur_close(&pcur);
+	mtr_commit(&mtr);
+
+	row_mysql_unlock_data_dictionary(trx);
+
+	trx_commit_for_mysql(trx);
+
+	trx_free_for_mysql(trx);
+}

=== added file 'src/compact.h'
--- src/compact.h	1970-01-01 00:00:00 +0000
+++ src/compact.h	2013-01-14 11:06:22 +0000
@@ -0,0 +1,44 @@
+/******************************************************
+XtraBackup: hot backup tool for InnoDB
+(c) 2009-2012 Percona Ireland Ltd.
+Originally Created 3/3/2009 Yasufumi Kinoshita
+Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
+Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*******************************************************/
+
+#ifndef XB_COMPACT_H
+#define XB_COMPACT_H
+
+#include "write_filt.h"
+
+/* Compact page filter context */
+typedef struct {
+	my_bool		 skip;
+	ds_ctxt_t	*ds_buffer;
+	ds_file_t	*buffer;
+	INDEX_ID_T	 clustered_index;
+	my_bool		 clustered_index_found;
+	my_bool		 inside_skipped_range;
+	ulint		 free_limit;
+} xb_wf_compact_ctxt_t;
+
+/******************************************************************************
+Expand the data files according to the skipped pages maps created by --compact.
+@return TRUE on success, FALSE on failure. */
+my_bool xb_expand_datafiles(void);
+
+#endif

=== modified file 'src/datasink.c'
--- src/datasink.c	2013-01-13 12:29:50 +0000
+++ src/datasink.c	2013-01-14 11:06:22 +0000
@@ -53,6 +53,7 @@
 		break;
 	default:
 		msg("Unknown datasink type: %d\n", type);
+		xb_ad(0);
 		return NULL;
 	}
 

=== modified file 'src/ds_tmpfile.c'
--- src/ds_tmpfile.c	2013-01-11 13:00:50 +0000
+++ src/ds_tmpfile.c	2013-01-14 11:06:22 +0000
@@ -182,7 +182,7 @@
 	xb_a(pipe_ctxt != NULL);
 
 	buf = my_malloc(buf_size, MYF(MY_FAE));
-	
+
 	tmpfile_ctxt = (ds_tmpfile_ctxt_t *) ctxt->ptr;
 	list = tmpfile_ctxt->file_list;
 

=== modified file 'src/fil_cur.c'
--- src/fil_cur.c	2013-01-11 13:00:50 +0000
+++ src/fil_cur.c	2013-01-14 11:06:22 +0000
@@ -142,6 +142,8 @@
 	cursor->buf_page_no = 0;
 	cursor->thread_n = thread_n;
 
+	cursor->space_size = cursor->statinfo.st_size / page_size;
+
 	return(XB_FIL_CUR_SUCCESS);
 }
 
@@ -216,13 +218,13 @@
 			    page_no < FSP_EXTENT_SIZE * 3) {
 				/* skip doublewrite buffer pages */
 				ut_a(page_size == UNIV_PAGE_SIZE);
-				msg("[%02lu] xtrabackup: "
+				msg("[%02u] xtrabackup: "
 				    "Page %lu is a doublewrite buffer page, "
 				    "skipping.\n", cursor->thread_n, page_no);
 			} else {
 				retry_count--;
 				if (retry_count == 0) {
-					msg("[%02lu] xtrabackup: "
+					msg("[%02u] xtrabackup: "
 					    "Error: failed to read page after "
 					    "10 retries. File %s seems to be "
 					    "corrupted.\n", cursor->thread_n,
@@ -230,7 +232,7 @@
 					ret = XB_FIL_CUR_ERROR;
 					break;
 				}
-				msg("[%02lu] xtrabackup: "
+				msg("[%02u] xtrabackup: "
 				    "Database page corruption detected at page "
 				    "%lu, retrying...\n", cursor->thread_n,
 				    page_no);

=== modified file 'src/fil_cur.h'
--- src/fil_cur.h	2013-01-11 13:00:50 +0000
+++ src/fil_cur.h	2013-01-14 11:06:22 +0000
@@ -52,8 +52,9 @@
 					buffer */
 	ulint		buf_page_no;	/*!< number of the first page in
 					buffer */
-	ulint		thread_n;	/*!< thread number for diagnostics */
+	uint		thread_n;	/*!< thread number for diagnostics */
 	ulint		space_id;	/*!< ID of tablespace */
+	ulint		space_size;	/*!< space size in pages */
 } xb_fil_cur_t;
 
 typedef enum {

=== modified file 'src/innodb_int.c'
--- src/innodb_int.c	2013-01-11 13:00:50 +0000
+++ src/innodb_int.c	2013-01-14 11:06:22 +0000
@@ -28,8 +28,20 @@
 #include <srv0srv.h>
 #include <ha_prototypes.h>
 #include <trx0trx.h>
+#include <buf0flu.h>
+#ifdef INNODB_VERSION_SHORT
+# include <page0zip.h>
+#endif
+#if MYSQL_VERSION_ID < 50500
+# include <row0types.h>
+#endif
 #include "common.h"
 
+/* Required by innobase_rec*() stubs */
+#if MYSQL_VERSION_ID >= 50500
+typedef struct st_table TABLE;
+#endif
+
 extern long innobase_lock_wait_timeout;
 
 char *opt_mysql_tmpdir = NULL;
@@ -901,6 +913,27 @@
 	return(fd2);
 }
 
+/* The following is used by row0merge for error reporting. Define a stub so we
+can use fast index creation from XtraBackup. */
+void
+innobase_rec_reset(
+/*===============*/
+	TABLE*			table __attribute__((unused)))
+{
+}
+
+/* The following is used by row0merge for error reporting. Define a stub so we
+can use fast index creation from XtraBackup. */
+void
+innobase_rec_to_mysql(
+/*==================*/
+	TABLE*			table __attribute__((unused)),
+	const rec_t*		rec __attribute__((unused)),
+	const dict_index_t*	index __attribute__((unused)),
+	const ulint*		offsets __attribute__((unused)))
+{
+}
+
 #if MYSQL_VERSION_ID >= 50507
 /*
    As of MySQL 5.5.7, InnoDB uses thd_wait plugin service.
@@ -923,3 +956,15 @@
 }
 
 #endif /* MYSQL_VERSION_ID >= 50507 */
+
+#ifdef XTRADB_BASED
+/******************************************************************//*******
+Stub for an XtraDB-specific function called from row_merge_build_indexes().*/
+ibool
+thd_expand_fast_index_creation(
+/*================================*/
+	void*	thd __attribute__((unused)))
+{
+	return(FALSE);
+}
+#endif /* XTRADB_BASED */

=== modified file 'src/innodb_int.h'
--- src/innodb_int.h	2013-01-11 13:00:50 +0000
+++ src/innodb_int.h	2013-01-14 11:06:22 +0000
@@ -40,10 +40,16 @@
 #  if (MYSQL_VERSION_ID < 50500)
 #    define MACH_READ_64 mach_read_ull
 #    define MACH_WRITE_64 mach_write_ull
+#    define INDEX_ID_T dulint
+#    define INDEX_ID_CMP(a,b) ((a).high != (b).high ?  \
+			       ((a).high - (b).high) : \
+			       ((a).low - (b).low))
 #    define OS_MUTEX_CREATE() os_mutex_create(NULL)
 #  else
 #    define MACH_READ_64 mach_read_from_8
 #    define MACH_WRITE_64 mach_write_to_8
+#    define INDEX_ID_T index_id_t
+#    define INDEX_ID_CMP(a,b) ((a) - (b))
 #    define OS_MUTEX_CREATE() os_mutex_create()
 #  endif
 #  define xb_buf_page_is_corrupted(page, zip_size)	\
@@ -86,6 +92,22 @@
 	HASH_SEARCH(NAME, TABLE, FOLD, xtrabackup_tables_t*, DATA, ASSERTION, \
 		    TEST)
 
+/* The following constants have been copied from fsp0fsp.c */
+#define FSP_HEADER_OFFSET	FIL_PAGE_DATA	/* Offset of the space header
+						within a file page */
+#define	FSP_SIZE		8	/* Current size of the space in
+					pages */
+#define	FSP_FREE_LIMIT		12	/* Minimum page number for which the
+					free list has not been initialized:
+					the pages >= this limit are, by
+					definition, free; note that in a
+					single-table tablespace where size
+					< 64 pages, this number is 64, i.e.,
+					we have initialized the space
+					about the first extent, but have not
+					physically allocted those pages to the
+					file */
+
 /* ==start === definition at fil0fil.c === */
 // ##################################################################
 // NOTE: We should check the following definitions fit to the source.

=== modified file 'src/write_filt.c'
--- src/write_filt.c	2013-01-11 13:00:50 +0000
+++ src/write_filt.c	2013-01-14 11:06:22 +0000
@@ -62,22 +62,6 @@
 };
 
 /************************************************************************
-Compact page write filter. */
-static my_bool wf_compact_init(xb_write_filt_ctxt_t *ctxt, char *dst_name,
-			       xb_fil_cur_t *cursor);
-static my_bool wf_compact_process(xb_write_filt_ctxt_t *ctxt,
-				  ds_file_t *dstfile);
-static my_bool wf_compact_finalize(xb_write_filt_ctxt_t *ctxt,
-				   ds_file_t *dstfile);
-
-xb_write_filt_t wf_compact = {
-	&wf_compact_init,
-	&wf_compact_process,
-	&wf_compact_finalize,
-	NULL
-};
-
-/************************************************************************
 Initialize incremental page write filter.
 
 @return TRUE on success, FALSE on error. */
@@ -106,7 +90,7 @@
 	info.zip_size = cursor->zip_size;
 	info.space_id = cursor->space_id;
 	if (!xb_write_delta_metadata(meta_name, &info)) {
-		msg("[%02lu] xtrabackup: Error: "
+		msg("[%02u] xtrabackup: Error: "
 		    "failed to write meta info for %s\n",
 		    cursor->thread_n, cursor->path);
 		return(FALSE);
@@ -234,88 +218,3 @@
 
 	return(TRUE);
 }
-
-/************************************************************************
-Initialize the compact page write filter.
-
-@return TRUE on success, FALSE on error. */
-static my_bool
-wf_compact_init(xb_write_filt_ctxt_t *ctxt,
-		char *dst_name __attribute__((unused)), xb_fil_cur_t *cursor)
-{
-	xb_wf_compact_ctxt_t		*cp = &(ctxt->u.wf_compact_ctxt);
-
-	/* Don't compact the system table space */
-	cp->skip = cursor->is_system;
-
-	return(TRUE);
-}
-
-static my_bool
-check_if_skip_page(byte *page __attribute__((unused)))
-{
-	return(FALSE);
-}
-
-/************************************************************************
-Run the next batch of pages through the compact page write filter.
-
-@return TRUE on success, FALSE on error. */
-static my_bool
-wf_compact_process(xb_write_filt_ctxt_t *ctxt, ds_file_t *dstfile)
-{
-	xb_fil_cur_t		*cursor = ctxt->cursor;
-	ulint			 page_size = cursor->page_size;
-	byte			*page;
-	byte			*buf_end;
-	byte			*write_from;
-	xb_wf_compact_ctxt_t	*cp = &(ctxt->u.wf_compact_ctxt);
-
-	if (cp->skip) {
-		return(!ds_write(dstfile, cursor->buf, cursor->buf_read));
-	}
-
-	write_from = NULL;
-	buf_end = cursor->buf + cursor->buf_read;
-	for (page = cursor->buf; page < buf_end; page += page_size) {
-		if (!check_if_skip_page(page)) {
-			if (write_from == NULL) {
-				write_from = page;
-			}
-			continue;
-		}
-	}
-
-	/* Write the remaining pages in the buffer, if any */
-	if (write_from != NULL &&
-	    ds_write(dstfile, write_from, buf_end - write_from)) {
-		return(FALSE);
-	}
-
-	return(TRUE);
-}
-
-/************************************************************************
-Close the compact write filter's page map stream.
-
-@return TRUE on success, FALSE on error. */
-static my_bool
-wf_compact_finalize(xb_write_filt_ctxt_t *ctxt, ds_file_t *dstfile)
-{
-	xb_fil_cur_t			*cursor = ctxt->cursor;
-	ulint				page_size = cursor->page_size;
-	xb_wf_incremental_ctxt_t	*cp = &(ctxt->u.wf_incremental_ctxt);
-
-	if (cp->npages != page_size / 4) {
-		mach_write_to_4(cp->delta_buf + cp->npages * 4, 0xFFFFFFFFUL);
-	}
-
-	mach_write_to_4(cp->delta_buf, 0x58545241UL); /*"XTRA"*/
-
-	/* flush buffer */
-	if (ds_write(dstfile, cp->delta_buf, cp->npages * page_size)) {
-		return(FALSE);
-	}
-
-	return(TRUE);
-}

=== modified file 'src/write_filt.h'
--- src/write_filt.h	2013-01-11 13:00:50 +0000
+++ src/write_filt.h	2013-01-14 11:06:22 +0000
@@ -27,6 +27,7 @@
 
 #include "fil_cur.h"
 #include "datasink.h"
+#include "compact.h"
 
 /* Incremental page filter context */
 typedef struct {
@@ -35,11 +36,6 @@
 	ulint		 npages;
 } xb_wf_incremental_ctxt_t;
 
-/* Compact page filter context */
-typedef struct {
-	my_bool	skip;
-} xb_wf_compact_ctxt_t;
-
 /* Page filter context used as an opaque structure by callers */
 typedef struct {
 	xb_fil_cur_t	*cursor;

=== added file 'src/xb0xb.h'
--- src/xb0xb.h	1970-01-01 00:00:00 +0000
+++ src/xb0xb.h	2013-01-14 11:06:22 +0000
@@ -0,0 +1,40 @@
+/******************************************************
+Copyright (c) 2012 Percona Ireland Ltd.
+
+Declarations of XtraBackup functions called by InnoDB code.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*******************************************************/
+
+#ifndef xb0xb_h
+#define xb0xb_h
+
+extern ibool srv_compact_backup;
+extern ibool srv_rebuild_indexes;
+
+/******************************************************************************
+Callback used in buf_page_io_complete() to detect compacted pages.
+@return TRUE if the page is marked as compacted, FALSE otherwise. */
+ibool
+buf_page_is_compacted(
+/*==================*/
+	const byte*	page);	/*!< in: a database page */
+
+/******************************************************************************
+Rebuild all secondary indexes in all tables in separate spaces. Called from
+innobase_start_or_create_for_mysql(). */
+void
+xb_compact_rebuild_indexes(void);
+#endif

=== modified file 'src/xbstream.c'
--- src/xbstream.c	2013-01-11 13:00:50 +0000
+++ src/xbstream.c	2013-01-14 11:06:22 +0000
@@ -36,11 +36,12 @@
 	RUN_MODE_EXTRACT
 } run_mode_t;
 
-/* Need the following definitions to avoid linking with ds_stream.o,
-ds_compress.o, ds_tmpfile.o and their linking dependencies */
+/* Need the following definitions to avoid linking with ds_*.o and their link
+dependencies */
 datasink_t datasink_stream;
 datasink_t datasink_compress;
 datasink_t datasink_tmpfile;
+datasink_t datasink_buffer;
 
 static run_mode_t 	opt_mode;
 static char *		opt_directory = NULL;

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2013-01-14 04:42:47 +0000
+++ src/xtrabackup.c	2013-01-14 11:06:22 +0000
@@ -199,7 +199,6 @@
 long innobase_lock_wait_timeout = 50;
 long innobase_log_buffer_size = 1024*1024L;
 long innobase_log_files_in_group = 2;
-long innobase_log_files_in_group_backup;
 long innobase_mirrored_log_groups = 1;
 long innobase_open_files = 300L;
 
@@ -213,7 +212,6 @@
 
 longlong innobase_buffer_pool_size = 8*1024*1024L;
 longlong innobase_log_file_size = 5*1024*1024L;
-longlong innobase_log_file_size_backup;
 
 /* The default values for the following char* start-up parameters
 are determined in innobase_init below: */
@@ -222,7 +220,6 @@
 char*	innobase_data_home_dir			= NULL;
 char*	innobase_data_file_path 		= NULL;
 char*	innobase_log_group_home_dir		= NULL;
-char*	innobase_log_group_home_dir_backup	= NULL;
 char*	innobase_log_arch_dir			= NULL;/* unused */
 /* The following has a misleading name: starting from 4.0.5, this also
 affects Windows: */
@@ -252,13 +249,20 @@
 #define INNOBASE_WAKE_INTERVAL	32
 ulong	innobase_active_counter	= 0;
 
+ibool srv_compact_backup = FALSE;
+ibool srv_rebuild_indexes = FALSE;
+
 static char *xtrabackup_debug_sync = NULL;
 
 static my_bool xtrabackup_compact = FALSE;
-
-/* Datasinks */
-static  ds_ctxt_t       *ds_data     = NULL;
-static  ds_ctxt_t       *ds_meta     = NULL;
+static my_bool xtrabackup_rebuild_indexes = FALSE;
+
+/* datasink chain used to store datafiles */
+ds_ctxt_t       *ds_data     = NULL;
+/* datasink chain used to store XtraBackup metainfo files */
+ds_ctxt_t       *ds_meta     = NULL;
+
+/* datasinks used to build the above two chains */
 static  ds_ctxt_t       *ds_local    = NULL;
 static  ds_ctxt_t       *ds_compress = NULL;
 static  ds_ctxt_t       *ds_tmpfile  = NULL;
@@ -266,15 +270,6 @@
 static  ds_ctxt_t       *ds_buffer   = NULL;
 
 /* ======== Datafiles iterator ======== */
-typedef struct {
-	fil_system_t *system;
-	fil_space_t  *space;
-	fil_node_t   *node;
-	ibool        started;
-	os_mutex_t   mutex;
-} datafiles_iter_t;
-
-static
 datafiles_iter_t *
 datafiles_iter_new(fil_system_t *f_system)
 {
@@ -291,7 +286,6 @@
 	return it;
 }
 
-static
 fil_node_t *
 datafiles_iter_next(datafiles_iter_t *it)
 {
@@ -329,7 +323,6 @@
 	return new_node;
 }
 
-static
 void
 datafiles_iter_free(datafiles_iter_t *it)
 {
@@ -421,6 +414,7 @@
   OPT_INNODB_THREAD_SLEEP_DELAY,
   OPT_XTRA_DEBUG_SYNC,
   OPT_XTRA_COMPACT,
+  OPT_XTRA_REBUILD_INDEXES,
   OPT_DEFAULTS_GROUP
 };
 
@@ -714,6 +708,12 @@
    (G_PTR*) &xtrabackup_compact, (G_PTR*) &xtrabackup_compact,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 
+  {"rebuild_indexes", OPT_XTRA_REBUILD_INDEXES,
+   "Rebuild secondary indexes in InnoDB tables after applying the log. "
+   "Only has effect with --prepare.",
+   (G_PTR*) &xtrabackup_rebuild_indexes, (G_PTR*) &xtrabackup_rebuild_indexes,
+   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
   {"defaults_group", OPT_DEFAULTS_GROUP, "defaults group in config file (default \"mysqld\").",
    (G_PTR*) &defaults_group, (G_PTR*) &defaults_group,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -1303,8 +1303,9 @@
 my_bool
 xtrabackup_read_metadata(char *filename)
 {
-	FILE *fp;
-	my_bool r = TRUE;
+	FILE	*fp;
+	my_bool	 r = TRUE;
+	int	 t;
 
 	fp = fopen(filename,"r");
 	if(!fp) {
@@ -1331,7 +1332,12 @@
 			!= 1) {
 		metadata_last_lsn = 0;
 	}
-
+	/* Optional field */
+	if (fscanf(fp, "compact = %d\n", &t) == 1) {
+		xtrabackup_compact = (t == 1);
+	} else {
+		xtrabackup_compact = 0;
+	}
 end:
 	fclose(fp);
 
@@ -1348,11 +1354,13 @@
 		 "backup_type = %s\n"
 		 "from_lsn = %llu\n"
 		 "to_lsn = %llu\n"
-		 "last_lsn = %llu\n",
+		 "last_lsn = %llu\n"
+		 "compact = %d\n",
 		 metadata_type,
 		 metadata_from_lsn,
 		 metadata_to_lsn,
-		 metadata_last_lsn);
+		 metadata_last_lsn,
+		 xtrabackup_compact == TRUE);
 }
 
 /***********************************************************************
@@ -3677,11 +3685,6 @@
 	os_file_close(src_file);
 	src_file = XB_FILE_UNDEFINED;
 
-	/* Backup log parameters */
-	innobase_log_group_home_dir_backup = innobase_log_group_home_dir;
-	innobase_log_file_size_backup      = innobase_log_file_size;
-	innobase_log_files_in_group_backup = innobase_log_files_in_group;
-
 	/* fake InnoDB */
 	innobase_log_group_home_dir = NULL;
 	innobase_log_file_size      = file_size;
@@ -4236,11 +4239,6 @@
 	if (!xtrabackup_logfile_is_renamed)
 		return(FALSE);
 
-	/* Restore log parameters */
-	innobase_log_group_home_dir = innobase_log_group_home_dir_backup;
-	innobase_log_file_size      = innobase_log_file_size_backup;
-	innobase_log_files_in_group = innobase_log_files_in_group_backup;
-
 	/* rename 'ib_logfile0' to 'xtrabackup_logfile' */
 	if(!xtrabackup_incremental_dir) {
 		sprintf(dst_path, "%s/ib_logfile0", xtrabackup_target_dir);
@@ -4308,6 +4306,10 @@
 xtrabackup_prepare_func(void)
 {
 	ulint	err;
+	datafiles_iter_t	*it;
+	fil_node_t		*node;
+	fil_space_t		*space;
+	char			 metadata_path[FN_REFLEN];
 
 	/* cd to target-dir */
 
@@ -4325,11 +4327,10 @@
 
 	/* read metadata of target */
 	{
-		char	filename[FN_REFLEN];
-
-		sprintf(filename, "%s/%s", xtrabackup_target_dir, XTRABACKUP_METADATA_FILENAME);
-
-		if (!xtrabackup_read_metadata(filename))
+		sprintf(metadata_path, "%s/%s", xtrabackup_target_dir,
+			XTRABACKUP_METADATA_FILENAME);
+
+		if (!xtrabackup_read_metadata(metadata_path))
 			msg("xtrabackup: error: xtrabackup_read_metadata()\n");
 
 		if (!strcmp(metadata_type, "full-backuped")) {
@@ -4372,20 +4373,41 @@
 	os_sync_init();
 	sync_init();
 	os_io_init_simple();
+	mem_init(srv_mem_pool_size);
+
 	if(xtrabackup_init_temp_log())
 		goto error;
 
-	if(innodb_init_param())
+	if(innodb_init_param()) {
 		goto error;
+	}
+
+	/* Expand compacted datafiles */
+
+	if (xtrabackup_compact) {
+		srv_compact_backup = TRUE;
+
+		if (!xb_expand_datafiles()) {
+			goto error;
+		}
+
+		/* Reset the 'compact' flag in xtrabackup_checkpoints so we
+		don't expand on subsequent invocations. */
+		xtrabackup_compact = FALSE;
+		if (!xtrabackup_write_metadata(metadata_path)) {
+			msg("xtrabackup: error: xtrabackup_write_metadata() "
+			    "failed\n");
+			goto error;
+		}
+	}
 
 	xb_normalize_init_values();
 
-	mem_init(srv_mem_pool_size);
 	if (xtrabackup_incremental) {
 		err = xb_data_files_init();
 		if (err != DB_SUCCESS) {
-			msg("xtrabackup: error: xb_data_files_init() failed with"
-			    "error code %lu\n", err);
+			msg("xtrabackup: error: xb_data_files_init() failed "
+			    "with error code %lu\n", err);
 			goto error;
 		}
 
@@ -4403,13 +4425,14 @@
 	os_sync_mutex = NULL;
 	ut_free_all_mem();
 
-	/* check the accessibility of target-dir */
-	/* ############# TODO ##################### */
-
-	if(innodb_init_param())
+	/* Reset the configuration as it might have been changed by
+	xb_data_files_init(). */
+	if(innodb_init_param()) {
 		goto error;
+	}
 
 	srv_apply_log_only = (ibool) xtrabackup_apply_log_only;
+	srv_rebuild_indexes = (ibool) xtrabackup_rebuild_indexes;
 
 	/* increase IO threads */
 	if(srv_n_file_io_threads < 10) {
@@ -4424,214 +4447,199 @@
 	if(innodb_init())
 		goto error;
 
-	/* align space sizes along with fsp header */
-	{
-	fil_system_t*	f_system = fil_system;
-	fil_space_t*	space;
-
-	mutex_enter(&(f_system->mutex));
-	space = UT_LIST_GET_FIRST(f_system->space_list);
-
-	while (space != NULL) {
-		byte*	header;
-		ulint	size;
-		ulint	actual_size;
-		mtr_t	mtr;
-		buf_block_t*	block;
-		ulint	flags;
-
-		if (space->purpose == FIL_TABLESPACE) {
-			mutex_exit(&(f_system->mutex));
-
-			mtr_start(&mtr);
-
-			mtr_s_lock(fil_space_get_latch(space->id, &flags), &mtr);
-
-			block = buf_page_get(space->id,
-					     dict_table_flags_to_zip_size(flags),
-					     0, RW_S_LATCH, &mtr);
-			header = FIL_PAGE_DATA /*FSP_HEADER_OFFSET*/
-				+ buf_block_get_frame(block);
-
-			size = mtr_read_ulint(header + 8 /* FSP_SIZE */, MLOG_4BYTES, &mtr);
-
-			mtr_commit(&mtr);
-
-			fil_extend_space_to_desired_size(&actual_size, space->id, size);
-
-			mutex_enter(&(f_system->mutex));
+	it = datafiles_iter_new(fil_system);
+	if (it == NULL) {
+		msg("xtrabackup: Error: datafiles_iter_new() failed.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	while ((node = datafiles_iter_next(it)) != NULL) {
+		byte		*header;
+		ulint		 size;
+		ulint		 actual_size;
+		mtr_t		 mtr;
+		buf_block_t	*block;
+		ulint		 flags;
+
+		space = node->space;
+
+		/* Align space sizes along with fsp header. We want to process
+		each space once, so skip all nodes except the first one in a
+		multi-node space. */
+		if (UT_LIST_GET_PREV(chain, node) != NULL) {
+			continue;
 		}
 
-		space = UT_LIST_GET_NEXT(space_list, space);
-	}
-
-	mutex_exit(&(f_system->mutex));
-	}
-
-
+		mtr_start(&mtr);
+
+		mtr_s_lock(fil_space_get_latch(space->id, &flags), &mtr);
+
+		block = buf_page_get(space->id,
+				     dict_table_flags_to_zip_size(flags),
+				     0, RW_S_LATCH, &mtr);
+		header = FSP_HEADER_OFFSET + buf_block_get_frame(block);
+
+		size = mtr_read_ulint(header + FSP_SIZE, MLOG_4BYTES,
+				      &mtr);
+
+		mtr_commit(&mtr);
+
+		fil_extend_space_to_desired_size(&actual_size, space->id, size);
+	}
+
+	datafiles_iter_free(it);
 
 	if (xtrabackup_export) {
 		msg("xtrabackup: export option is specified.\n");
-		if (innobase_file_per_table) {
-			fil_system_t*	f_system = fil_system;
-			fil_space_t*	space;
-			fil_node_t*	node;
-			os_file_t	info_file = XB_FILE_UNDEFINED;
-			char		info_file_path[FN_REFLEN];
-			ibool		success;
-			char		table_name[FN_REFLEN];
-
-			byte*		page;
-			byte*		buf = NULL;
-
-			buf = ut_malloc(UNIV_PAGE_SIZE * 2);
-			page = ut_align(buf, UNIV_PAGE_SIZE);
-
-			/* flush insert buffer at shutdwon */
-			innobase_fast_shutdown = 0;
-
-			mutex_enter(&(f_system->mutex));
-
-			space = UT_LIST_GET_FIRST(f_system->space_list);
-			while (space != NULL) {
-				/* treat file_per_table only */
-				if (space->purpose != FIL_TABLESPACE
-				    || trx_sys_sys_space(space->id))
-				{
-					space = UT_LIST_GET_NEXT(space_list, space);
-					continue;
-				}
-
-				node = UT_LIST_GET_FIRST(space->chain);
-				while (node != NULL) {
-					int len;
-					char *next, *prev, *p;
-					dict_table_t*	table;
-					dict_index_t*	index;
-					ulint		n_index;
-
-					/* node exist == file exist, here */
-					strncpy(info_file_path, node->name, FN_REFLEN);
-					len = strlen(info_file_path);
-					info_file_path[len - 3] = 'e';
-					info_file_path[len - 2] = 'x';
-					info_file_path[len - 1] = 'p';
-
-					p = info_file_path;
-					prev = NULL;
-					while ((next = strstr(p, SRV_PATH_SEPARATOR_STR)) != NULL)
-					{
-						prev = p;
-						p = next + 1;
-					}
-					info_file_path[len - 4] = 0;
-					strncpy(table_name, prev, FN_REFLEN);
-
-					info_file_path[len - 4] = '.';
-
-					mutex_exit(&(f_system->mutex));
-					mutex_enter(&(dict_sys->mutex));
-
-					table = dict_table_get_low(table_name);
-					if (!table) {
-						msg("xtrabackup: error: "
-						    "cannot find dictionary "
-						    "record of table %s\n",
-						    table_name);
-						goto next_node;
-					}
-					index = dict_table_get_first_index(table);
-					n_index = UT_LIST_GET_LEN(table->indexes);
-					if (n_index > 31) {
-						msg("xtrabackup: error: "
-						    "sorry, cannot export over "
-						    "31 indexes for now.\n");
-						goto next_node;
-					}
-
-					/* init exp file */
-					bzero(page, UNIV_PAGE_SIZE);
-					mach_write_to_4(page    , 0x78706f72UL);
-					mach_write_to_4(page + 4, 0x74696e66UL);/*"xportinf"*/
-					mach_write_to_4(page + 8, n_index);
-					strncpy((char *) page + 12,
-						table_name, 500);
-
-					msg("xtrabackup: export metadata of "
-					    "table '%s' to file `%s` "
-					    "(%lu indexes)\n",
-					    table_name, info_file_path,
-					    n_index);
-
-					n_index = 1;
-					while (index) {
-						mach_write_to_8(page + n_index * 512, index->id);
-						mach_write_to_4(page + n_index * 512 + 8,
-#if (MYSQL_VERSION_ID < 50100)
-								index->tree->page);
-#else /* MYSQL_VERSION_ID < 51000 */
-								index->page);
-#endif
-					strncpy((char *) page + n_index * 512 +
-						12, index->name, 500);
-
-						msg("xtrabackup:     name=%s, "
-						    "id.low=%lu, page=%lu\n",
-						    index->name,
-#if (MYSQL_VERSION_ID < 50500)
-						    index->id.low,
-#else
-						    (ulint)(index->id &
-							    0xFFFFFFFFUL),
-#endif
-#if (MYSQL_VERSION_ID < 50100)
-						    index->tree->page
-#else /* MYSQL_VERSION_ID < 51000 */
-						(ulint) index->page
+		os_file_t	info_file = XB_FILE_UNDEFINED;
+		char		info_file_path[FN_REFLEN];
+		ibool		success;
+		char		table_name[FN_REFLEN];
+
+		byte*		page;
+		byte*		buf = NULL;
+
+		buf = ut_malloc(UNIV_PAGE_SIZE * 2);
+		page = ut_align(buf, UNIV_PAGE_SIZE);
+
+		/* flush insert buffer at shutdwon */
+		innobase_fast_shutdown = 0;
+
+		it = datafiles_iter_new(fil_system);
+		if (it == NULL) {
+			msg("xtrabackup: Error: datafiles_iter_new() "
+			    "failed.\n");
+			exit(EXIT_FAILURE);
+		}
+		while ((node = datafiles_iter_next(it)) != NULL) {
+			int		 len;
+			char		*next, *prev, *p;
+			dict_table_t*	 table;
+			dict_index_t*	 index;
+			ulint		 n_index;
+
+			space = node->space;
+
+			/* treat file_per_table only */
+			if (trx_sys_sys_space(space->id)) {
+				continue;
+			}
+
+			/* node exist == file exist, here */
+			strncpy(info_file_path, node->name, FN_REFLEN);
+			len = strlen(info_file_path);
+			info_file_path[len - 3] = 'e';
+			info_file_path[len - 2] = 'x';
+			info_file_path[len - 1] = 'p';
+
+			p = info_file_path;
+			prev = NULL;
+			while ((next = strstr(p, SRV_PATH_SEPARATOR_STR)) != NULL)
+			{
+				prev = p;
+				p = next + 1;
+			}
+			info_file_path[len - 4] = 0;
+			strncpy(table_name, prev, FN_REFLEN);
+
+			info_file_path[len - 4] = '.';
+
+			mutex_enter(&(dict_sys->mutex));
+
+			table = dict_table_get_low(table_name);
+			if (!table) {
+				msg("xtrabackup: error: "
+				    "cannot find dictionary "
+				    "record of table %s\n",
+				    table_name);
+				goto next_node;
+			}
+			index = dict_table_get_first_index(table);
+			n_index = UT_LIST_GET_LEN(table->indexes);
+			if (n_index > 31) {
+				msg("xtrabackup: error: "
+				    "sorry, cannot export over "
+				    "31 indexes for now.\n");
+				goto next_node;
+			}
+
+			/* init exp file */
+			bzero(page, UNIV_PAGE_SIZE);
+			mach_write_to_4(page    , 0x78706f72UL);
+			mach_write_to_4(page + 4, 0x74696e66UL);/*"xportinf"*/
+			mach_write_to_4(page + 8, n_index);
+			strncpy((char *) page + 12,
+				table_name, 500);
+
+			msg("xtrabackup: export metadata of "
+			    "table '%s' to file `%s` "
+			    "(%lu indexes)\n",
+			    table_name, info_file_path,
+			    n_index);
+
+			n_index = 1;
+			while (index) {
+				mach_write_to_8(page + n_index * 512, index->id);
+				mach_write_to_4(page + n_index * 512 + 8,
+#if (MYSQL_VERSION_ID < 50100)
+						index->tree->page
+#else /* MYSQL_VERSION_ID < 51000 */
+				index->page
 #endif
 						);
-						index = dict_table_get_next_index(index);
-						n_index++;
-					}
-
-					srv_normalize_path_for_win(info_file_path);
-					info_file = xb_file_create(
-						info_file_path,
-						OS_FILE_OVERWRITE,
-						OS_FILE_NORMAL, OS_DATA_FILE,
-						&success);
-					if (!success) {
-						os_file_get_last_error(TRUE);
-						goto next_node;
-					}
-					success = os_file_write(info_file_path, info_file, page,
-								0, 0, UNIV_PAGE_SIZE);
-					if (!success) {
-						os_file_get_last_error(TRUE);
-						goto next_node;
-					}
-					success = xb_file_flush(info_file);
-					if (!success) {
-						os_file_get_last_error(TRUE);
-						goto next_node;
-					}
+				strncpy((char *) page + n_index * 512 +
+					12, index->name, 500);
+
+				msg("xtrabackup:     name=%s, "
+				    "id.low=%lu, page=%lu\n",
+				    index->name,
+#if (MYSQL_VERSION_ID < 50500)
+				    index->id.low,
+#else
+				    (ulint)(index->id &
+					    0xFFFFFFFFUL),
+#endif
+#if (MYSQL_VERSION_ID < 50100)
+				    index->tree->page
+#else /* MYSQL_VERSION_ID < 51000 */
+				    (ulint) index->page
+#endif
+				    );
+				index = dict_table_get_next_index(index);
+				n_index++;
+
+				srv_normalize_path_for_win(info_file_path);
+				info_file = xb_file_create(
+					info_file_path,
+					OS_FILE_OVERWRITE,
+					OS_FILE_NORMAL, OS_DATA_FILE,
+					&success);
+				if (!success) {
+					os_file_get_last_error(TRUE);
+					goto next_node;
+				}
+				success = os_file_write(info_file_path,
+							info_file, page,
+							0, 0, UNIV_PAGE_SIZE);
+				if (!success) {
+					os_file_get_last_error(TRUE);
+					goto next_node;
+				}
+				success = xb_file_flush(info_file);
+				if (!success) {
+					os_file_get_last_error(TRUE);
+					goto next_node;
+				}
 next_node:
-					if (info_file != XB_FILE_UNDEFINED) {
-						os_file_close(info_file);
-						info_file = XB_FILE_UNDEFINED;
-					}
-					mutex_exit(&(dict_sys->mutex));
-					mutex_enter(&(f_system->mutex));
-
-					node = UT_LIST_GET_NEXT(chain, node);
+				if (info_file != XB_FILE_UNDEFINED) {
+					os_file_close(info_file);
+					info_file = XB_FILE_UNDEFINED;
 				}
-
-				space = UT_LIST_GET_NEXT(space_list, space);
+				mutex_exit(&(dict_sys->mutex));
 			}
-			mutex_exit(&(f_system->mutex));
-
-			ut_free(buf);
 		}
+
+		ut_free(buf);
 	}
 
 	/* print binlog position (again?) */
@@ -4921,12 +4929,6 @@
 		exit(EXIT_FAILURE);
 	}
 
-	if (xtrabackup_incremental && xtrabackup_compact) {
-		msg("xtrabackup: error: --compact cannot be used with "
-		    "incremental backups.\n");
-		exit(EXIT_FAILURE);
-	}
-
 	if (xtrabackup_incremental && xtrabackup_stream &&
 	    xtrabackup_stream_fmt == XB_STREAM_FMT_TAR) {
 		msg("xtrabackup: error: "

=== modified file 'src/xtrabackup.h'
--- src/xtrabackup.h	2013-01-11 13:00:50 +0000
+++ src/xtrabackup.h	2013-01-14 11:06:22 +0000
@@ -21,6 +21,8 @@
 #ifndef XB_XTRABACKUP_H
 #define XB_XTRABACKUP_H
 
+#include "datasink.h"
+
 typedef struct {
 	ulint	page_size;
 	ulint	zip_size;
@@ -33,13 +35,39 @@
     XB_STREAM_FMT_XBSTREAM
 } xb_stream_fmt_t;
 
+/* ======== Datafiles iterator ======== */
+typedef struct {
+	fil_system_t *system;
+	fil_space_t  *space;
+	fil_node_t   *node;
+	ibool        started;
+	os_mutex_t   mutex;
+} datafiles_iter_t;
+
 /* value of the --incremental option */
 extern LSN64 incremental_lsn;
 
+extern char		*xtrabackup_target_dir;
+extern ds_ctxt_t	*ds_meta;
+extern ds_ctxt_t	*ds_data;
+
 void xtrabackup_io_throttling(void);
 my_bool xb_write_delta_metadata(const char *filename,
 				const xb_delta_info_t *info);
 
+datafiles_iter_t *datafiles_iter_new(fil_system_t *f_system);
+fil_node_t *datafiles_iter_next(datafiles_iter_t *it);
+void datafiles_iter_free(datafiles_iter_t *it);
+
+/************************************************************************
+Initialize the tablespace memory cache and populate it by scanning for and
+opening data files */
+ulint xb_data_files_init(void);
+
+/************************************************************************
+Destroy the tablespace memory cache. */
+void xb_data_files_close(void);
+
 /***********************************************************************
 Reads the space flags from a given data file and returns the compressed
 page size, or 0 if the space is not compressed. */

=== added file 'test/disabled/workaround_for_lp855155'
=== modified file 'test/inc/incremental_sample-db/incremental_sample-schema.sql'
--- test/inc/incremental_sample-db/incremental_sample-schema.sql	2011-07-05 04:17:41 +0000
+++ test/inc/incremental_sample-db/incremental_sample-schema.sql	2013-01-14 11:06:22 +0000
@@ -1,5 +1,6 @@
 DROP TABLE IF EXISTS `test`;
 CREATE TABLE `test` (
-  `a` int(11) DEFAULT NULL,
-  `number` int(11) DEFAULT NULL
+  `a` int(11) NOT NULL PRIMARY KEY,
+  `number` int(11) DEFAULT NULL,
+  KEY(number)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;

=== renamed file 'test/disabled/compact.sh' => 'test/t/compact.sh'
--- test/disabled/compact.sh	2012-02-16 18:02:07 +0000
+++ test/t/compact.sh	2013-01-14 11:06:22 +0000
@@ -4,8 +4,7 @@
 
 . inc/common.sh
 
-init
-run_mysqld --innodb_file_per_table
+start_server --innodb_file_per_table
 load_dbase_schema sakila
 load_dbase_data sakila
 
@@ -16,20 +15,20 @@
 
 record_db_state sakila
 
-stop_mysqld
+stop_server
 
 # Remove datadir
 rm -r $mysql_datadir
 
 # Restore sakila
-vlog "Applying log"
-innobackupex --apply-log $backup_dir
+
+innobackupex --apply-log --rebuild-indexes $backup_dir
 
 vlog "Restoring MySQL datadir"
 mkdir -p $mysql_datadir
 innobackupex --copy-back $backup_dir
 
-run_mysqld
+start_server
 
 verify_db_state sakila
 

=== renamed file 'test/disabled/compact_compressed.sh' => 'test/t/compact_compressed.sh'
--- test/disabled/compact_compressed.sh	2012-02-16 18:02:07 +0000
+++ test/t/compact_compressed.sh	2013-01-14 11:06:22 +0000
@@ -4,8 +4,6 @@
 
 . inc/common.sh
 
-init
-
 if [ -z "$INNODB_VERSION" ]; then
     echo "Requires InnoDB plugin or XtraDB" >$SKIPPED_REASON
     exit $SKIPPED_EXIT_CODE
@@ -17,37 +15,63 @@
 --innodb_file_format=Barracuda"
 
 #
-# Test compact  backup of a compressed tablespace with a specific page size
+# Test compact backup of a compressed tablespace with a specific page size
 #
 function test_compact_compressed()
 {
-  page_size=$1
+  local page_size=$1
+  local backup_dir
   
   echo "************************************************************************"
   echo "Testing compact backup with compressed page size=${page_size}KB "
   echo "************************************************************************"
 
-  run_mysqld ${mysqld_additional_args}
+  start_server ${mysqld_additional_args}
 
   load_dbase_schema sakila
   load_dbase_data sakila
 
+  backup_dir="$topdir/backup"
+  
   vlog "Compressing tables"
 
   table_list=`${MYSQL} ${MYSQL_ARGS} -Ns -e \
 "SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='sakila' \
-AND TABLE_TYPE='BASE TABLE'"`
+AND TABLE_TYPE='BASE TABLE' AND ENGINE='InnoDB'"`
 
   for t in $table_list; do
       run_cmd ${MYSQL} ${MYSQL_ARGS} -e \
 	  "ALTER TABLE $t ENGINE=InnoDB ROW_FORMAT=compressed \
            KEY_BLOCK_SIZE=$page_size" sakila
   done
+
+  innobackupex --no-timestamp --compact $backup_dir
+  record_db_state sakila
+
+  stop_server
+
+  rm -r $mysql_datadir
+
+  innobackupex --apply-log --rebuild-indexes $backup_dir
+
+  vlog "Restoring MySQL datadir"
+  mkdir -p $mysql_datadir
+  innobackupex --copy-back $backup_dir
+
+  start_server
+
+  verify_db_state sakila
+
+  stop_server
+  clean
 }
 
-for page_size in 1 2 4 8 16; do
-  init
+
+# Cannot test with lower page sizes, because not all tables can be compressed
+# with KEY_BLOCK_SIZE < 8. This can be changed, if we implement 'canned'
+# databases in the test suite, which will contain tables compressed with the
+# minimum possible page size.
+for page_size in 8 16; do
   test_compact_compressed ${page_size}
-  clean
 done
 

=== modified file 'test/testrun.sh'
--- test/testrun.sh	2013-01-09 22:25:19 +0000
+++ test/testrun.sh	2013-01-14 11:06:22 +0000
@@ -86,9 +86,10 @@
     else
 	LD_LIBRARY_PATH=$MYSQL_BASEDIR/lib/mysql:$LD_LIBRARY_PATH
     fi
+    DYLD_LIBRARY_PATH="$LD_LIBRARY_PATH"
 
     export TEST_BASEDIR PORT_BASE TAR MYSQL_BASEDIR MYSQL MYSQLD MYSQLADMIN \
-MYSQL_INSTALL_DB PATH LD_LIBRARY_PATH
+MYSQL_INSTALL_DB PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH MYSQLDUMP
 }
 
 function get_version_info()

=== modified file 'utils/build.sh'
--- utils/build.sh	2013-01-02 04:23:18 +0000
+++ utils/build.sh	2013-01-14 11:06:22 +0000
@@ -10,26 +10,34 @@
 AUTO_DOWNLOAD=${AUTO_DOWNLOAD:-no}
 MASTER_SITE="http://s3.amazonaws.com/percona.com/downloads/community"
 
+top_dir=`pwd`
+
 # Percona Server 5.5 does not build with -Werror, so ignore DEBUG for now
 if [ -n "$DEBUG" -a "$1" != "galera55" -a "$1" != "xtradb55" -a "$1" != "xtradb51" -a "$1" != "xtradb" ]
 then
     # InnoDB extra debug flags
-    innodb_extra_debug="-DUNIV_DEBUG -DUNIV_SYNC_DEBUG -DUNIV_MEM_DEBUG \
+    innodb_extra_debug="-DUNIV_DEBUG -DUNIV_MEM_DEBUG \
 -DUNIV_DEBUG_THREAD_CREATION -DUNIV_DEBUG_LOCK_VALIDATE -DUNIV_DEBUG_PRINT \
 -DUNIV_DEBUG_FILE_ACCESS -DUNIV_SEARCH_DEBUG -DUNIV_LOG_LSN_DEBUG \
 -DUNIV_ZIP_DEBUG -DUNIV_AHI_DEBUG -DUNIV_SQL_DEBUG -DUNIV_AIO_DEBUG \
 -DUNIV_LRU_DEBUG -DUNIV_BUF_DEBUG -DUNIV_HASH_DEBUG -DUNIV_LIST_DEBUG -DUNIV_IBUF_DEBUG"
-    export CFLAGS="$CFLAGS -g -O0 $innodb_extra_debug -DSAFE_MUTEX -DSAFEMALLOC"
-    export CXXFLAGS="$CXXFLAGS -g -O0 $innodb_extra_debug -DSAFE_MUTEX -DSAFEMALLOC"
+    CFLAGS="$CFLAGS -g -O0 $innodb_extra_debug -DSAFE_MUTEX -DSAFEMALLOC"
+    CXXFLAGS="$CXXFLAGS -g -O0 $innodb_extra_debug -DSAFE_MUTEX -DSAFEMALLOC"
     extra_config_51="--with-debug=full"
     extra_config_55="-DWITH_DEBUG=ON"
 else
-    export CFLAGS="$CFLAGS -g -O3"
-    export CXXFLAGS="$CXXFLAGS -g -O3"
+    CFLAGS="$CFLAGS -g -O3"
+    CXXFLAGS="$CXXFLAGS -g -O3"
     extra_config_51=
     extra_config_55=
 fi
 
+xtrabackup_include_dir="$top_dir/src"
+CFLAGS="$CFLAGS -I$xtrabackup_include_dir"
+CXXFLAGS="$CXXFLAGS -I$xtrabackup_include_dir"
+
+export CFLAGS CXXFLAGS
+
 MAKE_CMD=make
 if gmake --version > /dev/null 2>&1
 then
@@ -181,8 +189,6 @@
 fi
 
 type=$1
-top_dir=`pwd`
-
 
 case "$type" in
 "innodb51" | "plugin")