Merge lp:~percona-dev/percona-xtrabackup/port-to-ps-5.5 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Vadim Tkachenko (vadim-tk)]

Alexey,

Why xtrabackup_innodb55 ?

I'd like to have single binary xtrabackup_55 for both Percona Server and MySQL

[Alexey Kopytov (akopytov)]

Updated the branch to address Vadim's comments: support for building against MySQL 5.5 and InnoDB plugin in MySQL 5.1 was removed.

[Vadim Tkachenko (vadim-tk)]

Asking Valentine to confirm that all tests pass against Percona Server 5.5

[Valentine Gostev (longbow)]

Alexey,

could you please clarify warnings? I get many warnings while attempting build on CentOS 5.5:

[root@gval-cent5-64-n403 port-to-ps-5.5]# ./utils/build.sh xtradb55
<snip>
[100%] /root/port-to-ps-5.5/Percona-Server-5.5/mysys/lf_hash.c: In function ‘lfind’:
/root/port-to-ps-5.5/Percona-Server-5.5/mysys/lf_hash.c:125: warning: dereferencing type-punned pointer will break strict-aliasing rules
/root/port-to-ps-5.5/Percona-Server-5.5/mysys/lf_hash.c: In function ‘linsert’:
/root/port-to-ps-5.5/Percona-Server-5.5/mysys/lf_hash.c:171: warning: dereferencing type-punned pointer will break strict-aliasing rules
/root/port-to-ps-5.5/Percona-Server-5.5/mysys/lf_hash.c: In function ‘ldelete’:
/root/port-to-ps-5.5/Percona-Server-5.5/mysys/lf_hash.c:218: warning: dereferencing type-punned pointer will break strict-aliasing rules
/root/port-to-ps-5.5/Percona-Server-5.5/mysys/lf_hash.c:219: warning: dereferencing type-punned pointer will break strict-aliasing rules
/root/port-to-ps-5.5/Percona-Server-5.5/mysys/lf_hash.c:224: warning: dereferencing type-punned pointer will break strict-aliasing rules
/root/port-to-ps-5.5/Percona-Server-5.5/mysys/lf_hash.c: In function ‘initialize_bucket’:
/root/port-to-ps-5.5/Percona-Server-5.5/mysys/lf_hash.c:493: warning: dereferencing type-punned pointer will break strict-aliasing rules
<snip>
gmake[2]: Entering directory `/root/port-to-ps-5.5/Percona-Server-5.5'
[100%] Building C object extra/CMakeFiles/perror.dir/perror.c.o
Linking C executable perror
CMakeFiles/perror.dir/perror.c.o: In function `main':
/root/port-to-ps-5.5/Percona-Server-5.5/extra/perror.c:268: warning: `sys_errlist' is deprecated; use `strerror' or `strerror_r' instead
/root/port-to-ps-5.5/Percona-Server-5.5/extra/perror.c:266: warning: `sys_nerr' is deprecated; use `strerror' or `strerror_r' instead
<snip>
[ 69%] Building C object storage/innobase/CMakeFiles/innobase.dir/fut/fut0fut.c.o
/root/port-to-ps-5.5/Percona-Server-5.5/storage/innobase/fil/fil0fil.c:2025: warning: ‘fil_op_write_log’ defined but not used
<snip>
[ 77%] Building C object storage/innobase/CMakeFiles/innobase.dir/mem/mem0pool.c.o
/root/port-to-ps-5.5/Percona-Server-5.5/storage/innobase/log/log0recv.c:65:1: warning: "RECV_READ_AHEAD_AREA" redefined
In file included from /root/port-to-ps-5.5/Percona-Server-5.5/storage/innobase/log/log0recv.c:26:
/root/port-to-ps-5.5/Percona-Server-5.5/storage/innobase/include/log0recv.h:447:1: warning: this is the location of the previous definition
<snip>
[ 83%] Building C object storage/innobase/CMakeFiles/innobase.dir/row/row0ins.c.o
/root/port-to-ps-5.5/Percona-Server-5.5/storage/innobase/handler/ha_innodb.cc:12026: warning: type-punning to incomplete type might break strict-aliasing rules
[ 88%] Building C object storage/innobase/CMakeFiles/innobase.dir/srv/srv0srv.c.o
/root/port-to-ps-5.5/Percona-Server-5.5/storage/innobase/row/row0upd.c: In function ‘row_upd_changes_ord_field_binary’:
/root/port-to-ps-5.5/Percona-Server-5.5/storage/innobase/row/row0upd.c:1227: warning: ‘dfield_len’ may be used uninitialized in this function
/root/port-to-ps-5.5/Percona-Server-5.5/storage/innobase/srv/srv0srv.c: In function ‘srv_conc_enter_innodb_timer_b...

review: Needs Information (qa)

[Valentine Gostev (longbow)]

review: Needs Fixing (qa)

[Vadim Tkachenko (vadim-tk)]

Valentine,

warnings are not related to XtraBackup, it should go to Percona Server.
Please test XtraBackup functionality.

[Alexey Kopytov (akopytov)]

Valentine,

Yes, there are still a lot of warnings when building the server with xtrabackup patches, tar4ibd and xtrabackup itself. They were present before my work on porting. I didn't fix them because that wasn't a goal of my work on this.

[Valentine Gostev (longbow)]

tests are ok,

besides ib_partiotion (but reason there is in innobackupex)

review: Approve (qa)

[Vadim Tkachenko (vadim-tk)]

good to merge then

review: Approve

=== modified file 'Makefile'
--- Makefile	2011-03-13 15:52:22 +0000
+++ Makefile	2011-03-15 21:59:23 +0000
@@ -1,17 +1,16 @@
 # Makefile to build XtraBackup for Percona Server and different versions of MySQL
 #
 # Syntax:
-# make [5.1|5.5|plugin|xtradb]
+# make [5.1|xtradb|xtradb55]
 #
-# Default is xtradb - to build XtraBackup for Percona Server
-# 5.1 - XtraBackup for MySQL versions 5.1.* with plugin innobase
-# 5.5 - XtraBackup for MySQL versions 5.5.8 and up with plugin innobase
-# plugin - XtraBackup for MySQL versions 5.1.* with plugin innodb_plugin
+# Default is xtradb - to build XtraBackup for Percona Server 5.1
+# xtradb55 - Xtrabackup for Percona Server 5.5
+# 5.1 - XtraBackup for MySQL versions 5.1.* with builtin InnoDB
 
 LIBS = -lpthread
 DEFS = -DUNIV_LINUX -DMYSQL_SERVER
 
-CFLAGS += -O3 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2
+CFLAGS += -O3 -g
 
 TARGET=xtrabackup
 PREFIX=/usr
@@ -53,29 +52,6 @@
 5.1: TARGET := xtrabackup_51
 5.1: $(TARGET)
 
-# XtraBackup for MySQL with InnoDB Plugin
-plugin: INC = -I. -I.. -I./../include -I./../../include -I./../../../include
-plugin: INNODBOBJS = ../ha_innodb_plugin_la-btr0btr.o ../ha_innodb_plugin_la-btr0cur.o ../ha_innodb_plugin_la-btr0pcur.o ../ha_innodb_plugin_la-btr0sea.o ../ha_innodb_plugin_la-buf0buddy.o ../ha_innodb_plugin_la-buf0buf.o ../ha_innodb_plugin_la-buf0flu.o ../ha_innodb_plugin_la-buf0lru.o ../ha_innodb_plugin_la-buf0rea.o ../ha_innodb_plugin_la-data0data.o ../ha_innodb_plugin_la-data0type.o ../ha_innodb_plugin_la-dict0boot.o ../ha_innodb_plugin_la-dict0crea.o ../ha_innodb_plugin_la-dict0dict.o ../ha_innodb_plugin_la-dict0load.o ../ha_innodb_plugin_la-dict0mem.o ../ha_innodb_plugin_la-dyn0dyn.o ../ha_innodb_plugin_la-eval0eval.o ../ha_innodb_plugin_la-eval0proc.o ../ha_innodb_plugin_la-fil0fil.o ../ha_innodb_plugin_la-fsp0fsp.o ../ha_innodb_plugin_la-fut0fut.o ../ha_innodb_plugin_la-fut0lst.o ../ha_innodb_plugin_la-ha0ha.o ../ha_innodb_plugin_la-ha0storage.o ../ha_innodb_plugin_la-hash0hash.o ../ha_innodb_plugin_la-ibuf0ibuf.o ../ha_innodb_plugin_la-lock0iter.o ../ha_innodb_plugin_la-lock0lock.o ../ha_innodb_plugin_la-log0log.o ../ha_innodb_plugin_la-log0recv.o ../ha_innodb_plugin_la-mach0data.o ../ha_innodb_plugin_la-mem0mem.o ../ha_innodb_plugin_la-mem0pool.o ../ha_innodb_plugin_la-mtr0log.o ../ha_innodb_plugin_la-mtr0mtr.o ../ha_innodb_plugin_la-os0file.o ../ha_innodb_plugin_la-os0proc.o ../ha_innodb_plugin_la-os0sync.o ../ha_innodb_plugin_la-os0thread.o ../ha_innodb_plugin_la-page0cur.o ../ha_innodb_plugin_la-page0page.o ../ha_innodb_plugin_la-page0zip.o ../ha_innodb_plugin_la-lexyy.o ../ha_innodb_plugin_la-pars0grm.o ../ha_innodb_plugin_la-pars0opt.o ../ha_innodb_plugin_la-pars0pars.o ../ha_innodb_plugin_la-pars0sym.o ../ha_innodb_plugin_la-que0que.o ../ha_innodb_plugin_la-read0read.o ../ha_innodb_plugin_la-rem0cmp.o ../ha_innodb_plugin_la-rem0rec.o ../ha_innodb_plugin_la-row0ext.o ../ha_innodb_plugin_la-row0ins.o ../ha_innodb_plugin_la-row0merge.o ../ha_innodb_plugin_la-row0mysql.o ../ha_innodb_plugin_la-row0purge.o ../ha_innodb_plugin_la-row0row.o ../ha_innodb_plugin_la-row0sel.o ../ha_innodb_plugin_la-row0uins.o ../ha_innodb_plugin_la-row0umod.o ../ha_innodb_plugin_la-row0undo.o ../ha_innodb_plugin_la-row0upd.o ../ha_innodb_plugin_la-row0vers.o ../ha_innodb_plugin_la-srv0que.o ../ha_innodb_plugin_la-srv0srv.o ../ha_innodb_plugin_la-srv0start.o ../ha_innodb_plugin_la-sync0arr.o ../ha_innodb_plugin_la-sync0rw.o ../ha_innodb_plugin_la-sync0sync.o ../ha_innodb_plugin_la-thr0loc.o ../ha_innodb_plugin_la-trx0purge.o ../ha_innodb_plugin_la-trx0rec.o ../ha_innodb_plugin_la-trx0roll.o ../ha_innodb_plugin_la-trx0rseg.o ../ha_innodb_plugin_la-trx0sys.o ../ha_innodb_plugin_la-trx0trx.o ../ha_innodb_plugin_la-trx0undo.o ../ha_innodb_plugin_la-usr0sess.o ../ha_innodb_plugin_la-ut0byte.o ../ha_innodb_plugin_la-ut0dbg.o ../ha_innodb_plugin_la-ut0list.o ../ha_innodb_plugin_la-ut0mem.o ../ha_innodb_plugin_la-ut0rnd.o ../ha_innodb_plugin_la-ut0ut.o ../ha_innodb_plugin_la-ut0vec.o ../ha_innodb_plugin_la-ut0wqueue.o ../ha_innodb_plugin_la-ut0rbt.o
-
-plugin: MYSQLOBJS= ../../../mysys/libmysys.a ../../../strings/libmystrings.a ../../../zlib/.libs/libzlt.a
-plugin: TARGET := xtrabackup_plugin
-plugin: $(TARGET)
-
-# XtraBackup for MySQL 5.5
-5.5: INC = -I. -I.. -I./../include -I./../../include -I./../../../include
-5.5: INNODBOBJS= ../libinnobase.a
-
-5.5: MYSQLOBJS= ../../../mysys/libmysys.a ../../../strings/libstrings.a ../../../zlib/libzlib.a
-ifeq ($(shell uname -s),Linux)
-5.5: LIBS += -laio
-endif
-5.5: TARGET := xtrabackup_55
-# In CMake server builds it is important to build with exactly the same preprocessor flags
-# as were used to build InnoDB
-5.5: DEFS = $(shell grep C_DEFINES ../CMakeFiles/innobase.dir/flags.make | \
-               sed -e 's/C_DEFINES = //')
-5.5: $(TARGET)
-
 # XtraBackup for XtraDB 
 xtradb: INC=-I. -I.. -I./../include -I./../../include -I./../../../include
 xtradb: INNODBOBJS = ../libinnobase_a-btr0btr.o ../libinnobase_a-btr0cur.o ../libinnobase_a-btr0pcur.o \
@@ -113,6 +89,22 @@
 xtradb: TARGET := xtrabackup 
 xtradb: $(TARGET)
 
+# XtraBackup for XtraDB 5.5
+xtradb55: INC=-I. -I.. -I./../include -I./../../include -I./../../../include
+xtradb55: INNODBOBJS = ../libinnobase.a
+ifeq ($(shell uname -s),Linux)
+xtradb55: LIBS += -laio
+endif
+xtradb55: MYSQLOBJS = ../../../mysys/libmysys.a ../../../strings/libstrings.a ../../../zlib/libzlib.a
+# In CMake server builds it is important to build with exactly the same preprocessor flags
+# as were used to build InnoDB
+xtradb55: DEFS = $(shell grep C_DEFINES ../CMakeFiles/innobase.dir/flags.make | \
+               sed -e 's/C_DEFINES = //')
+xtradb55: DEFS += -DXTRADB_BASED -DXTRADB55
+xtradb55: TARGET := xtrabackup_55
+xtradb55: $(TARGET)
+
+
 xtrabackup.o: xtrabackup.c
 	$(CC) $(CFLAGS) $(INC) $(DEFS) -c $*.c
 

=== removed file 'fix_innodb_for_backup55.patch'
--- fix_innodb_for_backup55.patch	2011-03-13 15:52:22 +0000
+++ fix_innodb_for_backup55.patch	1970-01-01 00:00:00 +0000
@@ -1,1100 +0,0 @@
---- a/storage/innobase/btr/btr0btr.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/btr/btr0btr.c	2011-03-11 07:20:18.000000000 -0800
-@@ -120,7 +120,7 @@
- /**************************************************************//**
- Gets the root node of a tree and x-latches it.
- @return	root page, x-latched */
--static
-+//static
- buf_block_t*
- btr_root_block_get(
- /*===============*/
-@@ -566,7 +566,7 @@
- /************************************************************//**
- Returns the child page of a node pointer and x-latches it.
- @return	child page, x-latched */
--static
-+//static
- buf_block_t*
- btr_node_ptr_get_child(
- /*===================*/
---- a/storage/innobase/buf/buf0buf.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/buf/buf0buf.c	2011-03-11 07:20:18.000000000 -0800
-@@ -517,7 +517,7 @@
- 		return(TRUE);
- 	}
- 
--#ifndef UNIV_HOTBACKUP
-+#ifdef UNDEFINED
- 	if (recv_lsn_checks_on) {
- 		ib_uint64_t	current_lsn;
- 
-@@ -4056,7 +4056,7 @@
- 			recv_recover_page(TRUE, (buf_block_t*) bpage);
- 		}
- 
--		if (uncompressed && !recv_no_ibuf_operations) {
-+		if (uncompressed && !recv_no_ibuf_operations && !srv_fake_write) {
- 			ibuf_merge_or_delete_for_page(
- 				(buf_block_t*) bpage, bpage->space,
- 				bpage->offset, buf_page_get_zip_size(bpage),
---- a/storage/innobase/buf/buf0rea.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/buf/buf0rea.c	2011-03-11 07:20:18.000000000 -0800
-@@ -122,6 +122,45 @@
- 	bpage = buf_page_init_for_read(err, mode, space, zip_size, unzip,
- 				       tablespace_version, offset);
- 	if (bpage == NULL) {
-+		if (recv_recovery_is_on() && *err == DB_TABLESPACE_DELETED) {
-+			/* hashed log recs must be treated here */
-+			recv_addr_t*    recv_addr;
-+
-+			mutex_enter(&(recv_sys->mutex));
-+
-+			if (recv_sys->apply_log_recs == FALSE) {
-+				mutex_exit(&(recv_sys->mutex));
-+				goto not_to_recover;
-+			}
-+
-+			/* recv_get_fil_addr_struct() */
-+			recv_addr = HASH_GET_FIRST(recv_sys->addr_hash,
-+					hash_calc_hash(ut_fold_ulint_pair(space, offset),
-+						recv_sys->addr_hash));
-+			while (recv_addr) {
-+				if ((recv_addr->space == space)
-+					&& (recv_addr->page_no == offset)) {
-+					break;
-+				}
-+				recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
-+			}
-+
-+			if ((recv_addr == NULL)
-+			    || (recv_addr->state == RECV_BEING_PROCESSED)
-+			    || (recv_addr->state == RECV_PROCESSED)) {
-+				mutex_exit(&(recv_sys->mutex));
-+				goto not_to_recover;
-+			}
-+
-+			fprintf(stderr, " (cannot find space: %lu)", space);
-+			recv_addr->state = RECV_PROCESSED;
-+
-+			ut_a(recv_sys->n_addrs);
-+			recv_sys->n_addrs--;
-+
-+			mutex_exit(&(recv_sys->mutex));
-+		}
-+not_to_recover:
- 
- 		return(0);
- 	}
-@@ -604,6 +643,50 @@
- 		/* It is a single table tablespace and the .ibd file is
- 		missing: do nothing */
- 
-+		/* the log records should be treated here same reason
-+		for http://bugs.mysql.com/bug.php?id=43948 */
-+
-+		if (recv_recovery_is_on()) {
-+			recv_addr_t*    recv_addr;
-+
-+			mutex_enter(&(recv_sys->mutex));
-+
-+			if (recv_sys->apply_log_recs == FALSE) {
-+				mutex_exit(&(recv_sys->mutex));
-+				goto not_to_recover;
-+			}
-+
-+			for (i = 0; i < n_stored; i++) {
-+				/* recv_get_fil_addr_struct() */
-+				recv_addr = HASH_GET_FIRST(recv_sys->addr_hash,
-+						hash_calc_hash(ut_fold_ulint_pair(space, page_nos[i]),
-+							recv_sys->addr_hash));
-+				while (recv_addr) {
-+					if ((recv_addr->space == space)
-+						&& (recv_addr->page_no == page_nos[i])) {
-+						break;
-+					}
-+					recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
-+				}
-+
-+				if ((recv_addr == NULL)
-+				    || (recv_addr->state == RECV_BEING_PROCESSED)
-+				    || (recv_addr->state == RECV_PROCESSED)) {
-+					continue;
-+				}
-+
-+				recv_addr->state = RECV_PROCESSED;
-+
-+				ut_a(recv_sys->n_addrs);
-+				recv_sys->n_addrs--;
-+			}
-+
-+			mutex_exit(&(recv_sys->mutex));
-+
-+			fprintf(stderr, " (cannot find space: %lu)", space);
-+		}
-+not_to_recover:
-+
- 		return;
- 	}
- 
---- a/storage/innobase/fil/fil0fil.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/fil/fil0fil.c	2011-03-11 07:20:18.000000000 -0800
-@@ -40,6 +40,8 @@
- #include "dict0dict.h"
- #include "page0page.h"
- #include "page0zip.h"
-+#include "pars0pars.h"
-+#include "que0que.h"
- #ifndef UNIV_HOTBACKUP
- # include "buf0lru.h"
- # include "ibuf0ibuf.h"
-@@ -297,7 +299,7 @@
- 
- /** The tablespace memory cache. This variable is NULL before the module is
- initialized. */
--static fil_system_t*	fil_system	= NULL;
-+fil_system_t*	fil_system	= NULL;
- 
- #ifdef UNIV_DEBUG
- /** Try fil_validate() every this many times */
-@@ -336,7 +338,7 @@
- off the LRU list if it is in the LRU list. The caller must hold the fil_sys
- mutex. */
- static
--void
-+ulint
- fil_node_prepare_for_io(
- /*====================*/
- 	fil_node_t*	node,	/*!< in: file node */
-@@ -661,7 +663,7 @@
- Opens a the file of a node of a tablespace. The caller must own the fil_system
- mutex. */
- static
--void
-+ulint
- fil_node_open_file(
- /*===============*/
- 	fil_node_t*	node,	/*!< in: file node */
-@@ -696,7 +698,14 @@
- 			OS_FILE_READ_ONLY, &success);
- 		if (!success) {
- 			/* The following call prints an error message */
--			os_file_get_last_error(TRUE);
-+			if (os_file_get_last_error(TRUE) == OS_FILE_NOT_FOUND)
-+			{
-+				ut_print_timestamp(stderr);
-+				fprintf(stderr,
-+					" InnoDB: Warning: cannot open %s\n",
-+					node->name);
-+				return(OS_FILE_NOT_FOUND);
-+			}
- 
- 			ut_print_timestamp(stderr);
- 
-@@ -786,8 +795,8 @@
- 		}
- 
- 		if (size_bytes >= 1024 * 1024) {
--			/* Truncate the size to whole megabytes. */
--			size_bytes = ut_2pow_round(size_bytes, 1024 * 1024);
-+			/* The size should be exact for after applying .delta */
-+			//size_bytes = ut_2pow_round(size_bytes, 1024 * 1024);
- 		}
- 
- 		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
-@@ -838,6 +847,8 @@
- 		/* Put the node to the LRU list */
- 		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
- 	}
-+
-+	return(0);
- }
- 
- /**********************************************************************//**
-@@ -1463,7 +1474,12 @@
- 		the file yet; the following calls will open it and update the
- 		size fields */
- 
--		fil_node_prepare_for_io(node, fil_system, space);
-+		if (fil_node_prepare_for_io(node, fil_system, space))
-+		{
-+			mutex_exit(&fil_system->mutex);
-+
-+			return(0);
-+		}
- 		fil_node_complete_io(node, fil_system, OS_FILE_READ);
- 	}
- 
-@@ -1515,7 +1531,12 @@
- 		the file yet; the following calls will open it and update the
- 		size fields */
- 
--		fil_node_prepare_for_io(node, fil_system, space);
-+		if (fil_node_prepare_for_io(node, fil_system, space))
-+		{
-+			mutex_exit(&fil_system->mutex);
-+
-+			return(ULINT_UNDEFINED);
-+		}
- 		fil_node_complete_io(node, fil_system, OS_FILE_READ);
- 	}
- 
-@@ -2180,7 +2201,7 @@
- 			if (fil_create_new_single_table_tablespace(
- 				    space_id, name, FALSE, flags,
- 				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
--				ut_error;
-+				//ut_error;
- 			}
- 		}
- 
-@@ -2343,7 +2364,7 @@
- 	}
- 
- 	if (success) {
--#ifndef UNIV_HOTBACKUP
-+#ifdef UNDEFINED
- 		/* Write a log record about the deletion of the .ibd
- 		file, so that ibbackup can replay it in the
- 		--apply-log phase. We use a dummy mtr and the familiar
-@@ -2644,7 +2665,7 @@
- 
- 	mutex_exit(&fil_system->mutex);
- 
--#ifndef UNIV_HOTBACKUP
-+#ifdef UNDEFINED
- 	if (success) {
- 		mtr_t		mtr;
- 
-@@ -2835,7 +2856,7 @@
- 
- 	fil_node_create(path, size, space_id, FALSE);
- 
--#ifndef UNIV_HOTBACKUP
-+#ifdef UNDEFINED
- 	{
- 		mtr_t		mtr;
- 
-@@ -3090,19 +3111,97 @@
- 		      "InnoDB: open the tablespace file ", stderr);
- 		ut_print_filename(stderr, filepath);
- 		fputs("!\n"
--		      "InnoDB: Have you moved InnoDB .ibd files around"
--		      " without using the\n"
--		      "InnoDB: commands DISCARD TABLESPACE and"
--		      " IMPORT TABLESPACE?\n"
--		      "InnoDB: It is also possible that this is"
--		      " a temporary table #sql...,\n"
--		      "InnoDB: and MySQL removed the .ibd file for this.\n"
--		      "InnoDB: Please refer to\n"
--		      "InnoDB: " REFMAN "innodb-troubleshooting-datadict.html\n"
--		      "InnoDB: for how to resolve the issue.\n", stderr);
-+		      "InnoDB: It will be removed from data dictionary.\n"
-+		      , stderr);
- 
- 		mem_free(filepath);
- 
-+		/* removing from data dictionary */
-+		{
-+			trx_t*		trx;
-+			pars_info_t*	info = NULL;
-+
-+			trx = trx_allocate_for_mysql();
-+
-+			trx->op_info = "removing invalid table from data dictionary";
-+
-+			info = pars_info_create();
-+
-+			pars_info_add_str_literal(info, "table_name", name);
-+
-+			que_eval_sql(info,
-+			   "PROCEDURE DROP_TABLE_PROC () IS\n"
-+			   "sys_foreign_id CHAR;\n"
-+			   "table_id CHAR;\n"
-+			   "index_id CHAR;\n"
-+			   "foreign_id CHAR;\n"
-+			   "found INT;\n"
-+			   "BEGIN\n"
-+			   "SELECT ID INTO table_id\n"
-+			   "FROM SYS_TABLES\n"
-+			   "WHERE NAME = :table_name\n"
-+			   "LOCK IN SHARE MODE;\n"
-+			   "IF (SQL % NOTFOUND) THEN\n"
-+			   "       RETURN;\n"
-+			   "END IF;\n"
-+			   "found := 1;\n"
-+			   "SELECT ID INTO sys_foreign_id\n"
-+			   "FROM SYS_TABLES\n"
-+			   "WHERE NAME = 'SYS_FOREIGN'\n"
-+			   "LOCK IN SHARE MODE;\n"
-+			   "IF (SQL % NOTFOUND) THEN\n"
-+			   "       found := 0;\n"
-+			   "END IF;\n"
-+			   "IF (:table_name = 'SYS_FOREIGN') THEN\n"
-+			   "       found := 0;\n"
-+			   "END IF;\n"
-+			   "IF (:table_name = 'SYS_FOREIGN_COLS') THEN\n"
-+			   "       found := 0;\n"
-+			   "END IF;\n"
-+			   "WHILE found = 1 LOOP\n"
-+			   "       SELECT ID INTO foreign_id\n"
-+			   "       FROM SYS_FOREIGN\n"
-+			   "       WHERE FOR_NAME = :table_name\n"
-+			   "               AND TO_BINARY(FOR_NAME)\n"
-+			   "                 = TO_BINARY(:table_name)\n"
-+			   "               LOCK IN SHARE MODE;\n"
-+			   "       IF (SQL % NOTFOUND) THEN\n"
-+			   "               found := 0;\n"
-+			   "       ELSE\n"
-+			   "               DELETE FROM SYS_FOREIGN_COLS\n"
-+			   "               WHERE ID = foreign_id;\n"
-+			   "               DELETE FROM SYS_FOREIGN\n"
-+			   "               WHERE ID = foreign_id;\n"
-+			   "       END IF;\n"
-+			   "END LOOP;\n"
-+			   "found := 1;\n"
-+			   "WHILE found = 1 LOOP\n"
-+			   "       SELECT ID INTO index_id\n"
-+			   "       FROM SYS_INDEXES\n"
-+			   "       WHERE TABLE_ID = table_id\n"
-+			   "       LOCK IN SHARE MODE;\n"
-+			   "       IF (SQL % NOTFOUND) THEN\n"
-+			   "               found := 0;\n"
-+			   "       ELSE\n"
-+			   "               DELETE FROM SYS_FIELDS\n"
-+			   "               WHERE INDEX_ID = index_id;\n"
-+			   "               DELETE FROM SYS_INDEXES\n"
-+			   "               WHERE ID = index_id\n"
-+			   "               AND TABLE_ID = table_id;\n"
-+			   "       END IF;\n"
-+			   "END LOOP;\n"
-+			   "DELETE FROM SYS_COLUMNS\n"
-+			   "WHERE TABLE_ID = table_id;\n"
-+			   "DELETE FROM SYS_TABLES\n"
-+			   "WHERE ID = table_id;\n"
-+			   "END;\n"
-+			   , FALSE, trx);
-+
-+			trx_commit_for_mysql(trx);
-+
-+			trx_free_for_mysql(trx);
-+		}
-+
- 		return(FALSE);
- 	}
- 
-@@ -3334,7 +3433,7 @@
- 	cannot be ok. */
- 
- 	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
--#ifndef UNIV_HOTBACKUP
-+#ifdef UNDEFINED
- 	if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
- 		fprintf(stderr,
- 			"InnoDB: Error: the size of single-table tablespace"
-@@ -3475,7 +3574,7 @@
- idea is to read as much good data as we can and jump over bad data.
- @return 0 if ok, -1 if error even after the retries, 1 if at the end
- of the directory */
--static
-+//static
- int
- fil_file_readdir_next_file(
- /*=======================*/
-@@ -3774,15 +3873,97 @@
- 				"InnoDB: in InnoDB data dictionary"
- 				" has tablespace id %lu,\n"
- 				"InnoDB: but tablespace with that id"
--				" or name does not exist. Have\n"
--				"InnoDB: you deleted or moved .ibd files?\n"
--				"InnoDB: This may also be a table created with"
--				" CREATE TEMPORARY TABLE\n"
--				"InnoDB: whose .ibd and .frm files"
--				" MySQL automatically removed, but the\n"
--				"InnoDB: table still exists in the"
--				" InnoDB internal data dictionary.\n",
-+				" or name does not exist. It will be removed from data dictionary.\n"
-+				,
- 				(ulong) id);
-+			mem_free(path);
-+			mutex_exit(&fil_system->mutex);
-+			/* removing from data dictionary */
-+			{
-+				trx_t*		trx;
-+				pars_info_t*	info = NULL;
-+
-+				trx = trx_allocate_for_mysql();
-+
-+				trx->op_info = "removing invalid table from data dictionary";
-+
-+				info = pars_info_create();
-+
-+				pars_info_add_str_literal(info, "table_name", name);
-+
-+				que_eval_sql(info,
-+				   "PROCEDURE DROP_TABLE_PROC () IS\n"
-+				   "sys_foreign_id CHAR;\n"
-+				   "table_id CHAR;\n"
-+				   "index_id CHAR;\n"
-+				   "foreign_id CHAR;\n"
-+				   "found INT;\n"
-+				   "BEGIN\n"
-+				   "SELECT ID INTO table_id\n"
-+				   "FROM SYS_TABLES\n"
-+				   "WHERE NAME = :table_name\n"
-+				   "LOCK IN SHARE MODE;\n"
-+				   "IF (SQL % NOTFOUND) THEN\n"
-+				   "       RETURN;\n"
-+				   "END IF;\n"
-+				   "found := 1;\n"
-+				   "SELECT ID INTO sys_foreign_id\n"
-+				   "FROM SYS_TABLES\n"
-+				   "WHERE NAME = 'SYS_FOREIGN'\n"
-+				   "LOCK IN SHARE MODE;\n"
-+				   "IF (SQL % NOTFOUND) THEN\n"
-+				   "       found := 0;\n"
-+				   "END IF;\n"
-+				   "IF (:table_name = 'SYS_FOREIGN') THEN\n"
-+				   "       found := 0;\n"
-+				   "END IF;\n"
-+				   "IF (:table_name = 'SYS_FOREIGN_COLS') THEN\n"
-+				   "       found := 0;\n"
-+				   "END IF;\n"
-+				   "WHILE found = 1 LOOP\n"
-+				   "       SELECT ID INTO foreign_id\n"
-+				   "       FROM SYS_FOREIGN\n"
-+				   "       WHERE FOR_NAME = :table_name\n"
-+				   "               AND TO_BINARY(FOR_NAME)\n"
-+				   "                 = TO_BINARY(:table_name)\n"
-+				   "               LOCK IN SHARE MODE;\n"
-+				   "       IF (SQL % NOTFOUND) THEN\n"
-+				   "               found := 0;\n"
-+				   "       ELSE\n"
-+				   "               DELETE FROM SYS_FOREIGN_COLS\n"
-+				   "               WHERE ID = foreign_id;\n"
-+				   "               DELETE FROM SYS_FOREIGN\n"
-+				   "               WHERE ID = foreign_id;\n"
-+				   "       END IF;\n"
-+				   "END LOOP;\n"
-+				   "found := 1;\n"
-+				   "WHILE found = 1 LOOP\n"
-+				   "       SELECT ID INTO index_id\n"
-+				   "       FROM SYS_INDEXES\n"
-+				   "       WHERE TABLE_ID = table_id\n"
-+				   "       LOCK IN SHARE MODE;\n"
-+				   "       IF (SQL % NOTFOUND) THEN\n"
-+				   "               found := 0;\n"
-+				   "       ELSE\n"
-+				   "               DELETE FROM SYS_FIELDS\n"
-+				   "               WHERE INDEX_ID = index_id;\n"
-+				   "               DELETE FROM SYS_INDEXES\n"
-+				   "               WHERE ID = index_id\n"
-+				   "               AND TABLE_ID = table_id;\n"
-+				   "       END IF;\n"
-+				   "END LOOP;\n"
-+				   "DELETE FROM SYS_COLUMNS\n"
-+				   "WHERE TABLE_ID = table_id;\n"
-+				   "DELETE FROM SYS_TABLES\n"
-+				   "WHERE ID = table_id;\n"
-+				   "END;\n"
-+				   , FALSE, trx);
-+
-+				trx_commit_for_mysql(trx);
-+
-+				trx_free_for_mysql(trx);
-+			}
-+			return(FALSE);
- 		} else {
- 			ut_print_timestamp(stderr);
- 			fputs("  InnoDB: Error: table ", stderr);
-@@ -4171,7 +4352,7 @@
- off the LRU list if it is in the LRU list. The caller must hold the fil_sys
- mutex. */
- static
--void
-+ulint
- fil_node_prepare_for_io(
- /*====================*/
- 	fil_node_t*	node,	/*!< in: file node */
-@@ -4191,10 +4372,13 @@
- 	}
- 
- 	if (node->open == FALSE) {
-+		ulint	err;
- 		/* File is closed: open it */
- 		ut_a(node->n_pending == 0);
- 
--		fil_node_open_file(node, system, space);
-+		err = fil_node_open_file(node, system, space);
-+		if (err)
-+			return(err);
- 	}
- 
- 	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4207,6 +4391,8 @@
- 	}
- 
- 	node->n_pending++;
-+
-+	return(0);
- }
- 
- /********************************************************************//**
-@@ -4391,6 +4577,16 @@
- 
- 	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
- 
-+	if (space->size <= block_offset) {
-+		ulint	actual_size;
-+
-+		mutex_exit(&fil_system->mutex);
-+		fil_extend_space_to_desired_size(&actual_size, space->id,
-+						 ((block_offset + 1) / 64 + 1) * 64);
-+		mutex_enter(&fil_system->mutex);
-+		/* should retry? but it may safe for xtrabackup for now. */
-+	}
-+
- 	node = UT_LIST_GET_FIRST(space->chain);
- 
- 	for (;;) {
---- a/storage/innobase/ibuf/ibuf0ibuf.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/ibuf/ibuf0ibuf.c	2011-03-11 07:20:18.000000000 -0800
-@@ -1160,6 +1160,9 @@
- 	ut_ad(!recv_no_ibuf_operations);
- 	ut_ad(x_latch || mtr == NULL);
- 
-+	if (srv_fake_write)
-+		return(FALSE);
-+
- 	if (ibuf_fixed_addr_page(space, zip_size, page_no)) {
- 
- 		return(TRUE);
-@@ -2691,6 +2694,9 @@
- 	ulint	n_bytes;
- 	ulint	n_pag2;
- 
-+	if (srv_fake_write)
-+		return(0);
-+
- 	while (sum_pages < n_pages) {
- 		n_bytes = ibuf_contract_ext(&n_pag2, sync);
- 
---- a/storage/innobase/include/srv0srv.h	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/include/srv0srv.h	2011-03-11 07:20:18.000000000 -0800
-@@ -211,6 +211,10 @@
- extern ulong	srv_max_purge_lag;
- 
- extern ulong	srv_replication_delay;
-+
-+extern ibool	srv_read_only;
-+extern ibool	srv_fake_write;
-+extern ibool	srv_apply_log_only;
- /*-------------------------------------------*/
- 
- extern ulint	srv_n_rows_inserted;
---- a/storage/innobase/include/srv0start.h	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/include/srv0start.h	2011-03-11 07:20:18.000000000 -0800
-@@ -91,6 +91,8 @@
- /** Log sequence number immediately after startup */
- extern	ib_uint64_t	srv_start_lsn;
- 
-+extern	ib_uint64_t	srv_oldest_lsn;
-+
- #ifdef HAVE_DARWIN_THREADS
- /** TRUE if the F_FULLFSYNC option is available */
- extern	ibool	srv_have_fullfsync;
---- a/storage/innobase/log/log0log.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/log/log0log.c	2011-03-11 07:20:18.000000000 -0800
-@@ -576,7 +576,9 @@
- 
- 	offset = (gr_lsn_size_offset + difference) % group_size;
- 
-+	if (sizeof(ulint) == 4) {
- 	ut_a(offset < (((ib_int64_t) 1) << 32)); /* offset must be < 4 GB */
-+	}
- 
- 	/* fprintf(stderr,
- 	"Offset is %lu gr_lsn_offset is %lu difference is %lu\n",
-@@ -1354,7 +1356,7 @@
- #endif /* UNIV_DEBUG */
- 	ulint		unlock;
- 
--	if (recv_no_ibuf_operations) {
-+	if (recv_no_ibuf_operations || srv_fake_write) {
- 		/* Recovery is running and no operations on the log files are
- 		allowed yet (the variable name .._no_ibuf_.. is misleading) */
- 
-@@ -3114,6 +3116,7 @@
- 	for the 'very fast' shutdown, because the InnoDB layer may have
- 	committed or prepared transactions and we don't want to lose them. */
- 
-+	if (!srv_apply_log_only) {
- 	if (trx_n_mysql_transactions > 0
- 	    || UT_LIST_GET_LEN(trx_sys->trx_list) > 0) {
- 
-@@ -3121,6 +3124,7 @@
- 
- 		goto loop;
- 	}
-+	}
- 
- 	if (srv_fast_shutdown == 2) {
- 		/* In this fastest shutdown we do not flush the buffer pool:
---- a/storage/innobase/log/log0recv.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/log/log0recv.c	2011-03-11 07:20:18.000000000 -0800
-@@ -42,27 +42,27 @@
- #include "trx0undo.h"
- #include "trx0rec.h"
- #include "fil0fil.h"
--#ifndef UNIV_HOTBACKUP
-+//#ifndef UNIV_HOTBACKUP
- # include "buf0rea.h"
- # include "srv0srv.h"
- # include "srv0start.h"
- # include "trx0roll.h"
- # include "row0merge.h"
- # include "sync0sync.h"
--#else /* !UNIV_HOTBACKUP */
-+//#else /* !UNIV_HOTBACKUP */
- 
- /** 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
- directories which were not included */
- UNIV_INTERN ibool	recv_replay_file_ops	= TRUE;
--#endif /* !UNIV_HOTBACKUP */
-+//#endif /* !UNIV_HOTBACKUP */
- 
- /** Log records are stored in the hash table in chunks at most of this size;
- this must be less than UNIV_PAGE_SIZE as it is stored in the buffer pool */
- #define RECV_DATA_BLOCK_SIZE	(MEM_MAX_ALLOC_IN_BUF - sizeof(recv_data_t))
- 
- /** Read-ahead area in applying log records to file pages */
--#define RECV_READ_AHEAD_AREA	32
-+#define RECV_READ_AHEAD_AREA	128
- 
- /** The recovery system */
- UNIV_INTERN recv_sys_t*	recv_sys = NULL;
-@@ -259,7 +259,7 @@
- {
- 	recv_lsn_checks_on = FALSE;
- 
--	recv_n_pool_free_frames = 256;
-+	recv_n_pool_free_frames = 1024;
- 
- 	recv_recovery_on = FALSE;
- 
-@@ -285,7 +285,7 @@
- 
- 	recv_max_parsed_page_no	= 0;
- 
--	recv_n_pool_free_frames	= 256;
-+	recv_n_pool_free_frames	= 1024;
- 
- 	recv_max_page_lsn = 0;
- }
-@@ -623,7 +623,7 @@
- /***********************************************************************//**
- Checks the consistency of the checkpoint info
- @return	TRUE if ok */
--static
-+//static
- ibool
- recv_check_cp_is_consistent(
- /*========================*/
-@@ -653,7 +653,7 @@
- /********************************************************//**
- Looks for the maximum consistent checkpoint from the log groups.
- @return	error code or DB_SUCCESS */
--static
-+//static
- ulint
- recv_find_max_checkpoint(
- /*=====================*/
-@@ -828,7 +828,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 */
--static
-+//static
- ibool
- log_block_checksum_is_ok_or_old_format(
- /*===================================*/
-@@ -1496,6 +1496,7 @@
- 					     buf_block_get_page_no(block));
- 
- 	if ((recv_addr == NULL)
-+	    || (recv_addr->state == RECV_BEING_READ && !just_read_in)
- 	    || (recv_addr->state == RECV_BEING_PROCESSED)
- 	    || (recv_addr->state == RECV_PROCESSED)) {
- 
-@@ -2308,7 +2309,7 @@
- 			   || type == MLOG_FILE_RENAME
- 			   || type == MLOG_FILE_DELETE) {
- 			ut_a(space);
--#ifdef UNIV_HOTBACKUP
-+//#ifdef UNIV_HOTBACKUP
- 			if (recv_replay_file_ops) {
- 
- 				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2331,7 +2332,7 @@
- 					ut_error;
- 				}
- 			}
--#endif
-+//#endif
- 			/* In normal mysqld crash recovery we do not try to
- 			replay file operations */
- #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2748,8 +2749,11 @@
- 
- 			fprintf(stderr,
- 				"InnoDB: Doing recovery: scanned up to"
--				" log sequence number %llu\n",
--				*group_scanned_lsn);
-+				" log sequence number %llu (%lu %%)\n",
-+				*group_scanned_lsn,
-+				(ulong) (*group_scanned_lsn - srv_oldest_lsn)
-+				/ (8 * log_group_get_capacity(UT_LIST_GET_FIRST(log_sys->log_groups))/900)
-+			);
- 		}
- 	}
- 
-@@ -2863,12 +2867,14 @@
- 
- 	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
- 
-+#ifdef UNDEFINED
- 		fprintf(stderr,
- 			"InnoDB: Restoring possible"
- 			" half-written data pages from"
- 			" the doublewrite\n"
- 			"InnoDB: buffer...\n");
--		trx_sys_doublewrite_init_or_restore_pages(TRUE);
-+#endif
-+		trx_sys_doublewrite_init_or_restore_pages(FALSE);
- 	}
- }
- 
-@@ -3018,6 +3024,7 @@
- 		recv_sys->recovered_lsn = checkpoint_lsn;
- 
- 		srv_start_lsn = checkpoint_lsn;
-+		srv_oldest_lsn = checkpoint_lsn;
- 	}
- 
- 	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3299,6 +3306,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. */
-+	if (!srv_apply_log_only)
- 	trx_rollback_or_clean_recovered(FALSE);
- }
- 
---- a/storage/innobase/os/os0file.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/os/os0file.c	2011-03-11 07:20:18.000000000 -0800
-@@ -656,7 +656,7 @@
- }
- 
- #undef USE_FILE_LOCK
--#define USE_FILE_LOCK
-+//#define USE_FILE_LOCK
- #if defined(UNIV_HOTBACKUP) || defined(__WIN__)
- /* InnoDB Hot Backup does not lock the data files.
-  * On Windows, mandatory locking is used.
-@@ -1456,8 +1456,9 @@
- 		attributes = 0;
- 		ut_error;
- 	}
--
-+	share_mode |= FILE_SHARE_WRITE; /* Why? */
- 	file = CreateFile((LPCTSTR) name,
-+			  (srv_read_only && create_flag == OPEN_EXISTING) ? GENERIC_READ :
- 			  GENERIC_READ | GENERIC_WRITE, /* read and write
- 							access */
- 			  share_mode,	/* File can be read also by other
-@@ -1516,7 +1517,11 @@
- 	if (create_mode == OS_FILE_OPEN || create_mode == OS_FILE_OPEN_RAW
- 	    || create_mode == OS_FILE_OPEN_RETRY) {
- 		mode_str = "OPEN";
--		create_flag = O_RDWR;
-+		if (srv_read_only) {
-+			create_flag = O_RDONLY;
-+		} else {
-+			create_flag = O_RDWR;
-+		}
- 	} else if (create_mode == OS_FILE_CREATE) {
- 		mode_str = "CREATE";
- 		create_flag = O_RDWR | O_CREAT | O_EXCL;
-@@ -2694,6 +2699,9 @@
- 	ut_a((offset & 0xFFFFFFFFUL) == offset);
- 	ut_a((n & 0xFFFFFFFFUL) == n);
- 
-+	if (srv_fake_write)
-+		return(TRUE);
-+
- 	os_n_file_writes++;
- 
- 	ut_ad(file);
-@@ -2818,6 +2826,9 @@
- #else
- 	ssize_t	ret;
- 
-+	if (srv_fake_write)
-+		return(TRUE);
-+
- 	ret = os_file_pwrite(file, buf, n, offset, offset_high);
- 
- 	if ((ulint)ret == n) {
---- a/storage/innobase/os/os0thread.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/os/os0thread.c	2011-03-11 07:20:18.000000000 -0800
-@@ -266,12 +266,17 @@
- #ifdef __WIN__
- 	Sleep((DWORD) tm / 1000);
- #else
-+	/* select() simetimes hang up from xtrabackup */
-+	/* change to use usleep() for now */
-+	usleep(tm);
-+/*
- 	struct timeval	t;
- 
- 	t.tv_sec = tm / 1000000;
- 	t.tv_usec = tm % 1000000;
- 
- 	select(0, NULL, NULL, NULL, &t);
-+*/
- #endif
- }
- 
---- a/storage/innobase/row/row0merge.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/row/row0merge.c	2011-03-11 07:20:18.000000000 -0800
-@@ -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,10 @@
- 		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);
-+				fprintf(stderr, "InnoDB: Error: row_merge_blocks() is called.\n");
-+				ut_error;
- 				mem_heap_free(heap);
- 				return(DB_DUPLICATE_KEY);
- 			}
-@@ -2604,7 +2608,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	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/srv/srv0srv.c	2011-03-11 07:20:18.000000000 -0800
-@@ -396,6 +396,9 @@
- 
- UNIV_INTERN ulong	srv_replication_delay		= 0;
- 
-+UNIV_INTERN ibool	srv_read_only   = FALSE;
-+UNIV_INTERN ibool	srv_fake_write  = FALSE;
-+UNIV_INTERN ibool	srv_apply_log_only = FALSE;
- /*-------------------------------------------*/
- UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
- UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -1094,7 +1097,7 @@
- 	}
- 
- 	/* Initialize some INFORMATION SCHEMA internal structures */
--	trx_i_s_cache_init(trx_i_s_cache);
-+	//trx_i_s_cache_init(trx_i_s_cache);
- }
- 
- /*********************************************************************//**
-@@ -1105,6 +1108,7 @@
- /*==========*/
- {
- 	os_fast_mutex_free(&srv_conc_mutex);
-+#ifdef UNDEFINED
- 	mem_free(srv_conc_slots);
- 	srv_conc_slots = NULL;
- 
-@@ -1118,6 +1122,7 @@
- 	srv_mysql_table = NULL;
- 
- 	trx_i_s_cache_free(trx_i_s_cache);
-+#endif
- }
- 
- /*********************************************************************//**
-@@ -1713,7 +1718,7 @@
- 		}
- 
- 		/* Record the lock wait time for this thread */
--		thd_set_lock_wait_time(trx->mysql_thd, diff_time);
-+		//thd_set_lock_wait_time(trx->mysql_thd, diff_time);
- 	}
- 
- 	if (trx->was_chosen_as_deadlock_victim) {
---- a/storage/innobase/srv/srv0start.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/srv/srv0start.c	2011-03-11 07:35:47.000000000 -0800
-@@ -94,6 +94,8 @@
- /** Log sequence number at shutdown */
- UNIV_INTERN ib_uint64_t	srv_shutdown_lsn;
- 
-+UNIV_INTERN ib_uint64_t srv_oldest_lsn;
-+
- #ifdef HAVE_DARWIN_THREADS
- # include <sys/utsname.h>
- /** TRUE if the F_FULLFSYNC option is available */
-@@ -549,7 +551,7 @@
- /*********************************************************************//**
- Creates or opens the log files and closes them.
- @return	DB_SUCCESS or error code */
--static
-+//static
- ulint
- open_or_create_log_file(
- /*====================*/
-@@ -709,7 +711,7 @@
- /*********************************************************************//**
- Creates or opens database data files and closes them.
- @return	DB_SUCCESS or error code */
--static
-+//static
- ulint
- open_or_create_data_files(
- /*======================*/
-@@ -1411,7 +1413,7 @@
- 	}
- #endif /* UNIV_LOG_ARCHIVE */
- 
--	if (srv_n_log_files * srv_log_file_size >= 262144) {
-+	if (sizeof(ulint) == 4 && srv_n_log_files * srv_log_file_size >= 262144) {
- 		ut_print_timestamp(stderr);
- 		fprintf(stderr,
- 			" InnoDB: Error: combined size of log files"
-@@ -1706,6 +1708,10 @@
- 		are initialized in trx_sys_init_at_db_start(). */
- 
- 		recv_recovery_from_checkpoint_finish();
-+
-+		if (srv_apply_log_only)
-+			goto skip_processes;
-+
- 		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
-@@ -1865,6 +1871,17 @@
- 	if (!srv_auto_extend_last_data_file
- 	    && sum_of_data_file_sizes != tablespace_size_in_header) {
- 
-+		/* extend table space size aligning with header */
-+		ulint	actual_size;
-+		fil_extend_space_to_desired_size(&actual_size, 0, tablespace_size_in_header);
-+		if (actual_size < tablespace_size_in_header) {
-+			fprintf(stderr,
-+"InnoDB: Warning: To extend tablespace size aligning with header seems to be failed.\n"
-+"InnoDB: The acutual size %lu must be larger than %lu.\n",
-+				(ulong) actual_size,
-+				(ulong) tablespace_size_in_header);
-+		}
-+#ifdef UNDEFINED
- 		ut_print_timestamp(stderr);
- 		fprintf(stderr,
- 			" InnoDB: Error: tablespace size"
-@@ -1944,6 +1961,7 @@
- 
- 			return(DB_ERROR);
- 		}
-+#endif
- 	}
- 
- 	/* Check that os_fast_mutexes work as expected */
-@@ -2056,6 +2074,7 @@
- 		ibuf_update_max_tablespace_id();
- 	}
- 
-+skip_processes:
- 	srv_file_per_table = srv_file_per_table_original_value;
- 
- 	srv_was_started = TRUE;
---- a/storage/innobase/trx/trx0purge.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/trx/trx0purge.c	2011-03-11 07:20:18.000000000 -0800
-@@ -1100,6 +1100,9 @@
- 	/*	que_thr_t*	thr2; */
- 	ulint		old_pages_handled;
- 
-+	if (srv_fake_write)
-+		return(0);
-+
- 	mutex_enter(&(purge_sys->mutex));
- 
- 	if (purge_sys->trx->n_active_thrs > 0) {
---- a/storage/innobase/trx/trx0rseg.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/trx/trx0rseg.c	2011-03-11 07:20:18.000000000 -0800
-@@ -140,9 +140,11 @@
- 
- 	mutex_free(&rseg->mutex);
- 
-+	if (!srv_apply_log_only) {
- 	/* There can't be any active transactions. */
- 	ut_a(UT_LIST_GET_LEN(rseg->update_undo_list) == 0);
- 	ut_a(UT_LIST_GET_LEN(rseg->insert_undo_list) == 0);
-+	}
- 
- 	undo = UT_LIST_GET_FIRST(rseg->update_undo_cached);
- 
---- a/storage/innobase/trx/trx0sys.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/trx/trx0sys.c	2011-03-11 07:20:18.000000000 -0800
-@@ -1641,10 +1641,12 @@
- 		UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
- 	}
- 
-+	if (!srv_apply_log_only) {
- 	ut_a(UT_LIST_GET_LEN(trx_sys->trx_list) == 0);
- 	ut_a(UT_LIST_GET_LEN(trx_sys->rseg_list) == 0);
- 	ut_a(UT_LIST_GET_LEN(trx_sys->view_list) == 0);
- 	ut_a(UT_LIST_GET_LEN(trx_sys->mysql_trx_list) == 0);
-+	}
- 
- 	mem_free(trx_sys);
- 
---- a/storage/innobase/trx/trx0trx.c	2011-01-19 14:37:08.000000000 -0800
-+++ b/storage/innobase/trx/trx0trx.c	2011-03-11 07:20:18.000000000 -0800
-@@ -469,8 +469,8 @@
- 						(ullint) trx->id);
- 
- 					if (srv_force_recovery == 0) {
--
--						trx->conc_state = TRX_PREPARED;
-+						/* xtrabackup should rollback it */
-+						trx->conc_state = TRX_ACTIVE;
- 					} else {
- 						fprintf(stderr,
- 							"InnoDB: Since"
-@@ -544,9 +544,9 @@
- 							(ullint) trx->id);
- 
- 						if (srv_force_recovery == 0) {
--
-+							/* xtrabackup should rollback it */
- 							trx->conc_state
--								= TRX_PREPARED;
-+								= TRX_ACTIVE;
- 						} else {
- 							fprintf(stderr,
- 								"InnoDB: Since"

=== removed file 'fix_innodb_for_backup_5.1_plugin.patch'
--- fix_innodb_for_backup_5.1_plugin.patch	2011-03-13 15:52:22 +0000
+++ fix_innodb_for_backup_5.1_plugin.patch	1970-01-01 00:00:00 +0000
@@ -1,1137 +0,0 @@
---- a/storage/innodb_plugin/btr/btr0btr.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/btr/btr0btr.c	2011-03-12 06:28:08.000000000 -0800
-@@ -120,7 +120,7 @@
- /**************************************************************//**
- Gets the root node of a tree and x-latches it.
- @return	root page, x-latched */
--static
-+//static
- buf_block_t*
- btr_root_block_get(
- /*===============*/
-@@ -566,7 +566,7 @@
- /************************************************************//**
- Returns the child page of a node pointer and x-latches it.
- @return	child page, x-latched */
--static
-+//static
- buf_block_t*
- btr_node_ptr_get_child(
- /*===================*/
---- a/storage/innodb_plugin/buf/buf0buf.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/buf/buf0buf.c	2011-03-12 06:28:08.000000000 -0800
-@@ -358,7 +358,7 @@
- 		return(TRUE);
- 	}
- 
--#ifndef UNIV_HOTBACKUP
-+#ifdef UNDEFINED
- 	if (recv_lsn_checks_on) {
- 		ib_uint64_t	current_lsn;
- 
-@@ -3257,7 +3257,7 @@
- 			recv_recover_page(TRUE, (buf_block_t*) bpage);
- 		}
- 
--		if (uncompressed && !recv_no_ibuf_operations) {
-+		if (uncompressed && !recv_no_ibuf_operations && !srv_fake_write) {
- 			ibuf_merge_or_delete_for_page(
- 				(buf_block_t*) bpage, bpage->space,
- 				bpage->offset, buf_page_get_zip_size(bpage),
---- a/storage/innodb_plugin/buf/buf0rea.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/buf/buf0rea.c	2011-03-12 06:28:08.000000000 -0800
-@@ -120,6 +120,45 @@
- 	bpage = buf_page_init_for_read(err, mode, space, zip_size, unzip,
- 				       tablespace_version, offset);
- 	if (bpage == NULL) {
-+		if (recv_recovery_is_on() && *err == DB_TABLESPACE_DELETED) {
-+			/* hashed log recs must be treated here */
-+			recv_addr_t*    recv_addr;
-+
-+			mutex_enter(&(recv_sys->mutex));
-+
-+			if (recv_sys->apply_log_recs == FALSE) {
-+				mutex_exit(&(recv_sys->mutex));
-+				goto not_to_recover;
-+			}
-+
-+			/* recv_get_fil_addr_struct() */
-+			recv_addr = HASH_GET_FIRST(recv_sys->addr_hash,
-+					hash_calc_hash(ut_fold_ulint_pair(space, offset),
-+						recv_sys->addr_hash));
-+			while (recv_addr) {
-+				if ((recv_addr->space == space)
-+					&& (recv_addr->page_no == offset)) {
-+					break;
-+				}
-+				recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
-+			}
-+
-+			if ((recv_addr == NULL)
-+			    || (recv_addr->state == RECV_BEING_PROCESSED)
-+			    || (recv_addr->state == RECV_PROCESSED)) {
-+				mutex_exit(&(recv_sys->mutex));
-+				goto not_to_recover;
-+			}
-+
-+			fprintf(stderr, " (cannot find space: %lu)", space);
-+			recv_addr->state = RECV_PROCESSED;
-+
-+			ut_a(recv_sys->n_addrs);
-+			recv_sys->n_addrs--;
-+
-+			mutex_exit(&(recv_sys->mutex));
-+		}
-+not_to_recover:
- 
- 		return(0);
- 	}
-@@ -594,6 +633,50 @@
- 		/* It is a single table tablespace and the .ibd file is
- 		missing: do nothing */
- 
-+		/* the log records should be treated here same reason
-+		for http://bugs.mysql.com/bug.php?id=43948 */
-+
-+		if (recv_recovery_is_on()) {
-+			recv_addr_t*    recv_addr;
-+
-+			mutex_enter(&(recv_sys->mutex));
-+
-+			if (recv_sys->apply_log_recs == FALSE) {
-+				mutex_exit(&(recv_sys->mutex));
-+				goto not_to_recover;
-+			}
-+
-+			for (i = 0; i < n_stored; i++) {
-+				/* recv_get_fil_addr_struct() */
-+				recv_addr = HASH_GET_FIRST(recv_sys->addr_hash,
-+						hash_calc_hash(ut_fold_ulint_pair(space, page_nos[i]),
-+							recv_sys->addr_hash));
-+				while (recv_addr) {
-+					if ((recv_addr->space == space)
-+						&& (recv_addr->page_no == page_nos[i])) {
-+						break;
-+					}
-+					recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
-+				}
-+
-+				if ((recv_addr == NULL)
-+				    || (recv_addr->state == RECV_BEING_PROCESSED)
-+				    || (recv_addr->state == RECV_PROCESSED)) {
-+					continue;
-+				}
-+
-+				recv_addr->state = RECV_PROCESSED;
-+
-+				ut_a(recv_sys->n_addrs);
-+				recv_sys->n_addrs--;
-+			}
-+
-+			mutex_exit(&(recv_sys->mutex));
-+
-+			fprintf(stderr, " (cannot find space: %lu)", space);
-+		}
-+not_to_recover:
-+
- 		return;
- 	}
- 
---- a/storage/innodb_plugin/fil/fil0fil.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2011-03-12 06:28:08.000000000 -0800
-@@ -48,6 +48,7 @@
- #else /* !UNIV_HOTBACKUP */
- static ulint srv_data_read, srv_data_written;
- #endif /* !UNIV_HOTBACKUP */
-+#include "pars0pars.h"
- 
- /*
- 		IMPLEMENTATION OF THE TABLESPACE MEMORY CACHE
-@@ -287,7 +288,7 @@
- 
- /** The tablespace memory cache. This variable is NULL before the module is
- initialized. */
--static fil_system_t*	fil_system	= NULL;
-+fil_system_t*	fil_system	= NULL;
- 
- 
- /********************************************************************//**
-@@ -298,7 +299,7 @@
- off the LRU list if it is in the LRU list. The caller must hold the fil_sys
- mutex. */
- static
--void
-+ulint
- fil_node_prepare_for_io(
- /*====================*/
- 	fil_node_t*	node,	/*!< in: file node */
-@@ -623,7 +624,7 @@
- Opens a the file of a node of a tablespace. The caller must own the fil_system
- mutex. */
- static
--void
-+ulint
- fil_node_open_file(
- /*===============*/
- 	fil_node_t*	node,	/*!< in: file node */
-@@ -657,7 +658,14 @@
- 			node->name, OS_FILE_OPEN, OS_FILE_READ_ONLY, &success);
- 		if (!success) {
- 			/* The following call prints an error message */
--			os_file_get_last_error(TRUE);
-+			if (os_file_get_last_error(TRUE) == OS_FILE_NOT_FOUND)
-+			{
-+				ut_print_timestamp(stderr);
-+				fprintf(stderr,
-+					" InnoDB: Warning: cannot open %s\n",
-+					node->name);
-+				return(OS_FILE_NOT_FOUND);
-+			}
- 
- 			ut_print_timestamp(stderr);
- 
-@@ -747,8 +755,8 @@
- 		}
- 
- 		if (size_bytes >= 1024 * 1024) {
--			/* Truncate the size to whole megabytes. */
--			size_bytes = ut_2pow_round(size_bytes, 1024 * 1024);
-+			/* The size should be exact for after applying .delta */
-+			//size_bytes = ut_2pow_round(size_bytes, 1024 * 1024);
- 		}
- 
- 		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
-@@ -793,6 +801,8 @@
- 		/* Put the node to the LRU list */
- 		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
- 	}
-+
-+	return(0);
- }
- 
- /**********************************************************************//**
-@@ -1418,7 +1428,13 @@
- 		the file yet; the following calls will open it and update the
- 		size fields */
- 
--		fil_node_prepare_for_io(node, fil_system, space);
-+		if (fil_node_prepare_for_io(node, fil_system, space))
-+		{
-+			mutex_exit(&fil_system->mutex);
-+
-+			return(0);
-+			
-+		}
- 		fil_node_complete_io(node, fil_system, OS_FILE_READ);
- 	}
- 
-@@ -1470,7 +1486,12 @@
- 		the file yet; the following calls will open it and update the
- 		size fields */
- 
--		fil_node_prepare_for_io(node, fil_system, space);
-+		if (fil_node_prepare_for_io(node, fil_system, space))
-+		{
-+			mutex_exit(&fil_system->mutex);
-+
-+			return(ULINT_UNDEFINED);
-+		}
- 		fil_node_complete_io(node, fil_system, OS_FILE_READ);
- 	}
- 
-@@ -2134,7 +2155,7 @@
- 			if (fil_create_new_single_table_tablespace(
- 				    space_id, name, FALSE, flags,
- 				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
--				ut_error;
-+				//ut_error;
- 			}
- 		}
- 
-@@ -2297,7 +2318,7 @@
- 	}
- 
- 	if (success) {
--#ifndef UNIV_HOTBACKUP
-+#ifdef UNDEFINED
- 		/* Write a log record about the deletion of the .ibd
- 		file, so that ibbackup can replay it in the
- 		--apply-log phase. We use a dummy mtr and the familiar
-@@ -2598,7 +2619,7 @@
- 
- 	mutex_exit(&fil_system->mutex);
- 
--#ifndef UNIV_HOTBACKUP
-+#ifdef UNDEFINED
- 	if (success) {
- 		mtr_t		mtr;
- 
-@@ -2788,7 +2809,7 @@
- 
- 	fil_node_create(path, size, space_id, FALSE);
- 
--#ifndef UNIV_HOTBACKUP
-+#ifdef UNDEFINED
- 	{
- 		mtr_t		mtr;
- 
-@@ -3041,19 +3062,97 @@
- 		      "InnoDB: open the tablespace file ", stderr);
- 		ut_print_filename(stderr, filepath);
- 		fputs("!\n"
--		      "InnoDB: Have you moved InnoDB .ibd files around"
--		      " without using the\n"
--		      "InnoDB: commands DISCARD TABLESPACE and"
--		      " IMPORT TABLESPACE?\n"
--		      "InnoDB: It is also possible that this is"
--		      " a temporary table #sql...,\n"
--		      "InnoDB: and MySQL removed the .ibd file for this.\n"
--		      "InnoDB: Please refer to\n"
--		      "InnoDB: " REFMAN "innodb-troubleshooting-datadict.html\n"
--		      "InnoDB: for how to resolve the issue.\n", stderr);
-+		      "InnoDB: It will be removed from data dictionary.\n"
-+		      , stderr);
- 
- 		mem_free(filepath);
- 
-+		/* removing from data dictionary */
-+		{
-+			trx_t*		trx;
-+			pars_info_t*	info = NULL;
-+
-+			trx = trx_allocate_for_mysql();
-+
-+			trx->op_info = "removing invalid table from data dictionary";
-+
-+			info = pars_info_create();
-+
-+			pars_info_add_str_literal(info, "table_name", name);
-+
-+			que_eval_sql(info,
-+			   "PROCEDURE DROP_TABLE_PROC () IS\n"
-+			   "sys_foreign_id CHAR;\n"
-+			   "table_id CHAR;\n"
-+			   "index_id CHAR;\n"
-+			   "foreign_id CHAR;\n"
-+			   "found INT;\n"
-+			   "BEGIN\n"
-+			   "SELECT ID INTO table_id\n"
-+			   "FROM SYS_TABLES\n"
-+			   "WHERE NAME = :table_name\n"
-+			   "LOCK IN SHARE MODE;\n"
-+			   "IF (SQL % NOTFOUND) THEN\n"
-+			   "       RETURN;\n"
-+			   "END IF;\n"
-+			   "found := 1;\n"
-+			   "SELECT ID INTO sys_foreign_id\n"
-+			   "FROM SYS_TABLES\n"
-+			   "WHERE NAME = 'SYS_FOREIGN'\n"
-+			   "LOCK IN SHARE MODE;\n"
-+			   "IF (SQL % NOTFOUND) THEN\n"
-+			   "       found := 0;\n"
-+			   "END IF;\n"
-+			   "IF (:table_name = 'SYS_FOREIGN') THEN\n"
-+			   "       found := 0;\n"
-+			   "END IF;\n"
-+			   "IF (:table_name = 'SYS_FOREIGN_COLS') THEN\n"
-+			   "       found := 0;\n"
-+			   "END IF;\n"
-+			   "WHILE found = 1 LOOP\n"
-+			   "       SELECT ID INTO foreign_id\n"
-+			   "       FROM SYS_FOREIGN\n"
-+			   "       WHERE FOR_NAME = :table_name\n"
-+			   "               AND TO_BINARY(FOR_NAME)\n"
-+			   "                 = TO_BINARY(:table_name)\n"
-+			   "               LOCK IN SHARE MODE;\n"
-+			   "       IF (SQL % NOTFOUND) THEN\n"
-+			   "               found := 0;\n"
-+			   "       ELSE\n"
-+			   "               DELETE FROM SYS_FOREIGN_COLS\n"
-+			   "               WHERE ID = foreign_id;\n"
-+			   "               DELETE FROM SYS_FOREIGN\n"
-+			   "               WHERE ID = foreign_id;\n"
-+			   "       END IF;\n"
-+			   "END LOOP;\n"
-+			   "found := 1;\n"
-+			   "WHILE found = 1 LOOP\n"
-+			   "       SELECT ID INTO index_id\n"
-+			   "       FROM SYS_INDEXES\n"
-+			   "       WHERE TABLE_ID = table_id\n"
-+			   "       LOCK IN SHARE MODE;\n"
-+			   "       IF (SQL % NOTFOUND) THEN\n"
-+			   "               found := 0;\n"
-+			   "       ELSE\n"
-+			   "               DELETE FROM SYS_FIELDS\n"
-+			   "               WHERE INDEX_ID = index_id;\n"
-+			   "               DELETE FROM SYS_INDEXES\n"
-+			   "               WHERE ID = index_id\n"
-+			   "               AND TABLE_ID = table_id;\n"
-+			   "       END IF;\n"
-+			   "END LOOP;\n"
-+			   "DELETE FROM SYS_COLUMNS\n"
-+			   "WHERE TABLE_ID = table_id;\n"
-+			   "DELETE FROM SYS_TABLES\n"
-+			   "WHERE ID = table_id;\n"
-+			   "END;\n"
-+			   , FALSE, trx);
-+
-+			trx_commit_for_mysql(trx);
-+
-+			trx_free_for_mysql(trx);
-+		}
-+
- 		return(FALSE);
- 	}
- 
-@@ -3284,7 +3383,7 @@
- 	cannot be ok. */
- 
- 	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
--#ifndef UNIV_HOTBACKUP
-+#ifdef UNDEFINED
- 	if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
- 		fprintf(stderr,
- 			"InnoDB: Error: the size of single-table tablespace"
-@@ -3425,7 +3524,7 @@
- idea is to read as much good data as we can and jump over bad data.
- @return 0 if ok, -1 if error even after the retries, 1 if at the end
- of the directory */
--static
-+//static
- int
- fil_file_readdir_next_file(
- /*=======================*/
-@@ -3724,15 +3823,97 @@
- 				"InnoDB: in InnoDB data dictionary"
- 				" has tablespace id %lu,\n"
- 				"InnoDB: but tablespace with that id"
--				" or name does not exist. Have\n"
--				"InnoDB: you deleted or moved .ibd files?\n"
--				"InnoDB: This may also be a table created with"
--				" CREATE TEMPORARY TABLE\n"
--				"InnoDB: whose .ibd and .frm files"
--				" MySQL automatically removed, but the\n"
--				"InnoDB: table still exists in the"
--				" InnoDB internal data dictionary.\n",
-+				" or name does not exist. It will be removed from data dictionary.\n"
-+				,
- 				(ulong) id);
-+			mem_free(path);
-+			mutex_exit(&fil_system->mutex);
-+			/* removing from data dictionary */
-+			{
-+				trx_t*		trx;
-+				pars_info_t*	info = NULL;
-+
-+				trx = trx_allocate_for_mysql();
-+
-+				trx->op_info = "removing invalid table from data dictionary";
-+
-+				info = pars_info_create();
-+
-+				pars_info_add_str_literal(info, "table_name", name);
-+
-+				que_eval_sql(info,
-+				   "PROCEDURE DROP_TABLE_PROC () IS\n"
-+				   "sys_foreign_id CHAR;\n"
-+				   "table_id CHAR;\n"
-+				   "index_id CHAR;\n"
-+				   "foreign_id CHAR;\n"
-+				   "found INT;\n"
-+				   "BEGIN\n"
-+				   "SELECT ID INTO table_id\n"
-+				   "FROM SYS_TABLES\n"
-+				   "WHERE NAME = :table_name\n"
-+				   "LOCK IN SHARE MODE;\n"
-+				   "IF (SQL % NOTFOUND) THEN\n"
-+				   "       RETURN;\n"
-+				   "END IF;\n"
-+				   "found := 1;\n"
-+				   "SELECT ID INTO sys_foreign_id\n"
-+				   "FROM SYS_TABLES\n"
-+				   "WHERE NAME = 'SYS_FOREIGN'\n"
-+				   "LOCK IN SHARE MODE;\n"
-+				   "IF (SQL % NOTFOUND) THEN\n"
-+				   "       found := 0;\n"
-+				   "END IF;\n"
-+				   "IF (:table_name = 'SYS_FOREIGN') THEN\n"
-+				   "       found := 0;\n"
-+				   "END IF;\n"
-+				   "IF (:table_name = 'SYS_FOREIGN_COLS') THEN\n"
-+				   "       found := 0;\n"
-+				   "END IF;\n"
-+				   "WHILE found = 1 LOOP\n"
-+				   "       SELECT ID INTO foreign_id\n"
-+				   "       FROM SYS_FOREIGN\n"
-+				   "       WHERE FOR_NAME = :table_name\n"
-+				   "               AND TO_BINARY(FOR_NAME)\n"
-+				   "                 = TO_BINARY(:table_name)\n"
-+				   "               LOCK IN SHARE MODE;\n"
-+				   "       IF (SQL % NOTFOUND) THEN\n"
-+				   "               found := 0;\n"
-+				   "       ELSE\n"
-+				   "               DELETE FROM SYS_FOREIGN_COLS\n"
-+				   "               WHERE ID = foreign_id;\n"
-+				   "               DELETE FROM SYS_FOREIGN\n"
-+				   "               WHERE ID = foreign_id;\n"
-+				   "       END IF;\n"
-+				   "END LOOP;\n"
-+				   "found := 1;\n"
-+				   "WHILE found = 1 LOOP\n"
-+				   "       SELECT ID INTO index_id\n"
-+				   "       FROM SYS_INDEXES\n"
-+				   "       WHERE TABLE_ID = table_id\n"
-+				   "       LOCK IN SHARE MODE;\n"
-+				   "       IF (SQL % NOTFOUND) THEN\n"
-+				   "               found := 0;\n"
-+				   "       ELSE\n"
-+				   "               DELETE FROM SYS_FIELDS\n"
-+				   "               WHERE INDEX_ID = index_id;\n"
-+				   "               DELETE FROM SYS_INDEXES\n"
-+				   "               WHERE ID = index_id\n"
-+				   "               AND TABLE_ID = table_id;\n"
-+				   "       END IF;\n"
-+				   "END LOOP;\n"
-+				   "DELETE FROM SYS_COLUMNS\n"
-+				   "WHERE TABLE_ID = table_id;\n"
-+				   "DELETE FROM SYS_TABLES\n"
-+				   "WHERE ID = table_id;\n"
-+				   "END;\n"
-+				   , FALSE, trx);
-+
-+				trx_commit_for_mysql(trx);
-+
-+				trx_free_for_mysql(trx);
-+			}
-+			return(FALSE);
- 		} else {
- 			ut_print_timestamp(stderr);
- 			fputs("  InnoDB: Error: table ", stderr);
-@@ -4121,7 +4302,7 @@
- off the LRU list if it is in the LRU list. The caller must hold the fil_sys
- mutex. */
- static
--void
-+ulint
- fil_node_prepare_for_io(
- /*====================*/
- 	fil_node_t*	node,	/*!< in: file node */
-@@ -4141,10 +4322,13 @@
- 	}
- 
- 	if (node->open == FALSE) {
-+		ulint	err;
- 		/* File is closed: open it */
- 		ut_a(node->n_pending == 0);
- 
--		fil_node_open_file(node, system, space);
-+		err = fil_node_open_file(node, system, space);
-+		if (err)
-+			return(err);
- 	}
- 
- 	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4157,6 +4341,8 @@
- 	}
- 
- 	node->n_pending++;
-+
-+	return(0);
- }
- 
- /********************************************************************//**
-@@ -4341,6 +4527,16 @@
- 
- 	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
- 
-+	if (space->size <= block_offset) {
-+		ulint	actual_size;
-+
-+		mutex_exit(&fil_system->mutex);
-+		fil_extend_space_to_desired_size(&actual_size, space->id,
-+						 ((block_offset + 1) / 64 + 1) * 64);
-+		mutex_enter(&fil_system->mutex);
-+		/* should retry? but it may safe for xtrabackup for now. */
-+	}
-+
- 	node = UT_LIST_GET_FIRST(space->chain);
- 
- 	for (;;) {
---- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/ibuf/ibuf0ibuf.c	2011-03-12 06:28:08.000000000 -0800
-@@ -1061,6 +1061,9 @@
- 
- 	ut_ad(!recv_no_ibuf_operations);
- 
-+	if (srv_fake_write)
-+		return(FALSE);
-+
- 	if (ibuf_fixed_addr_page(space, zip_size, page_no)) {
- 
- 		return(TRUE);
-@@ -2277,6 +2280,9 @@
- 	ulint	n_bytes;
- 	ulint	n_pag2;
- 
-+	if (srv_fake_write)
-+		return(0);
-+
- 	while (sum_pages < n_pages) {
- 		n_bytes = ibuf_contract_ext(&n_pag2, sync);
- 
---- a/storage/innodb_plugin/include/srv0srv.h	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/include/srv0srv.h	2011-03-12 06:28:08.000000000 -0800
-@@ -196,6 +196,10 @@
- extern ulong	srv_max_purge_lag;
- 
- extern ulong	srv_replication_delay;
-+
-+extern ibool	srv_read_only;
-+extern ibool	srv_fake_write;
-+extern ibool	srv_apply_log_only;
- /*-------------------------------------------*/
- 
- extern ulint	srv_n_rows_inserted;
---- a/storage/innodb_plugin/include/srv0start.h	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/include/srv0start.h	2011-03-12 06:28:08.000000000 -0800
-@@ -91,6 +91,8 @@
- /** Log sequence number immediately after startup */
- extern	ib_uint64_t	srv_start_lsn;
- 
-+extern	ib_uint64_t	srv_oldest_lsn;
-+
- #ifdef __NETWARE__
- void set_panic_flag_for_netware(void);
- #endif
---- a/storage/innodb_plugin/include/ut0byte.ic	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/include/ut0byte.ic	2011-03-12 06:28:08.000000000 -0800
-@@ -168,6 +168,14 @@
- 	dulint	a,	/*!< in: dulint */
- 	ulint	b)	/*!< in: ulint */
- {
-+	if (sizeof(ulint) != 4) {
-+		ulint	b_h;
-+
-+		b_h = b >> 32;
-+		b &= 0xFFFFFFFFUL;
-+		a.high += b_h;
-+	}
-+
- 	if (0xFFFFFFFFUL - b >= a.low) {
- 		a.low += b;
- 
-@@ -191,6 +199,14 @@
- 	dulint	a,	/*!< in: dulint */
- 	ulint	b)	/*!< in: ulint, b <= a */
- {
-+	if (sizeof(ulint) != 4) {
-+		ulint	b_h;
-+
-+		b_h = b >> 32;
-+		b &= 0xFFFFFFFFUL;
-+		a.high -= b_h;
-+	}
-+
- 	if (a.low >= b) {
- 		a.low -= b;
- 
-@@ -235,6 +251,10 @@
- 
- 	ut_ad(diff > a.low);
- 
-+	if (sizeof(ulint) != 4) {
-+		diff += (a.high - b.high - 1) << 32;
-+	}
-+
- 	return(diff);
- }
- 
---- a/storage/innodb_plugin/log/log0log.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/log/log0log.c	2011-03-12 06:28:08.000000000 -0800
-@@ -564,7 +564,9 @@
- 
- 	offset = (gr_lsn_size_offset + difference) % group_size;
- 
-+	if (sizeof(ulint) == 4) {
- 	ut_a(offset < (((ib_int64_t) 1) << 32)); /* offset must be < 4 GB */
-+	}
- 
- 	/* fprintf(stderr,
- 	"Offset is %lu gr_lsn_offset is %lu difference is %lu\n",
-@@ -1336,7 +1338,7 @@
- #endif /* UNIV_DEBUG */
- 	ulint		unlock;
- 
--	if (recv_no_ibuf_operations) {
-+	if (recv_no_ibuf_operations || srv_fake_write) {
- 		/* Recovery is running and no operations on the log files are
- 		allowed yet (the variable name .._no_ibuf_.. is misleading) */
- 
-@@ -3089,6 +3091,7 @@
- 	for the 'very fast' shutdown, because the InnoDB layer may have
- 	committed or prepared transactions and we don't want to lose them. */
- 
-+	if (!srv_apply_log_only) {
- 	if (trx_n_mysql_transactions > 0
- 	    || UT_LIST_GET_LEN(trx_sys->trx_list) > 0) {
- 
-@@ -3096,6 +3099,7 @@
- 
- 		goto loop;
- 	}
-+	}
- 
- 	if (srv_fast_shutdown == 2) {
- 		/* In this fastest shutdown we do not flush the buffer pool:
---- a/storage/innodb_plugin/log/log0recv.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/log/log0recv.c	2011-03-12 06:28:08.000000000 -0800
-@@ -42,27 +42,27 @@
- #include "trx0undo.h"
- #include "trx0rec.h"
- #include "fil0fil.h"
--#ifndef UNIV_HOTBACKUP
-+//#ifndef UNIV_HOTBACKUP
- # include "buf0rea.h"
- # include "srv0srv.h"
- # include "srv0start.h"
- # include "trx0roll.h"
- # include "row0merge.h"
- # include "sync0sync.h"
--#else /* !UNIV_HOTBACKUP */
-+//#else /* !UNIV_HOTBACKUP */
- 
- /** 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
- directories which were not included */
- UNIV_INTERN ibool	recv_replay_file_ops	= TRUE;
--#endif /* !UNIV_HOTBACKUP */
-+//#endif /* !UNIV_HOTBACKUP */
- 
- /** Log records are stored in the hash table in chunks at most of this size;
- this must be less than UNIV_PAGE_SIZE as it is stored in the buffer pool */
- #define RECV_DATA_BLOCK_SIZE	(MEM_MAX_ALLOC_IN_BUF - sizeof(recv_data_t))
- 
- /** Read-ahead area in applying log records to file pages */
--#define RECV_READ_AHEAD_AREA	32
-+#define RECV_READ_AHEAD_AREA	128
- 
- /** The recovery system */
- UNIV_INTERN recv_sys_t*	recv_sys = NULL;
-@@ -251,7 +251,7 @@
- {
- 	recv_lsn_checks_on = FALSE;
- 
--	recv_n_pool_free_frames = 256;
-+	recv_n_pool_free_frames = 1024;
- 
- 	recv_recovery_on = FALSE;
- 
-@@ -277,7 +277,7 @@
- 
- 	recv_max_parsed_page_no	= 0;
- 
--	recv_n_pool_free_frames	= 256;
-+	recv_n_pool_free_frames	= 1024;
- 
- 	recv_max_page_lsn = 0;
- }
-@@ -613,7 +613,7 @@
- /***********************************************************************//**
- Checks the consistency of the checkpoint info
- @return	TRUE if ok */
--static
-+//static
- ibool
- recv_check_cp_is_consistent(
- /*========================*/
-@@ -643,7 +643,7 @@
- /********************************************************//**
- Looks for the maximum consistent checkpoint from the log groups.
- @return	error code or DB_SUCCESS */
--static
-+//static
- ulint
- recv_find_max_checkpoint(
- /*=====================*/
-@@ -818,7 +818,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 */
--static
-+//static
- ibool
- log_block_checksum_is_ok_or_old_format(
- /*===================================*/
-@@ -1486,6 +1486,7 @@
- 					     buf_block_get_page_no(block));
- 
- 	if ((recv_addr == NULL)
-+	    || (recv_addr->state == RECV_BEING_READ && !just_read_in)
- 	    || (recv_addr->state == RECV_BEING_PROCESSED)
- 	    || (recv_addr->state == RECV_PROCESSED)) {
- 
-@@ -2297,7 +2298,7 @@
- 			   || type == MLOG_FILE_RENAME
- 			   || type == MLOG_FILE_DELETE) {
- 			ut_a(space);
--#ifdef UNIV_HOTBACKUP
-+//#ifdef UNIV_HOTBACKUP
- 			if (recv_replay_file_ops) {
- 
- 				/* In ibbackup --apply-log, replay an .ibd file
-@@ -2320,7 +2321,7 @@
- 					ut_error;
- 				}
- 			}
--#endif
-+//#endif
- 			/* In normal mysqld crash recovery we do not try to
- 			replay file operations */
- #ifdef UNIV_LOG_LSN_DEBUG
-@@ -2737,8 +2738,11 @@
- 
- 			fprintf(stderr,
- 				"InnoDB: Doing recovery: scanned up to"
--				" log sequence number %llu\n",
--				*group_scanned_lsn);
-+				" log sequence number %llu (%lu %)\n",
-+				*group_scanned_lsn,
-+				(ulong) (*group_scanned_lsn - srv_oldest_lsn)
-+				/ (8 * log_group_get_capacity(UT_LIST_GET_FIRST(log_sys->log_groups))/900)
-+			);
- 		}
- 	}
- 
-@@ -2850,12 +2854,14 @@
- 
- 	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
- 
-+#ifdef UNDEFINED
- 		fprintf(stderr,
- 			"InnoDB: Restoring possible"
- 			" half-written data pages from"
- 			" the doublewrite\n"
- 			"InnoDB: buffer...\n");
--		trx_sys_doublewrite_init_or_restore_pages(TRUE);
-+#endif
-+		trx_sys_doublewrite_init_or_restore_pages(FALSE);
- 	}
- }
- 
-@@ -3005,6 +3011,7 @@
- 		recv_sys->recovered_lsn = checkpoint_lsn;
- 
- 		srv_start_lsn = checkpoint_lsn;
-+		srv_oldest_lsn = checkpoint_lsn;
- 	}
- 
- 	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
-@@ -3286,6 +3293,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. */
-+	if (!srv_apply_log_only)
- 	trx_rollback_or_clean_recovered(FALSE);
- }
- 
---- a/storage/innodb_plugin/os/os0file.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/os/os0file.c	2011-03-12 06:28:08.000000000 -0800
-@@ -514,7 +514,7 @@
- }
- 
- #undef USE_FILE_LOCK
--#define USE_FILE_LOCK
-+//#define USE_FILE_LOCK
- #if defined(UNIV_HOTBACKUP) || defined(__WIN__) || defined(__NETWARE__)
- /* InnoDB Hot Backup does not lock the data files.
-  * On Windows, mandatory locking is used.
-@@ -1316,8 +1316,9 @@
- 		attributes = 0;
- 		ut_error;
- 	}
--
-+	share_mode |= FILE_SHARE_WRITE; /* Why? */
- 	file = CreateFile((LPCTSTR) name,
-+			  (srv_read_only && create_flag == OPEN_EXISTING) ? GENERIC_READ :
- 			  GENERIC_READ | GENERIC_WRITE, /* read and write
- 							access */
- 			  share_mode,	/* File can be read also by other
-@@ -1376,7 +1377,11 @@
- 	if (create_mode == OS_FILE_OPEN || create_mode == OS_FILE_OPEN_RAW
- 	    || create_mode == OS_FILE_OPEN_RETRY) {
- 		mode_str = "OPEN";
--		create_flag = O_RDWR;
-+		if (srv_read_only) {
-+			create_flag = O_RDONLY;
-+		} else {
-+			create_flag = O_RDWR;
-+		}
- 	} else if (create_mode == OS_FILE_CREATE) {
- 		mode_str = "CREATE";
- 		create_flag = O_RDWR | O_CREAT | O_EXCL;
-@@ -2545,6 +2550,9 @@
- 	ut_a((offset & 0xFFFFFFFFUL) == offset);
- 	ut_a((n & 0xFFFFFFFFUL) == n);
- 
-+	if (srv_fake_write)
-+		return(TRUE);
-+
- 	os_n_file_writes++;
- 
- 	ut_ad(file);
-@@ -2669,6 +2677,9 @@
- #else
- 	ssize_t	ret;
- 
-+	if (srv_fake_write)
-+		return(TRUE);
-+
- 	ret = os_file_pwrite(file, buf, n, offset, offset_high);
- 
- 	if ((ulint)ret == n) {
---- a/storage/innodb_plugin/os/os0thread.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/os/os0thread.c	2011-03-12 06:28:08.000000000 -0800
-@@ -287,12 +287,17 @@
- #elif defined(__NETWARE__)
- 	delay(tm / 1000);
- #else
-+	/* select() simetimes hang up from xtrabackup */
-+	/* change to use usleep() for now */
-+	usleep(tm);
-+/*
- 	struct timeval	t;
- 
- 	t.tv_sec = tm / 1000000;
- 	t.tv_usec = tm % 1000000;
- 
- 	select(0, NULL, NULL, NULL, &t);
-+*/
- #endif
- }
- 
---- a/storage/innodb_plugin/row/row0merge.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/row/row0merge.c	2011-03-12 06:28:08.000000000 -0800
-@@ -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,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);
-+				fprintf(stderr, "InnoDB: Error: "
-+					"row_merge_blocks() is called.\n");
-+				ut_error;
- 				mem_heap_free(heap);
- 				return(DB_DUPLICATE_KEY);
- 			}
-@@ -2584,7 +2589,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	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2011-03-12 06:28:08.000000000 -0800
-@@ -367,6 +367,9 @@
- 
- UNIV_INTERN ulong	srv_replication_delay		= 0;
- 
-+UNIV_INTERN ibool	srv_read_only   = FALSE;
-+UNIV_INTERN ibool	srv_fake_write  = FALSE;
-+UNIV_INTERN ibool	srv_apply_log_only = FALSE;
- /*-------------------------------------------*/
- UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
- UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -995,7 +998,7 @@
- 	}
- 
- 	/* Initialize some INFORMATION SCHEMA internal structures */
--	trx_i_s_cache_init(trx_i_s_cache);
-+	//trx_i_s_cache_init(trx_i_s_cache);
- }
- 
- /*********************************************************************//**
-@@ -1006,6 +1009,7 @@
- /*==========*/
- {
- 	os_fast_mutex_free(&srv_conc_mutex);
-+#ifdef UNDEFINED
- 	mem_free(srv_conc_slots);
- 	srv_conc_slots = NULL;
- 
-@@ -1019,6 +1023,7 @@
- 	srv_mysql_table = NULL;
- 
- 	trx_i_s_cache_free(trx_i_s_cache);
-+#endif
- }
- 
- /*********************************************************************//**
---- a/storage/innodb_plugin/srv/srv0start.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/srv/srv0start.c	2011-03-12 06:28:08.000000000 -0800
-@@ -94,6 +94,8 @@
- /** Log sequence number at shutdown */
- UNIV_INTERN ib_uint64_t	srv_shutdown_lsn;
- 
-+UNIV_INTERN ib_uint64_t srv_oldest_lsn;
-+
- #ifdef HAVE_DARWIN_THREADS
- # include <sys/utsname.h>
- /** TRUE if the F_FULLFSYNC option is available */
-@@ -544,7 +546,7 @@
- /*********************************************************************//**
- Creates or opens the log files and closes them.
- @return	DB_SUCCESS or error code */
--static
-+//static
- ulint
- open_or_create_log_file(
- /*====================*/
-@@ -702,7 +704,7 @@
- /*********************************************************************//**
- Creates or opens database data files and closes them.
- @return	DB_SUCCESS or error code */
--static
-+//static
- ulint
- open_or_create_data_files(
- /*======================*/
-@@ -1353,7 +1355,7 @@
- 	}
- #endif /* UNIV_LOG_ARCHIVE */
- 
--	if (srv_n_log_files * srv_log_file_size >= 262144) {
-+	if (sizeof(ulint) == 4 && srv_n_log_files * srv_log_file_size >= 262144) {
- 		fprintf(stderr,
- 			"InnoDB: Error: combined size of log files"
- 			" must be < 4 GB\n");
-@@ -1595,6 +1597,10 @@
- 		are initialized in trx_sys_init_at_db_start(). */
- 
- 		recv_recovery_from_checkpoint_finish();
-+
-+		if (srv_apply_log_only)
-+			goto skip_processes;
-+
- 		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
-@@ -1741,7 +1747,18 @@
- 
- 	if (srv_auto_extend_last_data_file
- 	    && sum_of_data_file_sizes < tablespace_size_in_header) {
-+		/* extend table space size aligning with header */
-+		ulint	actual_size;
-+		fil_extend_space_to_desired_size(&actual_size, 0, tablespace_size_in_header);
-+		if (actual_size < tablespace_size_in_header) {
-+			fprintf(stderr,
-+"InnoDB: Warning: To extend tablespace size aligning with header seems to be failed.\n"
-+"InnoDB: The acutual size %lu must be larger than %lu.\n",
-+				(ulong) actual_size,
-+				(ulong) tablespace_size_in_header);
-+		}
- 
-+#ifdef UNDEFINED
- 		fprintf(stderr,
- 			"InnoDB: Error: tablespace size stored in header"
- 			" is %lu pages, but\n"
-@@ -1766,6 +1783,7 @@
- 
- 			return(DB_ERROR);
- 		}
-+#endif
- 	}
- 
- 	/* Check that os_fast_mutexes work as expected */
-@@ -1861,6 +1879,7 @@
- 		ibuf_update_max_tablespace_id();
- 	}
- 
-+skip_processes:
- 	srv_file_per_table = srv_file_per_table_original_value;
- 
- 	srv_was_started = TRUE;
---- a/storage/innodb_plugin/trx/trx0purge.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/trx/trx0purge.c	2011-03-12 06:28:08.000000000 -0800
-@@ -1087,6 +1087,9 @@
- 	/*	que_thr_t*	thr2; */
- 	ulint		old_pages_handled;
- 
-+	if (srv_fake_write)
-+		return(0);
-+
- 	mutex_enter(&(purge_sys->mutex));
- 
- 	if (purge_sys->trx->n_active_thrs > 0) {
---- a/storage/innodb_plugin/trx/trx0rseg.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/trx/trx0rseg.c	2011-03-12 06:28:08.000000000 -0800
-@@ -143,9 +143,11 @@
- 
- 	mutex_free(&rseg->mutex);
- 
-+	if (!srv_apply_log_only) {
- 	/* There can't be any active transactions. */
- 	ut_a(UT_LIST_GET_LEN(rseg->update_undo_list) == 0);
- 	ut_a(UT_LIST_GET_LEN(rseg->insert_undo_list) == 0);
-+	}
- 
- 	undo = UT_LIST_GET_FIRST(rseg->update_undo_cached);
- 
---- a/storage/innodb_plugin/trx/trx0sys.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/trx/trx0sys.c	2011-03-12 06:28:08.000000000 -0800
-@@ -1607,10 +1607,12 @@
- 		UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
- 	}
- 
-+	if (!srv_apply_log_only) {
- 	ut_a(UT_LIST_GET_LEN(trx_sys->trx_list) == 0);
- 	ut_a(UT_LIST_GET_LEN(trx_sys->rseg_list) == 0);
- 	ut_a(UT_LIST_GET_LEN(trx_sys->view_list) == 0);
- 	ut_a(UT_LIST_GET_LEN(trx_sys->mysql_trx_list) == 0);
-+	}
- 
- 	mem_free(trx_sys);
- 
---- a/storage/innodb_plugin/trx/trx0trx.c	2011-03-12 06:27:32.000000000 -0800
-+++ b/storage/innodb_plugin/trx/trx0trx.c	2011-03-12 06:28:08.000000000 -0800
-@@ -461,8 +461,8 @@
- 						TRX_ID_PREP_PRINTF(trx->id));
- 
- 					if (srv_force_recovery == 0) {
--
--						trx->conc_state = TRX_PREPARED;
-+						/* xtrabackup should rollback it */
-+						trx->conc_state = TRX_ACTIVE;
- 					} else {
- 						fprintf(stderr,
- 							"InnoDB: Since"
-@@ -538,9 +538,9 @@
- 								trx->id));
- 
- 						if (srv_force_recovery == 0) {
--
-+							/* xtrabackup should rollback it */
- 							trx->conc_state
--								= TRX_PREPARED;
-+								= TRX_ACTIVE;
- 						} else {
- 							fprintf(stderr,
- 								"InnoDB: Since"

=== added directory 'patches'
=== renamed file 'fix_innodb_for_backup51.patch' => 'patches/innodb51_builtin.patch'
=== renamed file 'tar4ibd_libtar-1.2.11.patch' => 'patches/tar4ibd_libtar-1.2.11.patch'
=== renamed file 'fix_innodb_for_backup_percona-server.patch' => 'patches/xtradb51.patch'
--- fix_innodb_for_backup_percona-server.patch	2011-03-13 15:52:22 +0000
+++ patches/xtradb51.patch	2011-03-15 21:59:23 +0000
@@ -1,5 +1,5 @@
---- a/storage/innodb_plugin/btr/btr0btr.c	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/btr/btr0btr.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/btr/btr0btr.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/btr/btr0btr.c	2011-03-14 03:25:16.000000000 -0700
 @@ -120,7 +120,7 @@
  /**************************************************************//**
  Gets the root node of a tree and x-latches it.
@@ -18,8 +18,8 @@
  buf_block_t*
  btr_node_ptr_get_child(
  /*===================*/
---- a/storage/innodb_plugin/buf/buf0buf.c	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/buf/buf0buf.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/buf/buf0buf.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/buf/buf0buf.c	2011-03-14 03:25:16.000000000 -0700
 @@ -440,7 +440,7 @@
  		return(TRUE);
  	}
@@ -38,8 +38,8 @@
  			ibuf_merge_or_delete_for_page(
  				/* Delete possible entries, if bpage is_corrupt */
  				(srv_pass_corrupt_table && bpage->is_corrupt) ? NULL :
---- a/storage/innodb_plugin/fil/fil0fil.c	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2011-03-12 12:27:51.000000000 -0800
+--- a/storage/innodb_plugin/fil/fil0fil.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/fil/fil0fil.c	2011-03-14 03:26:26.000000000 -0700
 @@ -294,7 +294,7 @@
  
  /** The tablespace memory cache. This variable is NULL before the module is
@@ -412,7 +412,7 @@
  	}
  
  	if (node->open == FALSE) {
-+		ulint err;
++		ulint	err;
  		/* File is closed: open it */
  		ut_a(node->n_pending == 0);
  
@@ -423,7 +423,16 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
-@@ -4835,6 +5017,16 @@
+@@ -4650,6 +4832,8 @@
+ 	}
+ 
+ 	node->n_pending++;
++
++	return(0);
+ }
+ 
+ /********************************************************************//**
+@@ -4835,6 +5019,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -440,8 +449,8 @@
  	node = UT_LIST_GET_FIRST(space->chain);
  
  	for (;;) {
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/handler/ha_innodb.cc	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/handler/ha_innodb.cc	2011-03-14 03:25:16.000000000 -0700
 @@ -343,12 +343,6 @@
    "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.",
    NULL, NULL, 50, 1, 1024 * 1024 * 1024, 0);
@@ -481,8 +490,8 @@
    MYSQL_SYSVAR(enable_unsafe_group_commit),
    MYSQL_SYSVAR(expand_import),
    MYSQL_SYSVAR(extra_rsegments),
---- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/ibuf/ibuf0ibuf.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/ibuf/ibuf0ibuf.c	2011-03-14 03:25:16.000000000 -0700
 @@ -1064,6 +1064,9 @@
  
  	ut_ad(!recv_no_ibuf_operations);
@@ -503,8 +512,8 @@
  	while (sum_pages < n_pages) {
  		n_bytes = ibuf_contract_ext(&n_pag2, sync);
  
---- a/storage/innodb_plugin/include/ha_prototypes.h	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/include/ha_prototypes.h	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/include/ha_prototypes.h	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/include/ha_prototypes.h	2011-03-14 03:25:16.000000000 -0700
 @@ -268,12 +268,4 @@
  	void*	thd);	/*!< in: thread handle (THD*), or NULL to query
  			the global innodb_lock_wait_timeout */
@@ -518,8 +527,8 @@
 -	void*	thd);
 -
  #endif
---- a/storage/innodb_plugin/include/srv0srv.h	2011-03-12 12:22:31.000000000 -0800
-+++ b/storage/innodb_plugin/include/srv0srv.h	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/include/srv0srv.h	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/include/srv0srv.h	2011-03-14 03:25:16.000000000 -0700
 @@ -228,6 +228,10 @@
  
  extern ulong	srv_replication_delay;
@@ -531,8 +540,8 @@
  extern long long	srv_ibuf_max_size;
  extern ulint	srv_ibuf_active_contract;
  extern ulint	srv_ibuf_accel_rate;
---- a/storage/innodb_plugin/include/srv0start.h	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/include/srv0start.h	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/include/srv0start.h	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/include/srv0start.h	2011-03-14 03:25:16.000000000 -0700
 @@ -91,6 +91,8 @@
  /** Log sequence number immediately after startup */
  extern	ib_uint64_t	srv_start_lsn;
@@ -542,8 +551,8 @@
  #ifdef __NETWARE__
  void set_panic_flag_for_netware(void);
  #endif
---- a/storage/innodb_plugin/include/trx0trx.h	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/include/trx0trx.h	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/include/trx0trx.h	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/include/trx0trx.h	2011-03-14 03:25:16.000000000 -0700
 @@ -497,7 +497,6 @@
  					FALSE, one can save CPU time and about
  					150 bytes in the undo log size as then
@@ -552,8 +561,8 @@
  	ulint		flush_log_later;/* In 2PC, we hold the
  					prepare_commit mutex across
  					both phases. In that case, we
---- a/storage/innodb_plugin/include/ut0byte.ic	2011-01-25 07:04:39.000000000 -0800
-+++ b/storage/innodb_plugin/include/ut0byte.ic	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/include/ut0byte.ic	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/include/ut0byte.ic	2011-03-14 03:25:16.000000000 -0700
 @@ -168,6 +168,14 @@
  	dulint	a,	/*!< in: dulint */
  	ulint	b)	/*!< in: ulint */
@@ -595,8 +604,8 @@
  	return(diff);
  }
  
---- a/storage/innodb_plugin/log/log0log.c	2011-03-12 12:22:31.000000000 -0800
-+++ b/storage/innodb_plugin/log/log0log.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/log/log0log.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/log/log0log.c	2011-03-14 03:25:16.000000000 -0700
 @@ -1370,7 +1370,7 @@
  #endif /* UNIV_DEBUG */
  	ulint		unlock;
@@ -622,8 +631,8 @@
  
  	if (srv_fast_shutdown == 2) {
  		/* In this fastest shutdown we do not flush the buffer pool:
---- a/storage/innodb_plugin/log/log0recv.c	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/log/log0recv.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/log/log0recv.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/log/log0recv.c	2011-03-14 03:25:16.000000000 -0700
 @@ -42,27 +42,27 @@
  #include "trx0undo.h"
  #include "trx0rec.h"
@@ -747,8 +756,8 @@
  	trx_rollback_or_clean_recovered(FALSE);
  }
  
---- a/storage/innodb_plugin/os/os0file.c	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/os/os0file.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/os/os0file.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/os/os0file.c	2011-03-14 03:25:16.000000000 -0700
 @@ -554,7 +554,7 @@
  }
  
@@ -802,8 +811,8 @@
  	ret = os_file_pwrite(file, buf, n, offset, offset_high);
  
  	if ((ulint)ret == n) {
---- a/storage/innodb_plugin/os/os0thread.c	2011-01-25 07:04:39.000000000 -0800
-+++ b/storage/innodb_plugin/os/os0thread.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/os/os0thread.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/os/os0thread.c	2011-03-14 03:25:16.000000000 -0700
 @@ -287,12 +287,17 @@
  #elif defined(__NETWARE__)
  	delay(tm / 1000);
@@ -822,8 +831,8 @@
  #endif
  }
  
---- a/storage/innodb_plugin/row/row0merge.c	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/row/row0merge.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/row/row0merge.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/row/row0merge.c	2011-03-14 03:25:16.000000000 -0700
 @@ -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);
@@ -859,8 +868,8 @@
  
  	/* Read clustered index of the table and create files for
  	secondary index entries for merge sort */
---- a/storage/innodb_plugin/srv/srv0srv.c	2011-03-12 12:22:31.000000000 -0800
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/srv/srv0srv.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/srv/srv0srv.c	2011-03-14 03:25:16.000000000 -0700
 @@ -402,6 +402,10 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
@@ -897,8 +906,8 @@
  }
  
  /*********************************************************************//**
---- a/storage/innodb_plugin/srv/srv0start.c	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/srv/srv0start.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/srv/srv0start.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/srv/srv0start.c	2011-03-14 03:25:16.000000000 -0700
 @@ -94,6 +94,8 @@
  /** Log sequence number at shutdown */
  UNIV_INTERN ib_uint64_t	srv_shutdown_lsn;
@@ -972,8 +981,8 @@
  	srv_file_per_table = srv_file_per_table_original_value;
  
  	srv_was_started = TRUE;
---- a/storage/innodb_plugin/trx/trx0purge.c	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/trx/trx0purge.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/trx/trx0purge.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/trx/trx0purge.c	2011-03-14 03:25:16.000000000 -0700
 @@ -1113,6 +1113,9 @@
  	/*	que_thr_t*	thr2; */
  	ulint		old_pages_handled;
@@ -984,8 +993,8 @@
  	mutex_enter(&(purge_sys->mutex));
  
  	if (purge_sys->trx->n_active_thrs > 0) {
---- a/storage/innodb_plugin/trx/trx0rseg.c	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/trx/trx0rseg.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/trx/trx0rseg.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/trx/trx0rseg.c	2011-03-14 03:25:16.000000000 -0700
 @@ -143,9 +143,11 @@
  
  	mutex_free(&rseg->mutex);
@@ -998,8 +1007,8 @@
  
  	undo = UT_LIST_GET_FIRST(rseg->update_undo_cached);
  
---- a/storage/innodb_plugin/trx/trx0sys.c	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/trx/trx0sys.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/trx/trx0sys.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/trx/trx0sys.c	2011-03-14 03:25:16.000000000 -0700
 @@ -1931,10 +1931,12 @@
  		UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
  	}
@@ -1013,8 +1022,8 @@
  
  	mem_free(trx_sys);
  
---- a/storage/innodb_plugin/trx/trx0trx.c	2011-03-12 12:22:30.000000000 -0800
-+++ b/storage/innodb_plugin/trx/trx0trx.c	2011-03-12 12:23:27.000000000 -0800
+--- a/storage/innodb_plugin/trx/trx0trx.c	2011-03-14 03:24:55.000000000 -0700
++++ b/storage/innodb_plugin/trx/trx0trx.c	2011-03-14 03:25:16.000000000 -0700
 @@ -109,8 +109,6 @@
  
  	trx->support_xa = TRUE;

=== added file 'patches/xtradb55.patch'
--- patches/xtradb55.patch	1970-01-01 00:00:00 +0000
+++ patches/xtradb55.patch	2011-03-15 21:59:23 +0000
@@ -0,0 +1,1189 @@
+--- a/storage/innobase/btr/btr0btr.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/btr/btr0btr.c	2011-03-15 07:56:47.000000000 -0700
+@@ -120,7 +120,7 @@
+ /**************************************************************//**
+ Gets the root node of a tree and x-latches it.
+ @return	root page, x-latched */
+-static
++//static
+ buf_block_t*
+ btr_root_block_get(
+ /*===============*/
+@@ -578,7 +578,7 @@
+ /************************************************************//**
+ Returns the child page of a node pointer and x-latches it.
+ @return	child page, x-latched */
+-static
++//static
+ buf_block_t*
+ btr_node_ptr_get_child(
+ /*===================*/
+--- a/storage/innobase/buf/buf0buf.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/buf/buf0buf.c	2011-03-15 07:56:47.000000000 -0700
+@@ -609,7 +609,7 @@
+ 		return(TRUE);
+ 	}
+ 
+-#ifndef UNIV_HOTBACKUP
++#ifdef UNDEFINED
+ 	if (recv_lsn_checks_on) {
+ 		ib_uint64_t	current_lsn;
+ 
+@@ -4901,7 +4901,7 @@
+ 			recv_recover_page(TRUE, (buf_block_t*) bpage);
+ 		}
+ 
+-		if (uncompressed && !recv_no_ibuf_operations) {
++		if (uncompressed && !recv_no_ibuf_operations && !srv_fake_write) {
+ 			ibuf_merge_or_delete_for_page(
+ 				/* Delete possible entries, if bpage is_corrupt */
+ 				(srv_pass_corrupt_table && bpage->is_corrupt) ? NULL :
+--- a/storage/innobase/fil/fil0fil.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/fil/fil0fil.c	2011-03-15 07:56:47.000000000 -0700
+@@ -305,7 +305,7 @@
+ 
+ /** The tablespace memory cache. This variable is NULL before the module is
+ initialized. */
+-static fil_system_t*	fil_system	= NULL;
++fil_system_t*	fil_system	= NULL;
+ 
+ #ifdef UNIV_DEBUG
+ /** Try fil_validate() every this many times */
+@@ -344,7 +344,7 @@
+ off the LRU list if it is in the LRU list. The caller must hold the fil_sys
+ mutex. */
+ static
+-void
++ulint
+ fil_node_prepare_for_io(
+ /*====================*/
+ 	fil_node_t*	node,	/*!< in: file node */
+@@ -669,7 +669,7 @@
+ Opens a the file of a node of a tablespace. The caller must own the fil_system
+ mutex. */
+ static
+-void
++ulint
+ fil_node_open_file(
+ /*===============*/
+ 	fil_node_t*	node,	/*!< in: file node */
+@@ -704,7 +704,14 @@
+ 			OS_FILE_READ_ONLY, &success);
+ 		if (!success) {
+ 			/* The following call prints an error message */
+-			os_file_get_last_error(TRUE);
++			if (os_file_get_last_error(TRUE) == OS_FILE_NOT_FOUND)
++			{
++				ut_print_timestamp(stderr);
++				fprintf(stderr,
++					" InnoDB: Warning: cannot open %s\n",
++					node->name);
++				return(OS_FILE_NOT_FOUND);
++			}
+ 
+ 			ut_print_timestamp(stderr);
+ 
+@@ -794,8 +801,8 @@
+ 		}
+ 
+ 		if (size_bytes >= 1024 * 1024) {
+-			/* Truncate the size to whole megabytes. */
+-			size_bytes = ut_2pow_round(size_bytes, 1024 * 1024);
++			/* The size should be exact for after applying .delta */
++			//size_bytes = ut_2pow_round(size_bytes, 1024 * 1024);
+ 		}
+ 
+ 		if (!(flags & DICT_TF_ZSSIZE_MASK)) {
+@@ -846,6 +853,8 @@
+ 		/* Put the node to the LRU list */
+ 		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
+ 	}
++
++	return(0);
+ }
+ 
+ /**********************************************************************//**
+@@ -1474,7 +1483,12 @@
+ 		the file yet; the following calls will open it and update the
+ 		size fields */
+ 
+-		fil_node_prepare_for_io(node, fil_system, space);
++		if (fil_node_prepare_for_io(node, fil_system, space))
++		{
++			mutex_exit(&fil_system->mutex);
++
++			return(0);
++		}
+ 		fil_node_complete_io(node, fil_system, OS_FILE_READ);
+ 	}
+ 
+@@ -1526,7 +1540,12 @@
+ 		the file yet; the following calls will open it and update the
+ 		size fields */
+ 
+-		fil_node_prepare_for_io(node, fil_system, space);
++		if (fil_node_prepare_for_io(node, fil_system, space))
++		{
++			mutex_exit(&fil_system->mutex);
++
++			return(ULINT_UNDEFINED);
++		}
+ 		fil_node_complete_io(node, fil_system, OS_FILE_READ);
+ 	}
+ 
+@@ -2202,7 +2221,7 @@
+ 			if (fil_create_new_single_table_tablespace(
+ 				    space_id, name, FALSE, flags,
+ 				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
+-				ut_error;
++				//ut_error;
+ 			}
+ 		}
+ 
+@@ -2369,7 +2388,7 @@
+ 	}
+ 
+ 	if (success) {
+-#ifndef UNIV_HOTBACKUP
++#ifdef UNDEFINED
+ 		/* Write a log record about the deletion of the .ibd
+ 		file, so that ibbackup can replay it in the
+ 		--apply-log phase. We use a dummy mtr and the familiar
+@@ -2670,7 +2689,7 @@
+ 
+ 	mutex_exit(&fil_system->mutex);
+ 
+-#ifndef UNIV_HOTBACKUP
++#ifdef UNDEFINED
+ 	if (success) {
+ 		mtr_t		mtr;
+ 
+@@ -2861,7 +2880,7 @@
+ 
+ 	fil_node_create(path, size, space_id, FALSE);
+ 
+-#ifndef UNIV_HOTBACKUP
++#ifdef UNDEFINED
+ 	{
+ 		mtr_t		mtr;
+ 
+@@ -3116,19 +3135,97 @@
+ 		      "InnoDB: open the tablespace file ", stderr);
+ 		ut_print_filename(stderr, filepath);
+ 		fputs("!\n"
+-		      "InnoDB: Have you moved InnoDB .ibd files around"
+-		      " without using the\n"
+-		      "InnoDB: commands DISCARD TABLESPACE and"
+-		      " IMPORT TABLESPACE?\n"
+-		      "InnoDB: It is also possible that this is"
+-		      " a temporary table #sql...,\n"
+-		      "InnoDB: and MySQL removed the .ibd file for this.\n"
+-		      "InnoDB: Please refer to\n"
+-		      "InnoDB: " REFMAN "innodb-troubleshooting-datadict.html\n"
+-		      "InnoDB: for how to resolve the issue.\n", stderr);
++		      "InnoDB: It will be removed from data dictionary.\n"
++		      , stderr);
+ 
+ 		mem_free(filepath);
+ 
++		/* removing from data dictionary */
++		{
++			trx_t*		trx;
++			pars_info_t*	info = NULL;
++
++			trx = trx_allocate_for_mysql();
++
++			trx->op_info = "removing invalid table from data dictionary";
++
++			info = pars_info_create();
++
++			pars_info_add_str_literal(info, "table_name", name);
++
++			que_eval_sql(info,
++			   "PROCEDURE DROP_TABLE_PROC () IS\n"
++			   "sys_foreign_id CHAR;\n"
++			   "table_id CHAR;\n"
++			   "index_id CHAR;\n"
++			   "foreign_id CHAR;\n"
++			   "found INT;\n"
++			   "BEGIN\n"
++			   "SELECT ID INTO table_id\n"
++			   "FROM SYS_TABLES\n"
++			   "WHERE NAME = :table_name\n"
++			   "LOCK IN SHARE MODE;\n"
++			   "IF (SQL % NOTFOUND) THEN\n"
++			   "       RETURN;\n"
++			   "END IF;\n"
++			   "found := 1;\n"
++			   "SELECT ID INTO sys_foreign_id\n"
++			   "FROM SYS_TABLES\n"
++			   "WHERE NAME = 'SYS_FOREIGN'\n"
++			   "LOCK IN SHARE MODE;\n"
++			   "IF (SQL % NOTFOUND) THEN\n"
++			   "       found := 0;\n"
++			   "END IF;\n"
++			   "IF (:table_name = 'SYS_FOREIGN') THEN\n"
++			   "       found := 0;\n"
++			   "END IF;\n"
++			   "IF (:table_name = 'SYS_FOREIGN_COLS') THEN\n"
++			   "       found := 0;\n"
++			   "END IF;\n"
++			   "WHILE found = 1 LOOP\n"
++			   "       SELECT ID INTO foreign_id\n"
++			   "       FROM SYS_FOREIGN\n"
++			   "       WHERE FOR_NAME = :table_name\n"
++			   "               AND TO_BINARY(FOR_NAME)\n"
++			   "                 = TO_BINARY(:table_name)\n"
++			   "               LOCK IN SHARE MODE;\n"
++			   "       IF (SQL % NOTFOUND) THEN\n"
++			   "               found := 0;\n"
++			   "       ELSE\n"
++			   "               DELETE FROM SYS_FOREIGN_COLS\n"
++			   "               WHERE ID = foreign_id;\n"
++			   "               DELETE FROM SYS_FOREIGN\n"
++			   "               WHERE ID = foreign_id;\n"
++			   "       END IF;\n"
++			   "END LOOP;\n"
++			   "found := 1;\n"
++			   "WHILE found = 1 LOOP\n"
++			   "       SELECT ID INTO index_id\n"
++			   "       FROM SYS_INDEXES\n"
++			   "       WHERE TABLE_ID = table_id\n"
++			   "       LOCK IN SHARE MODE;\n"
++			   "       IF (SQL % NOTFOUND) THEN\n"
++			   "               found := 0;\n"
++			   "       ELSE\n"
++			   "               DELETE FROM SYS_FIELDS\n"
++			   "               WHERE INDEX_ID = index_id;\n"
++			   "               DELETE FROM SYS_INDEXES\n"
++			   "               WHERE ID = index_id\n"
++			   "               AND TABLE_ID = table_id;\n"
++			   "       END IF;\n"
++			   "END LOOP;\n"
++			   "DELETE FROM SYS_COLUMNS\n"
++			   "WHERE TABLE_ID = table_id;\n"
++			   "DELETE FROM SYS_TABLES\n"
++			   "WHERE ID = table_id;\n"
++			   "END;\n"
++			   , FALSE, trx);
++
++			trx_commit_for_mysql(trx);
++
++			trx_free_for_mysql(trx);
++		}
++
+ 		return(FALSE);
+ 	}
+ 
+@@ -3836,7 +3933,7 @@
+ 	cannot be ok. */
+ 
+ 	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
+-#ifndef UNIV_HOTBACKUP
++#ifdef UNDEFINED
+ 	if (size < FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) {
+ 		fprintf(stderr,
+ 			"InnoDB: Error: the size of single-table tablespace"
+@@ -3977,7 +4074,7 @@
+ idea is to read as much good data as we can and jump over bad data.
+ @return 0 if ok, -1 if error even after the retries, 1 if at the end
+ of the directory */
+-static
++//static
+ int
+ fil_file_readdir_next_file(
+ /*=======================*/
+@@ -4276,15 +4373,97 @@
+ 				"InnoDB: in InnoDB data dictionary"
+ 				" has tablespace id %lu,\n"
+ 				"InnoDB: but tablespace with that id"
+-				" or name does not exist. Have\n"
+-				"InnoDB: you deleted or moved .ibd files?\n"
+-				"InnoDB: This may also be a table created with"
+-				" CREATE TEMPORARY TABLE\n"
+-				"InnoDB: whose .ibd and .frm files"
+-				" MySQL automatically removed, but the\n"
+-				"InnoDB: table still exists in the"
+-				" InnoDB internal data dictionary.\n",
++				" or name does not exist. It will be removed from data dictionary.\n"
++				,
+ 				(ulong) id);
++			mem_free(path);
++			mutex_exit(&fil_system->mutex);
++			/* removing from data dictionary */
++			{
++				trx_t*		trx;
++				pars_info_t*	info = NULL;
++
++				trx = trx_allocate_for_mysql();
++
++				trx->op_info = "removing invalid table from data dictionary";
++
++				info = pars_info_create();
++
++				pars_info_add_str_literal(info, "table_name", name);
++
++				que_eval_sql(info,
++				   "PROCEDURE DROP_TABLE_PROC () IS\n"
++				   "sys_foreign_id CHAR;\n"
++				   "table_id CHAR;\n"
++				   "index_id CHAR;\n"
++				   "foreign_id CHAR;\n"
++				   "found INT;\n"
++				   "BEGIN\n"
++				   "SELECT ID INTO table_id\n"
++				   "FROM SYS_TABLES\n"
++				   "WHERE NAME = :table_name\n"
++				   "LOCK IN SHARE MODE;\n"
++				   "IF (SQL % NOTFOUND) THEN\n"
++				   "       RETURN;\n"
++				   "END IF;\n"
++				   "found := 1;\n"
++				   "SELECT ID INTO sys_foreign_id\n"
++				   "FROM SYS_TABLES\n"
++				   "WHERE NAME = 'SYS_FOREIGN'\n"
++				   "LOCK IN SHARE MODE;\n"
++				   "IF (SQL % NOTFOUND) THEN\n"
++				   "       found := 0;\n"
++				   "END IF;\n"
++				   "IF (:table_name = 'SYS_FOREIGN') THEN\n"
++				   "       found := 0;\n"
++				   "END IF;\n"
++				   "IF (:table_name = 'SYS_FOREIGN_COLS') THEN\n"
++				   "       found := 0;\n"
++				   "END IF;\n"
++				   "WHILE found = 1 LOOP\n"
++				   "       SELECT ID INTO foreign_id\n"
++				   "       FROM SYS_FOREIGN\n"
++				   "       WHERE FOR_NAME = :table_name\n"
++				   "               AND TO_BINARY(FOR_NAME)\n"
++				   "                 = TO_BINARY(:table_name)\n"
++				   "               LOCK IN SHARE MODE;\n"
++				   "       IF (SQL % NOTFOUND) THEN\n"
++				   "               found := 0;\n"
++				   "       ELSE\n"
++				   "               DELETE FROM SYS_FOREIGN_COLS\n"
++				   "               WHERE ID = foreign_id;\n"
++				   "               DELETE FROM SYS_FOREIGN\n"
++				   "               WHERE ID = foreign_id;\n"
++				   "       END IF;\n"
++				   "END LOOP;\n"
++				   "found := 1;\n"
++				   "WHILE found = 1 LOOP\n"
++				   "       SELECT ID INTO index_id\n"
++				   "       FROM SYS_INDEXES\n"
++				   "       WHERE TABLE_ID = table_id\n"
++				   "       LOCK IN SHARE MODE;\n"
++				   "       IF (SQL % NOTFOUND) THEN\n"
++				   "               found := 0;\n"
++				   "       ELSE\n"
++				   "               DELETE FROM SYS_FIELDS\n"
++				   "               WHERE INDEX_ID = index_id;\n"
++				   "               DELETE FROM SYS_INDEXES\n"
++				   "               WHERE ID = index_id\n"
++				   "               AND TABLE_ID = table_id;\n"
++				   "       END IF;\n"
++				   "END LOOP;\n"
++				   "DELETE FROM SYS_COLUMNS\n"
++				   "WHERE TABLE_ID = table_id;\n"
++				   "DELETE FROM SYS_TABLES\n"
++				   "WHERE ID = table_id;\n"
++				   "END;\n"
++				   , FALSE, trx);
++
++				trx_commit_for_mysql(trx);
++
++				trx_free_for_mysql(trx);
++			}
++			return(FALSE);
+ 		} else {
+ 			ut_print_timestamp(stderr);
+ 			fputs("  InnoDB: Error: table ", stderr);
+@@ -4683,7 +4862,7 @@
+ off the LRU list if it is in the LRU list. The caller must hold the fil_sys
+ mutex. */
+ static
+-void
++ulint
+ fil_node_prepare_for_io(
+ /*====================*/
+ 	fil_node_t*	node,	/*!< in: file node */
+@@ -4703,10 +4882,13 @@
+ 	}
+ 
+ 	if (node->open == FALSE) {
++		ulint	err;
+ 		/* File is closed: open it */
+ 		ut_a(node->n_pending == 0);
+ 
+-		fil_node_open_file(node, system, space);
++		err = fil_node_open_file(node, system, space);
++		if (err)
++			return(err);
+ 	}
+ 
+ 	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
+@@ -4719,6 +4901,8 @@
+ 	}
+ 
+ 	node->n_pending++;
++
++	return(0);
+ }
+ 
+ /********************************************************************//**
+@@ -4920,6 +5104,16 @@
+ 
+ 	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
+ 
++	if (space->size <= block_offset) {
++		ulint	actual_size;
++
++		mutex_exit(&fil_system->mutex);
++		fil_extend_space_to_desired_size(&actual_size, space->id,
++						 ((block_offset + 1) / 64 + 1) * 64);
++		mutex_enter(&fil_system->mutex);
++		/* should retry? but it may safe for xtrabackup for now. */
++	}
++
+ 	node = UT_LIST_GET_FIRST(space->chain);
+ 
+ 	for (;;) {
+--- a/storage/innobase/handler/ha_innodb.cc	2011-03-15 07:53:56.000000000 -0700
++++ b/storage/innobase/handler/ha_innodb.cc	2011-03-15 07:59:54.000000000 -0700
+@@ -460,13 +460,6 @@
+   "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.",
+   NULL, NULL, 50, 1, 1024 * 1024 * 1024, 0);
+ 
+-static MYSQL_THDVAR_ULONG(flush_log_at_trx_commit, PLUGIN_VAR_OPCMDARG,
+-  "Set to 0 (write and flush once per second),"
+-  " 1 (write and flush at each commit)"
+-  " or 2 (write at commit, flush once per second).",
+-  NULL, NULL, 1, 0, 2, 0);
+-
+-
+ static handler *innobase_create_handler(handlerton *hton,
+                                         TABLE_SHARE *table,
+                                         MEM_ROOT *mem_root)
+@@ -958,17 +951,6 @@
+ 	}
+ }
+ 
+-/******************************************************************//**
+-*/
+-extern "C" UNIV_INTERN
+-ulong
+-thd_flush_log_at_trx_commit(
+-/*================================*/
+-	void*	thd)
+-{
+-	return(THDVAR((THD*) thd, flush_log_at_trx_commit));
+-}
+-
+ /********************************************************************//**
+ Obtain the InnoDB transaction of a MySQL thread.
+ @return	reference to transaction pointer */
+@@ -11595,18 +11577,12 @@
+   innodb_file_format_max_validate,
+   innodb_file_format_max_update, "Antelope");
+ 
+-/* Changed to the THDVAR */
+-//static MYSQL_SYSVAR_ULONG(flush_log_at_trx_commit, srv_flush_log_at_trx_commit,
+-//  PLUGIN_VAR_OPCMDARG,
+-//  "Set to 0 (write and flush once per second),"
+-//  " 1 (write and flush at each commit)"
+-//  " or 2 (write at commit, flush once per second).",
+-//  NULL, NULL, 1, 0, 2, 0);
+-
+-static MYSQL_SYSVAR_BOOL(use_global_flush_log_at_trx_commit, srv_use_global_flush_log_at_trx_commit,
+-  PLUGIN_VAR_NOCMDARG,
+-  "Use global innodb_flush_log_at_trx_commit value. (default: ON).",
+-  NULL, NULL, TRUE);
++static MYSQL_SYSVAR_ULONG(flush_log_at_trx_commit, srv_flush_log_at_trx_commit,
++  PLUGIN_VAR_OPCMDARG,
++  "Set to 0 (write and flush once per second),"
++  " 1 (write and flush at each commit)"
++  " or 2 (write at commit, flush once per second).",
++  NULL, NULL, 1, 0, 2, 0);
+ 
+ static MYSQL_SYSVAR_STR(flush_method, innobase_file_flush_method,
+   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
+@@ -12073,7 +12049,6 @@
+   MYSQL_SYSVAR(file_format_check),
+   MYSQL_SYSVAR(file_format_max),
+   MYSQL_SYSVAR(flush_log_at_trx_commit),
+-  MYSQL_SYSVAR(use_global_flush_log_at_trx_commit),
+   MYSQL_SYSVAR(flush_method),
+   MYSQL_SYSVAR(force_recovery),
+   MYSQL_SYSVAR(locks_unsafe_for_binlog),
+--- a/storage/innobase/ibuf/ibuf0ibuf.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/ibuf/ibuf0ibuf.c	2011-03-15 07:56:47.000000000 -0700
+@@ -1202,6 +1202,9 @@
+ 	ut_ad(!recv_no_ibuf_operations);
+ 	ut_ad(x_latch || mtr == NULL);
+ 
++	if (srv_fake_write)
++		return(FALSE);
++
+ 	if (ibuf_fixed_addr_page(space, zip_size, page_no)) {
+ 
+ 		return(TRUE);
+@@ -2733,6 +2736,9 @@
+ 	ulint	n_bytes;
+ 	ulint	n_pag2;
+ 
++	if (srv_fake_write)
++		return(0);
++
+ 	while (sum_pages < n_pages) {
+ 		n_bytes = ibuf_contract_ext(&n_pag2, sync);
+ 
+--- a/storage/innobase/include/ha_prototypes.h	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/include/ha_prototypes.h	2011-03-15 07:56:47.000000000 -0700
+@@ -275,12 +275,5 @@
+ /*===================*/
+         void*   thd,	/*!< in: thread handle (THD*) */
+         ulint   value);	/*!< in: time waited for the lock */
+-/******************************************************************//**
+-*/
+-
+-ulong
+-thd_flush_log_at_trx_commit(
+-/*================================*/
+-	void*	thd);
+ 
+ #endif
+--- a/storage/innobase/include/srv0srv.h	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/include/srv0srv.h	2011-03-15 07:56:47.000000000 -0700
+@@ -148,8 +148,7 @@
+ extern ulint	srv_n_log_files;
+ extern ulint	srv_log_file_size;
+ extern ulint	srv_log_buffer_size;
+-//extern ulong	srv_flush_log_at_trx_commit;
+-extern char	srv_use_global_flush_log_at_trx_commit;
++extern ulong	srv_flush_log_at_trx_commit;
+ extern char	srv_adaptive_flushing;
+ 
+ 
+@@ -253,6 +252,10 @@
+ extern ulint	srv_dict_size_limit;
+ 
+ extern ulint	srv_lazy_drop_table;
++
++extern ibool	srv_read_only;
++extern ibool	srv_fake_write;
++extern ibool	srv_apply_log_only;
+ /*-------------------------------------------*/
+ 
+ extern ulint	srv_n_rows_inserted;
+--- a/storage/innobase/include/srv0start.h	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/include/srv0start.h	2011-03-15 07:56:47.000000000 -0700
+@@ -91,6 +91,8 @@
+ /** Log sequence number immediately after startup */
+ extern	ib_uint64_t	srv_start_lsn;
+ 
++extern	ib_uint64_t	srv_oldest_lsn;
++
+ #ifdef HAVE_DARWIN_THREADS
+ /** TRUE if the F_FULLFSYNC option is available */
+ extern	ibool	srv_have_fullfsync;
+--- a/storage/innobase/log/log0log.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/log/log0log.c	2011-03-15 07:56:47.000000000 -0700
+@@ -1154,7 +1154,7 @@
+ 	if (srv_unix_file_flush_method != SRV_UNIX_O_DSYNC
+ 	    && srv_unix_file_flush_method != SRV_UNIX_ALL_O_DIRECT
+ 	    && srv_unix_file_flush_method != SRV_UNIX_NOSYNC
+-	    && thd_flush_log_at_trx_commit(NULL) != 2) {
++	    && srv_flush_log_at_trx_commit != 2) {
+ 
+ 		fil_flush(group->space_id);
+ 	}
+@@ -1389,7 +1389,7 @@
+ #endif /* UNIV_DEBUG */
+ 	ulint		unlock;
+ 
+-	if (recv_no_ibuf_operations) {
++	if (recv_no_ibuf_operations || srv_fake_write) {
+ 		/* Recovery is running and no operations on the log files are
+ 		allowed yet (the variable name .._no_ibuf_.. is misleading) */
+ 
+@@ -3151,6 +3151,7 @@
+ 	for the 'very fast' shutdown, because the InnoDB layer may have
+ 	committed or prepared transactions and we don't want to lose them. */
+ 
++	if (!srv_apply_log_only) {
+ 	if (trx_n_mysql_transactions > 0
+ 	    || UT_LIST_GET_LEN(trx_sys->trx_list) > 0) {
+ 
+@@ -3158,6 +3159,7 @@
+ 
+ 		goto loop;
+ 	}
++	}
+ 
+ 	if (srv_fast_shutdown == 2) {
+ 		/* In this fastest shutdown we do not flush the buffer pool:
+--- a/storage/innobase/log/log0recv.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/log/log0recv.c	2011-03-15 07:56:47.000000000 -0700
+@@ -42,27 +42,27 @@
+ #include "trx0undo.h"
+ #include "trx0rec.h"
+ #include "fil0fil.h"
+-#ifndef UNIV_HOTBACKUP
++//#ifndef UNIV_HOTBACKUP
+ # include "buf0rea.h"
+ # include "srv0srv.h"
+ # include "srv0start.h"
+ # include "trx0roll.h"
+ # include "row0merge.h"
+ # include "sync0sync.h"
+-#else /* !UNIV_HOTBACKUP */
++//#else /* !UNIV_HOTBACKUP */
+ 
+ /** 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
+ directories which were not included */
+ UNIV_INTERN ibool	recv_replay_file_ops	= TRUE;
+-#endif /* !UNIV_HOTBACKUP */
++//#endif /* !UNIV_HOTBACKUP */
+ 
+ /** Log records are stored in the hash table in chunks at most of this size;
+ this must be less than UNIV_PAGE_SIZE as it is stored in the buffer pool */
+ #define RECV_DATA_BLOCK_SIZE	(MEM_MAX_ALLOC_IN_BUF - sizeof(recv_data_t))
+ 
+ /** Read-ahead area in applying log records to file pages */
+-#define RECV_READ_AHEAD_AREA	32
++#define RECV_READ_AHEAD_AREA	128
+ 
+ /** The recovery system */
+ UNIV_INTERN recv_sys_t*	recv_sys = NULL;
+@@ -631,7 +631,7 @@
+ /***********************************************************************//**
+ Checks the consistency of the checkpoint info
+ @return	TRUE if ok */
+-static
++//static
+ ibool
+ recv_check_cp_is_consistent(
+ /*========================*/
+@@ -661,7 +661,7 @@
+ /********************************************************//**
+ Looks for the maximum consistent checkpoint from the log groups.
+ @return	error code or DB_SUCCESS */
+-static
++//static
+ ulint
+ recv_find_max_checkpoint(
+ /*=====================*/
+@@ -850,7 +850,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 */
+-static
++//static
+ ibool
+ log_block_checksum_is_ok_or_old_format(
+ /*===================================*/
+@@ -2380,7 +2380,7 @@
+ 			   || type == MLOG_FILE_RENAME
+ 			   || type == MLOG_FILE_DELETE) {
+ 			ut_a(space);
+-#ifdef UNIV_HOTBACKUP
++//#ifdef UNIV_HOTBACKUP
+ 			if (recv_replay_file_ops) {
+ 
+ 				/* In ibbackup --apply-log, replay an .ibd file
+@@ -2403,7 +2403,7 @@
+ 					ut_error;
+ 				}
+ 			}
+-#endif
++//#endif
+ 			/* In normal mysqld crash recovery we do not try to
+ 			replay file operations */
+ #ifdef UNIV_LOG_LSN_DEBUG
+@@ -2820,8 +2820,11 @@
+ 
+ 			fprintf(stderr,
+ 				"InnoDB: Doing recovery: scanned up to"
+-				" log sequence number %llu\n",
+-				*group_scanned_lsn);
++				" log sequence number %llu (%lu %%)\n",
++				*group_scanned_lsn,
++				(ulong) (*group_scanned_lsn - srv_oldest_lsn)
++				/ (8 * log_group_get_capacity(UT_LIST_GET_FIRST(log_sys->log_groups))/900)
++			);
+ 		}
+ 	}
+ 
+@@ -2936,12 +2939,14 @@
+ 
+ 	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
+ 
++#ifdef UNDEFINED
+ 		fprintf(stderr,
+ 			"InnoDB: Restoring possible"
+ 			" half-written data pages from"
+ 			" the doublewrite\n"
+ 			"InnoDB: buffer...\n");
+-		trx_sys_doublewrite_init_or_restore_pages(TRUE);
++#endif
++		trx_sys_doublewrite_init_or_restore_pages(FALSE);
+ 	}
+ }
+ 
+@@ -3110,6 +3115,7 @@
+ 		recv_sys->recovered_lsn = checkpoint_lsn;
+ 
+ 		srv_start_lsn = checkpoint_lsn;
++		srv_oldest_lsn = checkpoint_lsn;
+ 	}
+ 
+ 	contiguous_lsn = ut_uint64_align_down(recv_sys->scanned_lsn,
+@@ -3475,6 +3481,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. */
++	if (!srv_apply_log_only)
+ 	trx_rollback_or_clean_recovered(FALSE);
+ }
+ 
+--- a/storage/innobase/os/os0file.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/os/os0file.c	2011-03-15 07:56:47.000000000 -0700
+@@ -660,7 +660,7 @@
+ }
+ 
+ #undef USE_FILE_LOCK
+-#define USE_FILE_LOCK
++//#define USE_FILE_LOCK
+ #if defined(UNIV_HOTBACKUP) || defined(__WIN__)
+ /* InnoDB Hot Backup does not lock the data files.
+  * On Windows, mandatory locking is used.
+@@ -1428,7 +1428,7 @@
+ #endif
+ #ifdef UNIV_NON_BUFFERED_IO
+ # ifndef UNIV_HOTBACKUP
+-		if (type == OS_LOG_FILE && thd_flush_log_at_trx_commit(NULL) == 2) {
++		if (type == OS_LOG_FILE && srv_flush_log_at_trx_commit == 2) {
+ 			/* Do not use unbuffered i/o to log files because
+ 			value 2 denotes that we do not flush the log at every
+ 			commit, but only once per second */
+@@ -1444,7 +1444,7 @@
+ 		attributes = 0;
+ #ifdef UNIV_NON_BUFFERED_IO
+ # ifndef UNIV_HOTBACKUP
+-		if (type == OS_LOG_FILE && thd_flush_log_at_trx_commit(NULL) == 2) {
++		if (type == OS_LOG_FILE && srv_flush_log_at_trx_commit == 2) {
+ 			/* Do not use unbuffered i/o to log files because
+ 			value 2 denotes that we do not flush the log at every
+ 			commit, but only once per second */
+@@ -1460,8 +1460,9 @@
+ 		attributes = 0;
+ 		ut_error;
+ 	}
+-
++	share_mode |= FILE_SHARE_WRITE; /* Why? */
+ 	file = CreateFile((LPCTSTR) name,
++			  (srv_read_only && create_flag == OPEN_EXISTING) ? GENERIC_READ :
+ 			  GENERIC_READ | GENERIC_WRITE, /* read and write
+ 							access */
+ 			  share_mode,	/* File can be read also by other
+@@ -1520,7 +1521,11 @@
+ 	if (create_mode == OS_FILE_OPEN || create_mode == OS_FILE_OPEN_RAW
+ 	    || create_mode == OS_FILE_OPEN_RETRY) {
+ 		mode_str = "OPEN";
+-		create_flag = O_RDWR;
++		if (srv_read_only) {
++			create_flag = O_RDONLY;
++		} else {
++			create_flag = O_RDWR;
++		}
+ 	} else if (create_mode == OS_FILE_CREATE) {
+ 		mode_str = "CREATE";
+ 		create_flag = O_RDWR | O_CREAT | O_EXCL;
+@@ -2732,6 +2737,9 @@
+ 	ut_a((offset & 0xFFFFFFFFUL) == offset);
+ 	ut_a((n & 0xFFFFFFFFUL) == n);
+ 
++	if (srv_fake_write)
++		return(TRUE);
++
+ 	os_n_file_writes++;
+ 
+ 	ut_ad(file);
+@@ -2856,6 +2864,9 @@
+ #else
+ 	ssize_t	ret;
+ 
++	if (srv_fake_write)
++		return(TRUE);
++
+ 	ret = os_file_pwrite(file, buf, n, offset, offset_high);
+ 
+ 	if ((ulint)ret == n) {
+--- a/storage/innobase/os/os0thread.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/os/os0thread.c	2011-03-15 07:56:47.000000000 -0700
+@@ -266,12 +266,17 @@
+ #ifdef __WIN__
+ 	Sleep((DWORD) tm / 1000);
+ #else
++	/* select() simetimes hang up from xtrabackup */
++	/* change to use usleep() for now */
++	usleep(tm);
++/*
+ 	struct timeval	t;
+ 
+ 	t.tv_sec = tm / 1000000;
+ 	t.tv_usec = tm % 1000000;
+ 
+ 	select(0, NULL, NULL, NULL, &t);
++*/
+ #endif
+ }
+ 
+--- a/storage/innobase/row/row0merge.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/row/row0merge.c	2011-03-15 07:56:47.000000000 -0700
+@@ -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);
+ }
+@@ -1485,8 +1487,10 @@
+ 		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);
++				fprintf(stderr, "InnoDB: Error: row_merge_blocks() is called.\n");
++				ut_error;
+ 				mem_heap_free(heap);
+ 				return(DB_DUPLICATE_KEY);
+ 			}
+@@ -2613,7 +2617,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	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/srv/srv0srv.c	2011-03-15 07:56:47.000000000 -0700
+@@ -197,8 +197,7 @@
+ UNIV_INTERN ulint	srv_log_file_size	= ULINT_MAX;
+ /* size in database pages */
+ UNIV_INTERN ulint	srv_log_buffer_size	= ULINT_MAX;
+-//UNIV_INTERN ulong	srv_flush_log_at_trx_commit = 1;
+-UNIV_INTERN char	srv_use_global_flush_log_at_trx_commit	= TRUE;
++UNIV_INTERN ulong	srv_flush_log_at_trx_commit = 1;
+ 
+ /* Try to flush dirty pages so as to avoid IO bursts at
+ the checkpoints. */
+@@ -449,6 +448,10 @@
+ UNIV_INTERN ulint	srv_dict_size_limit = 0;
+ 
+ UNIV_INTERN ulint	srv_lazy_drop_table = 0;
++
++UNIV_INTERN ibool	srv_read_only   = FALSE;
++UNIV_INTERN ibool	srv_fake_write  = FALSE;
++UNIV_INTERN ibool	srv_apply_log_only = FALSE;
+ /*-------------------------------------------*/
+ UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
+ UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
+@@ -1148,7 +1151,7 @@
+ 	}
+ 
+ 	/* Initialize some INFORMATION SCHEMA internal structures */
+-	trx_i_s_cache_init(trx_i_s_cache);
++	//trx_i_s_cache_init(trx_i_s_cache);
+ }
+ 
+ /*********************************************************************//**
+@@ -1159,6 +1162,7 @@
+ /*==========*/
+ {
+ 	os_fast_mutex_free(&srv_conc_mutex);
++#ifdef UNDEFINED
+ 	mem_free(srv_conc_slots);
+ 	srv_conc_slots = NULL;
+ 
+@@ -1172,6 +1176,7 @@
+ 	srv_mysql_table = NULL;
+ 
+ 	trx_i_s_cache_free(trx_i_s_cache);
++#endif
+ }
+ 
+ /*********************************************************************//**
+@@ -1876,7 +1881,7 @@
+ 		}
+ 
+ 		/* Record the lock wait time for this thread */
+-		thd_set_lock_wait_time(trx->mysql_thd, diff_time);
++		//thd_set_lock_wait_time(trx->mysql_thd, diff_time);
+ 	}
+ 
+ 	if (trx->was_chosen_as_deadlock_victim) {
+--- a/storage/innobase/srv/srv0start.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/srv/srv0start.c	2011-03-15 07:56:47.000000000 -0700
+@@ -94,6 +94,8 @@
+ /** Log sequence number at shutdown */
+ UNIV_INTERN ib_uint64_t	srv_shutdown_lsn;
+ 
++UNIV_INTERN ib_uint64_t srv_oldest_lsn;
++
+ #ifdef HAVE_DARWIN_THREADS
+ # include <sys/utsname.h>
+ /** TRUE if the F_FULLFSYNC option is available */
+@@ -549,7 +551,7 @@
+ /*********************************************************************//**
+ Creates or opens the log files and closes them.
+ @return	DB_SUCCESS or error code */
+-static
++//static
+ ulint
+ open_or_create_log_file(
+ /*====================*/
+@@ -709,7 +711,7 @@
+ /*********************************************************************//**
+ Creates or opens database data files and closes them.
+ @return	DB_SUCCESS or error code */
+-static
++//static
+ ulint
+ open_or_create_data_files(
+ /*======================*/
+@@ -1868,6 +1870,10 @@
+ 		are initialized in trx_sys_init_at_db_start(). */
+ 
+ 		recv_recovery_from_checkpoint_finish();
++
++		if (srv_apply_log_only)
++			goto skip_processes;
++
+ 		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
+@@ -2042,6 +2048,17 @@
+ 	if (!srv_auto_extend_last_data_file
+ 	    && sum_of_data_file_sizes != tablespace_size_in_header) {
+ 
++		/* extend table space size aligning with header */
++		ulint	actual_size;
++		fil_extend_space_to_desired_size(&actual_size, 0, tablespace_size_in_header);
++		if (actual_size < tablespace_size_in_header) {
++			fprintf(stderr,
++"InnoDB: Warning: To extend tablespace size aligning with header seems to be failed.\n"
++"InnoDB: The acutual size %lu must be larger than %lu.\n",
++				(ulong) actual_size,
++				(ulong) tablespace_size_in_header);
++		}
++#ifdef UNDEFINED
+ 		ut_print_timestamp(stderr);
+ 		fprintf(stderr,
+ 			" InnoDB: Error: tablespace size"
+@@ -2121,6 +2138,7 @@
+ 
+ 			return(DB_ERROR);
+ 		}
++#endif
+ 	}
+ 
+ 	/* Check that os_fast_mutexes work as expected */
+@@ -2240,6 +2258,7 @@
+ 		ibuf_update_max_tablespace_id();
+ 	}
+ 
++skip_processes:
+ 	srv_file_per_table = srv_file_per_table_original_value;
+ 
+ 	srv_was_started = TRUE;
+--- a/storage/innobase/trx/trx0purge.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/trx/trx0purge.c	2011-03-15 07:56:47.000000000 -0700
+@@ -1100,6 +1100,9 @@
+ 	/*	que_thr_t*	thr2; */
+ 	ulint		old_pages_handled;
+ 
++	if (srv_fake_write)
++		return(0);
++
+ 	mutex_enter(&(purge_sys->mutex));
+ 
+ 	if (purge_sys->trx->n_active_thrs > 0) {
+--- a/storage/innobase/trx/trx0rseg.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/trx/trx0rseg.c	2011-03-15 07:56:47.000000000 -0700
+@@ -140,9 +140,11 @@
+ 
+ 	mutex_free(&rseg->mutex);
+ 
++	if (!srv_apply_log_only) {
+ 	/* There can't be any active transactions. */
+ 	ut_a(UT_LIST_GET_LEN(rseg->update_undo_list) == 0);
+ 	ut_a(UT_LIST_GET_LEN(rseg->insert_undo_list) == 0);
++	}
+ 
+ 	undo = UT_LIST_GET_FIRST(rseg->update_undo_cached);
+ 
+--- a/storage/innobase/trx/trx0sys.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/trx/trx0sys.c	2011-03-15 07:56:47.000000000 -0700
+@@ -1938,10 +1938,12 @@
+ 		UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
+ 	}
+ 
++	if (!srv_apply_log_only) {
+ 	ut_a(UT_LIST_GET_LEN(trx_sys->trx_list) == 0);
+ 	ut_a(UT_LIST_GET_LEN(trx_sys->rseg_list) == 0);
+ 	ut_a(UT_LIST_GET_LEN(trx_sys->view_list) == 0);
+ 	ut_a(UT_LIST_GET_LEN(trx_sys->mysql_trx_list) == 0);
++	}
+ 
+ 	mem_free(trx_sys);
+ 
+--- a/storage/innobase/trx/trx0trx.c	2011-03-15 07:56:04.000000000 -0700
++++ b/storage/innobase/trx/trx0trx.c	2011-03-15 07:56:47.000000000 -0700
+@@ -505,8 +505,8 @@
+ 						(ullint) trx->id);
+ 
+ 					if (srv_force_recovery == 0) {
+-
+-						trx->conc_state = TRX_PREPARED;
++						/* xtrabackup should rollback it */
++						trx->conc_state = TRX_ACTIVE;
+ 					} else {
+ 						fprintf(stderr,
+ 							"InnoDB: Since"
+@@ -580,9 +580,9 @@
+ 							(ullint) trx->id);
+ 
+ 						if (srv_force_recovery == 0) {
+-
++							/* xtrabackup should rollback it */
+ 							trx->conc_state
+-								= TRX_PREPARED;
++								= TRX_ACTIVE;
+ 						} else {
+ 							fprintf(stderr,
+ 								"InnoDB: Since"
+@@ -925,7 +925,6 @@
+ 	trx->read_view = NULL;
+ 
+ 	if (lsn) {
+-		ulint	flush_log_at_trx_commit;
+ 
+ 		mutex_exit(&kernel_mutex);
+ 
+@@ -934,12 +933,6 @@
+ 			trx_undo_insert_cleanup(trx);
+ 		}
+ 
+-		if (srv_use_global_flush_log_at_trx_commit) {
+-			flush_log_at_trx_commit = thd_flush_log_at_trx_commit(NULL);
+-		} else {
+-			flush_log_at_trx_commit = thd_flush_log_at_trx_commit(trx->mysql_thd);
+-		}
+-
+ 		/* NOTE that we could possibly make a group commit more
+ 		efficient here: call os_thread_yield here to allow also other
+ 		trxs to come to commit! */
+@@ -971,9 +964,9 @@
+ 		if (trx->flush_log_later) {
+ 			/* Do nothing yet */
+ 			trx->must_flush_log_later = TRUE;
+-		} else if (flush_log_at_trx_commit == 0) {
++		} else if (srv_flush_log_at_trx_commit == 0) {
+ 			/* Do nothing */
+-		} else if (flush_log_at_trx_commit == 1) {
++		} else if (srv_flush_log_at_trx_commit == 1) {
+ 			if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
+ 				/* Write the log but do not flush it to disk */
+ 
+@@ -985,7 +978,7 @@
+ 
+ 				log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
+ 			}
+-		} else if (flush_log_at_trx_commit == 2) {
++		} else if (srv_flush_log_at_trx_commit == 2) {
+ 
+ 			/* Write the log but do not flush it to disk */
+ 
+@@ -1665,23 +1658,16 @@
+ 	trx_t*	trx)	/*!< in: trx handle */
+ {
+ 	ib_uint64_t	lsn	= trx->commit_lsn;
+-	ulint		flush_log_at_trx_commit;
+ 
+ 	ut_a(trx);
+ 
+ 	trx->op_info = "flushing log";
+ 
+-	if (srv_use_global_flush_log_at_trx_commit) {
+-		flush_log_at_trx_commit = thd_flush_log_at_trx_commit(NULL);
+-	} else {
+-		flush_log_at_trx_commit = thd_flush_log_at_trx_commit(trx->mysql_thd);
+-	}
+-
+ 	if (!trx->must_flush_log_later) {
+ 		/* Do nothing */
+-	} else if (flush_log_at_trx_commit == 0) {
++	} else if (srv_flush_log_at_trx_commit == 0) {
+ 		/* Do nothing */
+-	} else if (flush_log_at_trx_commit == 1) {
++	} else if (srv_flush_log_at_trx_commit == 1) {
+ 		if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
+ 			/* Write the log but do not flush it to disk */
+ 
+@@ -1692,7 +1678,7 @@
+ 
+ 			log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
+ 		}
+-	} else if (flush_log_at_trx_commit == 2) {
++	} else if (srv_flush_log_at_trx_commit == 2) {
+ 
+ 		/* Write the log but do not flush it to disk */
+ 
+@@ -1945,7 +1931,6 @@
+ 	/*--------------------------------------*/
+ 
+ 	if (lsn) {
+-		ulint	flush_log_at_trx_commit;
+ 
+ 		/* Depending on the my.cnf options, we may now write the log
+ 		buffer to the log files, making the prepared state of the
+@@ -1966,15 +1951,9 @@
+ 
+ 		mutex_exit(&kernel_mutex);
+ 
+-		if (srv_use_global_flush_log_at_trx_commit) {
+-			flush_log_at_trx_commit = thd_flush_log_at_trx_commit(NULL);
+-		} else {
+-			flush_log_at_trx_commit = thd_flush_log_at_trx_commit(trx->mysql_thd);
+-		}
+-
+-		if (flush_log_at_trx_commit == 0) {
++		if (srv_flush_log_at_trx_commit == 0) {
+ 			/* Do nothing */
+-		} else if (flush_log_at_trx_commit == 1) {
++		} else if (srv_flush_log_at_trx_commit == 1) {
+ 			if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
+ 				/* Write the log but do not flush it to disk */
+ 
+@@ -1986,7 +1965,7 @@
+ 
+ 				log_write_up_to(lsn, LOG_WAIT_ONE_GROUP, TRUE);
+ 			}
+-		} else if (flush_log_at_trx_commit == 2) {
++		} else if (srv_flush_log_at_trx_commit == 2) {
+ 
+ 			/* Write the log but do not flush it to disk */
+ 

=== modified file 'utils/build.sh'
--- utils/build.sh	2011-03-13 15:52:22 +0000
+++ utils/build.sh	2011-03-15 21:59:23 +0000
@@ -17,9 +17,16 @@
 fi
 MAKE_CMD="$MAKE_CMD -j6"
 
-function usage(){
-	echo "Usage: `basename $0` 5.1|5.5|plugin|xtradb"
-	exit -1
+function usage()
+{
+    echo "Build an xtrabackup binary against the specified InnoDB flavor."
+    echo
+    echo "Usage: `basename $0` CODEBASE"
+    echo "where CODEBASE can be one of the following values or aliases:"
+    echo "  innodb51_builtin | 5.1	build against built-in InnoDB in MySQL 5.1"
+    echo "  xtradb51         | xtradb   build against Percona Server with XtraDB 5.1"
+    echo "  xtradb55         | xtradb55 build against Percona Server with XtraDB 5.5"
+    exit -1
 }
 
 ################################################################################
@@ -52,7 +59,7 @@
 {
     tar xzf $top_dir/$1
     cd `basename "$1" ".tar.gz"`
-    patch -p1 < $top_dir/$2
+    patch -p1 < $top_dir/patches/$2
     cd ..
 }
 
@@ -104,7 +111,7 @@
 # Expects the following variables to be set before calling:
 #   mysql_version	version string (e.g. "5.1.53")
 #   server_patch	name of the patch to apply to server source before
-#                       building (e.g. "fix_innodb_for_backup51.patch")
+#                       building (e.g. "xtradb51.patch")
 #   innodb_name		either "innobase" or "innodb_plugin"
 #   configure_cmd	server configure command
 #   xtrabackup_target	'make' target to build in the xtrabackup build directory
@@ -142,9 +149,9 @@
 top_dir=`pwd`
 
 case "$type" in
-"5.1")
+"innodb51_builtin" | "5.1")
 	mysql_version=$MYSQL_51_VERSION
-	server_patch=fix_innodb_for_backup51.patch
+	server_patch=innodb51_builtin.patch
 	innodb_name=innobase
 	xtrabackup_target=5.1
 	configure_cmd="./configure --enable-local-infile \
@@ -156,11 +163,58 @@
 
 	build_all
 	;;
-"5.5")
-	mysql_version=$MYSQL_55_VERSION
-	server_patch=fix_innodb_for_backup55.patch
-	innodb_name=innobase
-	xtrabackup_target=5.5
+"xtradb51" | "xtradb")
+	server_dir=$top_dir/Percona-Server
+	branch_dir=percona-server-5.1-xtrabackup
+	innodb_dir=$server_dir/storage/innodb_plugin
+	build_dir=$innodb_dir/xtrabackup
+	xtrabackup_target=xtradb
+	configure_cmd="./configure --enable-local-infile \
+	    --enable-thread-safe-client \
+	    --with-plugins=innodb_plugin \
+	    --with-zlib-dir=bundled \
+	    --enable-shared \
+	    --with-extra-charsets=complex"
+	if [ "`uname -s`" = "Linux" ]
+	then
+		configure_cmd="LIBS=-lrt $configure_cmd"
+	fi
+
+
+	echo "Downloading sources"
+	
+	auto_download libtar-1.2.11.tar.gz
+
+	# Get Percona Server
+	if [ -d $branch_dir ]
+	then
+	    cd $branch_dir
+	    bzr pull
+	else
+	    bzr branch lp:~percona-dev/percona-server/$branch_dir $branch_dir
+	    cd $branch_dir
+	fi
+
+	$MAKE_CMD main
+	rm -rf $server_dir
+	mv Percona-Server $top_dir
+
+	# Patch Percona Server
+	cd $server_dir
+	patch -p1 < $top_dir/patches/xtradb51.patch
+
+	build_server
+
+	build_xtrabackup
+
+	build_tar4ibd
+	;;
+"xtradb55")
+	server_dir=$top_dir/Percona-Server-5.5
+	branch_dir=percona-server-5.5-xtrabackup
+	innodb_dir=$server_dir/storage/innobase
+	build_dir=$innodb_dir/xtrabackup
+	xtrabackup_target=xtradb55
 	# We need to build with partitioning due to MySQL bug #58632
 	configure_cmd="cmake . \
 		-DENABLED_LOCAL_INFILE=ON \
@@ -169,34 +223,6 @@
 		-DWITH_ZLIB=bundled \
 		-DWITH_EXTRA_CHARSETS=complex \
 		-DENABLE_DTRACE=OFF"
-
-	build_all
-	;;
-"plugin")
-	mysql_version=$MYSQL_51_VERSION
-	server_patch=fix_innodb_for_backup_5.1_plugin.patch
-	innodb_name=innodb_plugin
-	xtrabackup_target=plugin
-	configure_cmd="./configure --enable-local-infile \
-	    --enable-thread-safe-client \
-	    --with-plugins=innodb_plugin \
-	    --with-zlib-dir=bundled \
-	    --enable-shared \
-	    --with-extra-charsets=complex"
-
-	build_all
-	;;
-"xtradb")
-	server_dir=$top_dir/Percona-Server
-	branch_dir=percona-server-5.1-xtrabackup
-	innodb_dir=$server_dir/storage/innodb_plugin
-	build_dir=$innodb_dir/xtrabackup
-	configure_cmd="./configure --enable-local-infile \
-	    --enable-thread-safe-client \
-	    --with-plugins=innodb_plugin \
-	    --with-zlib-dir=bundled \
-	    --enable-shared \
-	    --with-extra-charsets=complex"
 	if [ "`uname -s`" = "Linux" ]
 	then
 		configure_cmd="LIBS=-lrt $configure_cmd"
@@ -217,14 +243,13 @@
 	    cd $branch_dir
 	fi
 
-	$MAKE_CMD main
+	$MAKE_CMD PERCONA_SERVER=Percona-Server-5.5 main
 	rm -rf $server_dir
-	mv Percona-Server $top_dir
+	mv Percona-Server-5.5 $top_dir
 
 	# Patch Percona Server
 	cd $server_dir
-	patch -p1 < $top_dir/fix_innodb_for_backup_percona-server.patch
-
+	patch -p1 < $top_dir/patches/xtradb55.patch
 
 	build_server
 

=== removed file 'utils/build51tree.sh'
--- utils/build51tree.sh	2009-12-07 07:25:13 +0000
+++ utils/build51tree.sh	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# helper script to prepare MySQL tree for xtrabackup build
-# tested with mysql-5.0.75 / .77
-# $1 - path to mysql .tar.gz
-set -e
-PATHS=$1
-DIRDST=`dirname $PATHS`
-DRNAME=`basename $PATHS .tar.gz`
-
-mkdir -p $DIRDST/xtrabackup-build
-
-tar xfz $PATHS -C $DIRDST/xtrabackup-build
-cp ../fix_innodb_for_backup51.patch $DIRDST/xtrabackup-build/$DRNAME/storage
-
-mkdir -p  $DIRDST/xtrabackup-build/$DRNAME/storage/innobase/xtrabackup
-cp -R ../* $DIRDST/xtrabackup-build/$DRNAME/storage/innobase/xtrabackup 
-pushd $DIRDST/xtrabackup-build/$DRNAME
-cd storage
-patch -p1 < fix_innodb_for_backup51.patch
-cd ..
-./configure
-if test -f /proc/cpuinfo
-then
-	n_proc=`grep ^processor.: /proc/cpuinfo | wc -l`
-else
-	n_proc=1
-fi
-make -j$n_proc
-cd storage/innobase/xtrabackup
-make

=== removed file 'utils/buildtree.sh'
--- utils/buildtree.sh	2009-12-07 07:25:13 +0000
+++ utils/buildtree.sh	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# helper script to prepare MySQL tree for xtrabackup build
-# tested with mysql-5.0.75 / .77
-# $1 - path to mysql .tar.gz
-set -e
-PATHS=$1
-DIRDST=`dirname $PATHS`
-DRNAME=`basename $PATHS .tar.gz`
-
-mkdir -p $DIRDST/xtrabackup-build
-
-tar xfz $PATHS -C $DIRDST/xtrabackup-build
-cp ../fix_innodb_for_backup.patch $DIRDST/xtrabackup-build/$DRNAME
-mkdir -p  $DIRDST/xtrabackup-build/$DRNAME/innobase/xtrabackup
-cp -R ../* $DIRDST/xtrabackup-build/$DRNAME/innobase/xtrabackup 
-pushd $DIRDST/xtrabackup-build/$DRNAME
-patch -p1 < fix_innodb_for_backup.patch
-
-./configure --with-extra-charsets=complex
-if test -f /proc/cpuinfo
-then
-        n_proc=`grep ^processor.: /proc/cpuinfo | wc -l`
-else
-        n_proc=1
-fi
-make -j$n_proc
-cd innobase/xtrabackup
-make

=== removed file 'utils/prepare_tree_for_rpm.sh'
--- utils/prepare_tree_for_rpm.sh	2009-06-18 06:05:21 +0000
+++ utils/prepare_tree_for_rpm.sh	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-# helper script to prepare MySQL tree for xtrabackup build
-# tested with mysql-5.0.75 / .77
-# $1 - path to mysql .tar.gz
-
-BV=0.8
-
-PATHS=$1
-DIRDST=`dirname $PATHS`
-DRNAME=`basename $PATHS .tar.gz`
-
-mkdir -p $DIRDST/xtrabackup-build
-
-rm -fr $DIRDST/xtrabackup-build/$DRNAME 
-
-tar xfz $PATHS -C $DIRDST/xtrabackup-build
-cp ../fix_innodb_for_backup.patch $DIRDST/xtrabackup-build/$DRNAME
-mkdir -p  $DIRDST/xtrabackup-build/$DRNAME/innobase/xtrabackup
-cp ../* $DIRDST/xtrabackup-build/$DRNAME/innobase/xtrabackup 
-pushd $DIRDST/xtrabackup-build/$DRNAME
-patch -p1 < fix_innodb_for_backup.patch
-
-cd ..
-mv $DIRDST/xtrabackup-build/$DRNAME/ $DIRDST/xtrabackup-build/xtrabackup-$BV
-
-tar cfz xtrabackup-$BV.tar.gz xtrabackup-$BV
-cp xtrabackup-$BV.tar.gz /usr/src/redhat/SOURCES/
-
-#./configure
-#make -j8
-#cd innobase/xtrabackup
-#make

=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-03-13 15:52:22 +0000
+++ xtrabackup.c	2011-03-15 21:59:23 +0000
@@ -486,6 +486,9 @@
 struct fil_system_struct {
 #ifndef UNIV_HOTBACKUP
 	mutex_t		mutex;		/*!< The mutex protecting the cache */
+#ifdef XTRADB55
+	mutex_t		file_extend_mutex;
+#endif
 #endif /* !UNIV_HOTBACKUP */
 	hash_table_t*	spaces;		/*!< The hash table of spaces in the
 					system; they are hashed on the space
@@ -1950,9 +1953,10 @@
 
 #ifdef XTRADB_BASED
 	srv_doublewrite_file = innobase_doublewrite_file;
-
+#ifndef XTRADB55
 	srv_extra_undoslots = (ibool) innobase_extra_undoslots;
 #endif
+#endif
 
 	/* -------------- Log files ---------------------------*/