Merge lp:~dveeden/percona-xtrabackup/lp733665 into lp:percona-xtrabackup/2.0

[Daniël van Eeden]

[Alexey Kopytov (akopytov)]

Superseded with https://code.launchpad.net/~akopytov/percona-xtrabackup/mariadb-support-2.0/+merge/131766

Unmerged revisions

311. By Daniël van Eeden on 2011-09-23

Set sql_mode to NO_ENGINE_SUBSTITUTION and only run the Aria test on MariaDB

310. By Daniël van Eeden on 2011-09-23

Add test for backup of Aria engine

309. By Daniël van Eeden on 2011-09-23

Also backup .MAD and .MAI for the Aria engine.

308. By Daniël van Eeden on 2011-09-23

Check wget return code.

307. By Daniël van Eeden on 2011-09-23

Allow compilation against MariaDB 5.3

306. By Daniël van Eeden on 2011-09-21

Add SHA1 sum verification to bootstrap.sh

305. By Daniël van Eeden on 2011-09-21

Add MariaDB 5.3 to bootstrap.sh

304. By Daniël van Eeden on 2011-09-20

Initial support for MariaDB added to the test run.

303. By Daniël van Eeden on 2011-09-14

Initial MariaDB support

=== modified file 'Makefile'
--- Makefile	2011-10-05 02:31:10 +0000
+++ Makefile	2011-10-10 06:52:24 +0000
@@ -114,6 +114,44 @@
 xtradb: TARGET := xtrabackup 
 xtradb: $(TARGET)
 
+# MariaDB with XtraDB 
+mariadb: INC=-I. -isystem.. -isystem./../include -isystem./../../include -isystem./../../../include
+mariadb: LIBS += -lrt
+mariadb: INNODBOBJS = ../libxtradb_la-btr0btr.o ../libxtradb_la-btr0cur.o ../libxtradb_la-btr0pcur.o \
+	../libxtradb_la-btr0sea.o ../libxtradb_la-buf0buddy.o ../libxtradb_la-buf0buf.o \
+	../libxtradb_la-buf0flu.o ../libxtradb_la-buf0lru.o ../libxtradb_la-buf0rea.o \
+	../libxtradb_la-data0data.o ../libxtradb_la-data0type.o ../libxtradb_la-dict0boot.o \
+	../libxtradb_la-dict0crea.o ../libxtradb_la-dict0dict.o ../libxtradb_la-dict0load.o \
+	../libxtradb_la-dict0mem.o ../libxtradb_la-dyn0dyn.o ../libxtradb_la-eval0eval.o \
+	../libxtradb_la-eval0proc.o ../libxtradb_la-fil0fil.o ../libxtradb_la-fsp0fsp.o \
+	../libxtradb_la-fut0fut.o ../libxtradb_la-fut0lst.o ../libxtradb_la-ha0ha.o \
+	../libxtradb_la-ha0storage.o ../libxtradb_la-hash0hash.o ../libxtradb_la-ibuf0ibuf.o \
+	../libxtradb_la-lock0iter.o ../libxtradb_la-lock0lock.o ../libxtradb_la-log0log.o \
+	../libxtradb_la-log0recv.o ../libxtradb_la-mach0data.o ../libxtradb_la-mem0mem.o \
+	../libxtradb_la-mem0pool.o ../libxtradb_la-mtr0log.o ../libxtradb_la-mtr0mtr.o \
+	../libxtradb_la-os0file.o ../libxtradb_la-os0proc.o ../libxtradb_la-os0sync.o \
+	../libxtradb_la-os0thread.o ../libxtradb_la-page0cur.o ../libxtradb_la-page0page.o \
+	../libxtradb_la-page0zip.o ../libxtradb_la-lexyy.o ../libxtradb_la-pars0grm.o \
+	../libxtradb_la-pars0opt.o ../libxtradb_la-pars0pars.o ../libxtradb_la-pars0sym.o \
+	../libxtradb_la-que0que.o ../libxtradb_la-read0read.o ../libxtradb_la-rem0cmp.o \
+	../libxtradb_la-rem0rec.o ../libxtradb_la-row0ext.o ../libxtradb_la-row0ins.o \
+	../libxtradb_la-row0merge.o ../libxtradb_la-row0mysql.o ../libxtradb_la-row0purge.o \
+	../libxtradb_la-row0row.o ../libxtradb_la-row0sel.o ../libxtradb_la-row0uins.o \
+	../libxtradb_la-row0umod.o ../libxtradb_la-row0undo.o ../libxtradb_la-row0upd.o \
+	../libxtradb_la-row0vers.o ../libxtradb_la-srv0que.o ../libxtradb_la-srv0srv.o \
+	../libxtradb_la-srv0start.o ../libxtradb_la-sync0arr.o ../libxtradb_la-sync0rw.o \
+	../libxtradb_la-sync0sync.o ../libxtradb_la-thr0loc.o ../libxtradb_la-trx0purge.o \
+	../libxtradb_la-trx0rec.o ../libxtradb_la-trx0roll.o ../libxtradb_la-trx0rseg.o \
+	../libxtradb_la-trx0sys.o ../libxtradb_la-trx0trx.o ../libxtradb_la-trx0undo.o \
+	../libxtradb_la-usr0sess.o ../libxtradb_la-ut0byte.o ../libxtradb_la-ut0dbg.o \
+	../libxtradb_la-ut0list.o ../libxtradb_la-ut0mem.o ../libxtradb_la-ut0rnd.o \
+	../libxtradb_la-ut0ut.o ../libxtradb_la-ut0vec.o ../libxtradb_la-ut0wqueue.o \
+	../libxtradb_la-ut0rbt.o
+mariadb: MYSQLOBJS = ../../../mysys/libmysys.a ../../../strings/libmystrings.a ../../../zlib/.libs/libzlt.a ../../../dbug/libdbug.a
+mariadb: DEFS += -DXTRADB_BASED -DMARIADB_BASED
+mariadb: TARGET := xtrabackup 
+mariadb: $(TARGET)
+
 # XtraBackup for XtraDB 5.5
 xtradb55: INC=-I. -isystem.. -isystem./../include -isystem./../../include -isystem./../../../include
 xtradb55: INNODBOBJS = ../libinnobase.a

=== modified file 'innobackupex'
--- innobackupex	2011-10-05 02:31:10 +0000
+++ innobackupex	2011-10-10 06:52:24 +0000
@@ -387,7 +387,7 @@
 
     write_slave_info() if $option_slave_info;
 
-    # backup .frm, .MRG, .MYD, .MYI, .TRG, .TRN, .ARM, .ARZ, .CSM, .CSV and .opt files
+    # backup .frm, .MRG, .MYD, .MYI, .MAD, .MAI, .TRG, .TRN, .ARM, .ARZ, .CSM, .CSV and .opt files
     backup_files();
 
     # resume ibbackup and wait till it has finished
@@ -1799,13 +1799,13 @@
     my @list;
     my $file;
     my $database;
-    my $wildcard = '*.{frm,MYD,MYI,MRG,TRG,TRN,ARM,ARZ,CSM,CSV,opt,par}';
+    my $wildcard = '*.{frm,MYD,MYI,MAD,MAI,MRG,TRG,TRN,ARM,ARZ,CSM,CSV,opt,par}';
 
     opendir(DIR, $source_dir) 
         || Die "Can't open directory '$source_dir': $!\n";
     $now = current_time();
     print STDERR "\n$now  $prefix Starting to backup .frm, .MRG, .MYD, .MYI,\n";
-    print STDERR "$prefix .TRG, .TRN, .ARM, .ARZ, .CSM, .CSV and .opt files in\n";
+    print STDERR "$prefix .TRG, .TRN, .ARM, .ARZ, .CSM, .CSV, .MAD, .MAI and .opt files in\n";
     print STDERR "$prefix subdirectories of '$source_dir'\n";
     # loop through all database directories
     while (defined($database = readdir(DIR))) {
@@ -1832,7 +1832,7 @@
 
         # copy files of this database
 	opendir(DBDIR, "$source_dir/$database");
-	@list = grep(/\.(frm)|(MYD)|(MYI)|(MRG)|(TRG)|(TRN)|(ARM)|(ARZ)|(CSM)|(CSV)|(opt)|(par)$/, readdir(DBDIR)); 
+	@list = grep(/\.(frm)|(MYD)|(MYI)|(MAD)|(MAI)|(MRG)|(TRG)|(TRN)|(ARM)|(ARZ)|(CSM)|(CSV)|(opt)|(par)$/, readdir(DBDIR)); 
 	closedir DBDIR;
         $file_c = @list;
         if ($file_c <= $backup_file_print_limit) {
@@ -1888,7 +1888,7 @@
     closedir(DIR);
 
     $now = current_time();
-    print STDERR "$now  $prefix Finished backing up .frm, .MRG, .MYD, .MYI, .TRG, .TRN, .ARM, .ARZ, .CSV, .CSM and .opt files\n\n";
+    print STDERR "$now  $prefix Finished backing up .frm, .MRG, .MYD, .MYI, .MAD, .MAI, .TRG, .TRN, .ARM, .ARZ, .CSV, .CSM and .opt files\n\n";
 }
 
 
@@ -2248,6 +2248,8 @@
 #  MySQL 5.1.* with InnoDB plugin - xtrabackup
 #  Percona Server >= 11.0 - xtrabackup
 #  MySQL 5.5.* - xtrabackup_55 
+#  MariaDB 5.2.* - xtrabackup
+#  MariaDB 5.3.* - xtrabackup
 
 my @lines;
 my $var_version = '';
@@ -2276,6 +2278,12 @@
 if($var_version =~ m/5\.1\.\d/ and $var_innodb_version =~ m/1\.0\.\d+-\d/){
 	$ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup');
 }
+if($var_version =~ m/5\.2\.\d/){
+	$ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup');
+}
+if($var_version =~ m/5\.3\.\d/){
+	$ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup');
+}
 if($var_version =~ m/5\.5\.\d/){
 	$ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup_55');
 }
@@ -2385,7 +2393,8 @@
 command makes a complete backup of all MyISAM and InnoDB tables and
 indexes in all databases or in all of the databases specified with the
 --databases option.  The created backup contains .frm, .MRG, .MYD,
-.MYI, .TRG, .TRN, .ARM, .ARZ, .CSM, CSV, .opt, .par, and InnoDB data and log files.
+.MYI, .MAD, .MAI, .TRG, .TRN, .ARM, .ARZ, .CSM, CSV, .opt, .par, and 
+InnoDB data and log files.
 The MY.CNF options file defines the location of the database.  This command
 connects to the MySQL server using the mysql client program, and runs
 xtrabackup as a child process.

=== added file 'patches/mariadb53.patch'
--- patches/mariadb53.patch	1970-01-01 00:00:00 +0000
+++ patches/mariadb53.patch	2011-10-10 06:52:24 +0000
@@ -0,0 +1,1262 @@
+diff -ruN a/storage/xtradb/btr/btr0btr.c b/storage/xtradb/btr/btr0btr.c
+--- a/storage/xtradb/btr/btr0btr.c
++++ b/storage/xtradb/btr/btr0btr.c
+@@ -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(
+ /*===================*/
+diff -ruN a/storage/xtradb/buf/buf0buf.c b/storage/xtradb/buf/buf0buf.c
+--- a/storage/xtradb/buf/buf0buf.c
++++ b/storage/xtradb/buf/buf0buf.c
+@@ -440,7 +440,7 @@
+ 		return(TRUE);
+ 	}
+ 
+-#ifndef UNIV_HOTBACKUP
++#ifdef UNDEFINED
+ 	if (recv_lsn_checks_on) {
+ 		ib_uint64_t	current_lsn;
+ 
+@@ -2671,7 +2671,9 @@
+ 	ut_ad(zip_size == fil_space_get_zip_size(space));
+ 	ut_ad(ut_is_2pow(zip_size));
+ #ifndef UNIV_LOG_DEBUG
+-	ut_ad(!ibuf_inside() || ibuf_page(space, zip_size, offset, NULL));
++	/* ibuf_page() always returns FALSE with srv_fake_write=1 */
++	ut_ad(srv_fake_write ||
++	      !ibuf_inside() || ibuf_page(space, zip_size, offset, NULL));
+ #endif
+ 	if (innobase_get_slow_log()) {
+ 		trx = innobase_get_trx();
+@@ -4030,7 +4032,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 :
+diff -ruN a/storage/xtradb/fil/fil0fil.c b/storage/xtradb/fil/fil0fil.c
+--- a/storage/xtradb/fil/fil0fil.c
++++ b/storage/xtradb/fil/fil0fil.c
+@@ -294,7 +294,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;
+ 
+ 
+ /********************************************************************//**
+@@ -305,7 +305,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 */
+@@ -630,7 +630,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 */
+@@ -664,7 +664,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);
+ 
+@@ -754,8 +761,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)) {
+@@ -800,6 +807,8 @@
+ 		/* Put the node to the LRU list */
+ 		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
+ 	}
++
++	return(0);
+ }
+ 
+ /**********************************************************************//**
+@@ -1428,7 +1437,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);
+ 	}
+ 
+@@ -1480,7 +1494,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);
+ 	}
+ 
+@@ -1929,7 +1948,7 @@
+ 	mem_free(path);
+ }
+ 
+-#ifndef UNIV_HOTBACKUP
++#if 0
+ /********************************************************//**
+ Writes a log record about an .ibd file create/rename/delete. */
+ static
+@@ -2153,7 +2172,7 @@
+ 			if (fil_create_new_single_table_tablespace(
+ 				    space_id, name, FALSE, flags,
+ 				    FIL_IBD_FILE_INITIAL_SIZE) != DB_SUCCESS) {
+-				ut_error;
++				//ut_error;
+ 			}
+ 		}
+ 
+@@ -2316,7 +2335,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
+@@ -2617,7 +2636,7 @@
+ 
+ 	mutex_exit(&fil_system->mutex);
+ 
+-#ifndef UNIV_HOTBACKUP
++#ifdef UNDEFINED
+ 	if (success) {
+ 		mtr_t		mtr;
+ 
+@@ -2807,7 +2826,7 @@
+ 
+ 	fil_node_create(path, size, space_id, FALSE);
+ 
+-#ifndef UNIV_HOTBACKUP
++#ifdef UNDEFINED
+ 	{
+ 		mtr_t		mtr;
+ 
+@@ -3060,19 +3079,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);
+ 	}
+ 
+@@ -3918,7 +4015,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(
+ /*=======================*/
+@@ -4217,15 +4314,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);
+@@ -4614,7 +4793,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 */
+@@ -4634,10 +4813,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
+@@ -4650,6 +4832,8 @@
+ 	}
+ 
+ 	node->n_pending++;
++
++	return(0);
+ }
+ 
+ /********************************************************************//**
+@@ -4786,7 +4970,9 @@
+ 	ut_ad(recv_no_ibuf_operations || (type == OS_FILE_WRITE)
+ 	      || !ibuf_bitmap_page(zip_size, block_offset)
+ 	      || sync || is_log);
+-	ut_ad(!ibuf_inside() || is_log || (type == OS_FILE_WRITE)
++	/* ibuf_page() always returns FALSE with srv_fake_write=1 */
++	ut_ad(srv_fake_write ||
++	      !ibuf_inside() || is_log || (type == OS_FILE_WRITE)
+ 	      || ibuf_page(space_id, zip_size, block_offset, NULL));
+ # endif /* UNIV_LOG_DEBUG */
+ 	if (sync) {
+@@ -4835,6 +5021,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 (;;) {
+diff -ruN a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
+--- a/storage/xtradb/handler/ha_innodb.cc
++++ b/storage/xtradb/handler/ha_innodb.cc
+@@ -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);
+ 
+-static MYSQL_THDVAR_ULONG(flush_log_at_trx_commit_session, PLUGIN_VAR_RQCMDARG,
+-  "Control innodb_flush_log_at_trx_commit for each sessions. "
+-  "The value 0~2 are same meanings to innodb_flush_log_at_trx_commit. "
+-  "The value 3 regards innodb_flush_log_at_trx_commit (default).",
+-  NULL, NULL, 3, 0, 3, 0);
+-
+ 
+ static handler *innobase_create_handler(handlerton *hton,
+                                         TABLE_SHARE *table,
+@@ -729,17 +723,6 @@
+ 	return(THDVAR((THD*) thd, lock_wait_timeout));
+ }
+ 
+-/******************************************************************//**
+-*/
+-extern "C" UNIV_INTERN
+-ulong
+-thd_flush_log_at_trx_commit_session(
+-/*================================*/
+-	void*	thd)
+-{
+-	return(THDVAR((THD*) thd, flush_log_at_trx_commit_session));
+-}
+-
+ /********************************************************************//**
+ Obtain the InnoDB transaction of a MySQL thread.
+ @return	reference to transaction pointer */
+@@ -11775,7 +11758,6 @@
+   MYSQL_SYSVAR(flush_neighbor_pages),
+   MYSQL_SYSVAR(read_ahead),
+   MYSQL_SYSVAR(adaptive_checkpoint),
+-  MYSQL_SYSVAR(flush_log_at_trx_commit_session),
+   MYSQL_SYSVAR(enable_unsafe_group_commit),
+   MYSQL_SYSVAR(expand_import),
+   MYSQL_SYSVAR(extra_rsegments),
+diff -ruN a/storage/xtradb/ibuf/ibuf0ibuf.c b/storage/xtradb/ibuf/ibuf0ibuf.c
+--- a/storage/xtradb/ibuf/ibuf0ibuf.c
++++ b/storage/xtradb/ibuf/ibuf0ibuf.c
+@@ -1064,6 +1064,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);
+@@ -2280,6 +2283,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);
+ 
+diff -ruN a/storage/xtradb/include/ha_prototypes.h b/storage/xtradb/include/ha_prototypes.h
+--- a/storage/xtradb/include/ha_prototypes.h
++++ b/storage/xtradb/include/ha_prototypes.h
+@@ -268,12 +268,4 @@
+ 	void*	thd);	/*!< in: thread handle (THD*), or NULL to query
+ 			the global innodb_lock_wait_timeout */
+ 
+-/******************************************************************//**
+-*/
+-
+-ulong
+-thd_flush_log_at_trx_commit_session(
+-/*================================*/
+-	void*	thd);
+-
+ #endif
+diff -ruN a/storage/xtradb/include/log0recv.h b/storage/xtradb/include/log0recv.h
+--- a/storage/xtradb/include/log0recv.h
++++ b/storage/xtradb/include/log0recv.h
+@@ -444,7 +444,7 @@
+ /* defined in os0file.c */
+ #define OS_AIO_MERGE_N_CONSECUTIVE	64
+ /* defined in log0recv.c */
+-#define RECV_READ_AHEAD_AREA	32
++#define RECV_READ_AHEAD_AREA	128
+ 	time_t		stats_recv_start_time;
+ 	ulint		stats_recv_turns;
+ 
+diff -ruN a/storage/xtradb/include/mem0mem.ic b/storage/xtradb/include/mem0mem.ic
+--- a/storage/xtradb/include/mem0mem.ic
++++ b/storage/xtradb/include/mem0mem.ic
+@@ -367,7 +367,7 @@
+ 	buf = (byte*)buf + MEM_FIELD_HEADER_SIZE;
+ 
+ 	/* Check that the field lengths agree */
+-	ut_ad(n == (ulint)mem_field_header_get_len(buf));
++	ut_ad(n == (ulint)mem_field_header_get_len((byte *)buf));
+ #endif
+ 
+ 	return(buf);
+diff -ruN a/storage/xtradb/include/srv0srv.h b/storage/xtradb/include/srv0srv.h
+--- a/storage/xtradb/include/srv0srv.h
++++ b/storage/xtradb/include/srv0srv.h
+@@ -228,6 +228,10 @@
+ 
+ extern ulong	srv_replication_delay;
+ 
++extern ibool	srv_read_only;
++extern ibool	srv_fake_write;
++extern ibool	srv_apply_log_only;
++
+ extern long long	srv_ibuf_max_size;
+ extern ulint	srv_ibuf_active_contract;
+ extern ulint	srv_ibuf_accel_rate;
+diff -ruN a/storage/xtradb/include/srv0start.h b/storage/xtradb/include/srv0start.h
+--- a/storage/xtradb/include/srv0start.h
++++ b/storage/xtradb/include/srv0start.h
+@@ -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
+diff -ruN a/storage/xtradb/include/trx0trx.h b/storage/xtradb/include/trx0trx.h
+--- a/storage/xtradb/include/trx0trx.h
++++ b/storage/xtradb/include/trx0trx.h
+@@ -497,7 +497,6 @@
+ 					FALSE, one can save CPU time and about
+ 					150 bytes in the undo log size as then
+ 					we skip XA steps */
+-	ulint		flush_log_at_trx_commit_session;
+ 	ulint		flush_log_later;/* In 2PC, we hold the
+ 					prepare_commit mutex across
+ 					both phases. In that case, we
+diff -ruN a/storage/xtradb/include/ut0byte.ic b/storage/xtradb/include/ut0byte.ic
+--- a/storage/xtradb/include/ut0byte.ic
++++ b/storage/xtradb/include/ut0byte.ic
+@@ -168,6 +168,16 @@
+ 	dulint	a,	/*!< in: dulint */
+ 	ulint	b)	/*!< in: ulint */
+ {
++#if SIZEOF_LONG != 4
++	{
++		ulint	b_h;
++
++		b_h = b >> 32;
++		b &= 0xFFFFFFFFUL;
++		a.high += b_h;
++	}
++#endif
++
+ 	if (0xFFFFFFFFUL - b >= a.low) {
+ 		a.low += b;
+ 
+@@ -191,6 +201,16 @@
+ 	dulint	a,	/*!< in: dulint */
+ 	ulint	b)	/*!< in: ulint, b <= a */
+ {
++#if SIZEOF_LONG != 4
++	{
++		ulint	b_h;
++
++		b_h = b >> 32;
++		b &= 0xFFFFFFFFUL;
++		a.high -= b_h;
++	}
++#endif
++
+ 	if (a.low >= b) {
+ 		a.low -= b;
+ 
+@@ -235,6 +255,10 @@
+ 
+ 	ut_ad(diff > a.low);
+ 
++#if SIZEOF_LONG != 4
++		diff += (a.high - b.high - 1) << 32;
++#endif
++
+ 	return(diff);
+ }
+ 
+diff -ruN a/storage/xtradb/log/log0log.c b/storage/xtradb/log/log0log.c
+--- a/storage/xtradb/log/log0log.c
++++ b/storage/xtradb/log/log0log.c
+@@ -1370,7 +1370,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) */
+ 
+@@ -2032,7 +2032,7 @@
+ 		return(TRUE);
+ 	}
+ 
+-	ut_ad(log_sys->flushed_to_disk_lsn >= oldest_lsn);
++	ut_ad(srv_fake_write || log_sys->flushed_to_disk_lsn >= oldest_lsn);
+ 
+ 	if (log_sys->n_pending_checkpoint_writes > 0) {
+ 		/* A checkpoint write is running */
+@@ -3126,6 +3126,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) {
+ 
+@@ -3133,6 +3134,7 @@
+ 
+ 		goto loop;
+ 	}
++	}
+ 
+ 	if (srv_fast_shutdown == 2) {
+ 		/* In this fastest shutdown we do not flush the buffer pool:
+diff -ruN a/storage/xtradb/log/log0recv.c b/storage/xtradb/log/log0recv.c
+--- a/storage/xtradb/log/log0recv.c
++++ b/storage/xtradb/log/log0recv.c
+@@ -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;
+@@ -621,7 +621,7 @@
+ /***********************************************************************//**
+ Checks the consistency of the checkpoint info
+ @return	TRUE if ok */
+-static
++//static
+ ibool
+ recv_check_cp_is_consistent(
+ /*========================*/
+@@ -651,7 +651,7 @@
+ /********************************************************//**
+ Looks for the maximum consistent checkpoint from the log groups.
+ @return	error code or DB_SUCCESS */
+-static
++//static
+ ulint
+ recv_find_max_checkpoint(
+ /*=====================*/
+@@ -840,7 +840,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(
+ /*===================================*/
+@@ -2369,7 +2369,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
+@@ -2392,7 +2392,7 @@
+ 					ut_error;
+ 				}
+ 			}
+-#endif
++//#endif
+ 			/* In normal mysqld crash recovery we do not try to
+ 			replay file operations */
+ #ifdef UNIV_LOG_LSN_DEBUG
+@@ -2809,8 +2809,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)
++			);
+ 		}
+ 	}
+ 
+@@ -2923,12 +2926,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);
+ 	}
+ }
+ 
+@@ -3096,6 +3101,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,
+@@ -3454,6 +3460,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);
+ }
+ 
+diff -ruN a/storage/xtradb/os/os0file.c b/storage/xtradb/os/os0file.c
+--- a/storage/xtradb/os/os0file.c
++++ b/storage/xtradb/os/os0file.c
+@@ -554,7 +554,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.
+@@ -1356,8 +1356,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
+@@ -1416,7 +1417,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;
+@@ -2622,6 +2627,9 @@
+ 	ut_a((offset & 0xFFFFFFFFUL) == offset);
+ 	ut_a((n & 0xFFFFFFFFUL) == n);
+ 
++	if (srv_fake_write)
++		return(TRUE);
++
+ 	os_n_file_writes++;
+ 
+ 	ut_ad(file);
+@@ -2746,6 +2754,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) {
+diff -ruN a/storage/xtradb/os/os0thread.c b/storage/xtradb/os/os0thread.c
+--- a/storage/xtradb/os/os0thread.c
++++ b/storage/xtradb/os/os0thread.c
+@@ -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
+ }
+ 
+diff -ruN a/storage/xtradb/row/row0merge.c b/storage/xtradb/row/row0merge.c
+--- a/storage/xtradb/row/row0merge.c
++++ b/storage/xtradb/row/row0merge.c
+@@ -453,7 +453,9 @@
+ 	rec = rec_convert_dtuple_to_rec(*buf, index, tuple, n_ext);
+ 	offsets = rec_get_offsets(rec, index, NULL, ULINT_UNDEFINED, &heap);
+ 
+-	innobase_rec_to_mysql(dup->table, rec, index, offsets);
++	//innobase_rec_to_mysql(dup->table, rec, index, offsets);
++	fprintf(stderr, "InnoDB: Error: row_merge_dup_report() is called.\n");
++	ut_error;
+ 
+ 	mem_heap_free(heap);
+ }
+@@ -1464,8 +1466,11 @@
+ 		case 0:
+ 			if (UNIV_UNLIKELY
+ 			    (dict_index_is_unique(index) && !null_eq)) {
+-				innobase_rec_to_mysql(table, mrec0,
+-						      index, offsets0);
++				//innobase_rec_to_mysql(table, mrec0,
++				//		      index, offsets0);
++				(void) table;
++				fprintf(stderr, "InnoDB: Error: row_merge_blocks() is called.\n");
++				ut_error;
+ 				mem_heap_free(heap);
+ 				return(DB_DUPLICATE_KEY);
+ 			}
+@@ -2593,7 +2598,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 */
+diff -ruN a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c
+--- a/storage/xtradb/srv/srv0srv.c
++++ b/storage/xtradb/srv/srv0srv.c
+@@ -402,6 +402,10 @@
+ 
+ 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 long long	srv_ibuf_max_size = 0;
+ UNIV_INTERN ulint	srv_ibuf_active_contract = 0; /* 0:disable 1:enable */
+ UNIV_INTERN ulint	srv_ibuf_accel_rate = 100;
+@@ -1050,7 +1054,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);
+ }
+ 
+ /*********************************************************************//**
+@@ -1061,6 +1065,7 @@
+ /*==========*/
+ {
+ 	os_fast_mutex_free(&srv_conc_mutex);
++#ifdef UNDEFINED
+ 	mem_free(srv_conc_slots);
+ 	srv_conc_slots = NULL;
+ 
+@@ -1074,6 +1079,7 @@
+ 	srv_mysql_table = NULL;
+ 
+ 	trx_i_s_cache_free(trx_i_s_cache);
++#endif
+ }
+ 
+ /*********************************************************************//**
+diff -ruN a/storage/xtradb/srv/srv0start.c b/storage/xtradb/srv/srv0start.c
+--- a/storage/xtradb/srv/srv0start.c
++++ b/storage/xtradb/srv/srv0start.c
+@@ -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(
+ /*======================*/
+@@ -1777,6 +1779,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
+@@ -1952,7 +1958,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"
+@@ -1977,6 +1994,7 @@
+ 
+ 			return(DB_ERROR);
+ 		}
++#endif
+ 	}
+ 
+ 	/* Check that os_fast_mutexes work as expected */
+@@ -2079,6 +2097,7 @@
+ 		ibuf_update_max_tablespace_id();
+ 	}
+ 
++skip_processes:
+ 	srv_file_per_table = srv_file_per_table_original_value;
+ 
+ 	srv_was_started = TRUE;
+diff -ruN a/storage/xtradb/trx/trx0purge.c b/storage/xtradb/trx/trx0purge.c
+--- a/storage/xtradb/trx/trx0purge.c
++++ b/storage/xtradb/trx/trx0purge.c
+@@ -1113,6 +1113,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) {
+diff -ruN a/storage/xtradb/trx/trx0rseg.c b/storage/xtradb/trx/trx0rseg.c
+--- a/storage/xtradb/trx/trx0rseg.c
++++ b/storage/xtradb/trx/trx0rseg.c
+@@ -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);
+ 
+diff -ruN a/storage/xtradb/trx/trx0sys.c b/storage/xtradb/trx/trx0sys.c
+--- a/storage/xtradb/trx/trx0sys.c
++++ b/storage/xtradb/trx/trx0sys.c
+@@ -1931,10 +1931,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);
+ 
+diff -ruN a/storage/xtradb/trx/trx0trx.c b/storage/xtradb/trx/trx0trx.c
+--- a/storage/xtradb/trx/trx0trx.c
++++ b/storage/xtradb/trx/trx0trx.c
+@@ -109,8 +109,6 @@
+ 
+ 	trx->support_xa = TRUE;
+ 
+-	trx->flush_log_at_trx_commit_session = 3; /* means to use innodb_flush_log_at_trx_commit value */
+-
+ 	trx->check_foreigns = TRUE;
+ 	trx->check_unique_secondary = TRUE;
+ 
+@@ -493,8 +491,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"
+@@ -570,9 +568,9 @@
+ 								trx->id));
+ 
+ 						if (srv_force_recovery == 0) {
+-
++							/* xtrabackup should rollback it */
+ 							trx->conc_state
+-								= TRX_PREPARED;
++								= TRX_ACTIVE;
+ 						} else {
+ 							fprintf(stderr,
+ 								"InnoDB: Since"
+@@ -737,9 +735,6 @@
+ 	generated by the same transaction, doesn't. */
+ 	trx->support_xa = thd_supports_xa(trx->mysql_thd);
+ 
+-	trx->flush_log_at_trx_commit_session =
+-		thd_flush_log_at_trx_commit_session(trx->mysql_thd);
+-
+ 	mutex_enter(&kernel_mutex);
+ 
+ 	ret = trx_start_low(trx, rseg_id);
+@@ -921,7 +916,6 @@
+ 	trx->read_view = NULL;
+ 
+ 	if (lsn) {
+-		ulint	flush_log_at_trx_commit;
+ 
+ 		mutex_exit(&kernel_mutex);
+ 
+@@ -930,12 +924,6 @@
+ 			trx_undo_insert_cleanup(trx);
+ 		}
+ 
+-		if (trx->flush_log_at_trx_commit_session == 3) {
+-			flush_log_at_trx_commit = srv_flush_log_at_trx_commit;
+-		} else {
+-			flush_log_at_trx_commit = trx->flush_log_at_trx_commit_session;
+-		}
+-
+ 		/* 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! */
+@@ -967,9 +955,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 */
+ 
+@@ -981,7 +969,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 */
+ 
+@@ -1661,23 +1649,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 (trx->flush_log_at_trx_commit_session == 3) {
+-		flush_log_at_trx_commit = srv_flush_log_at_trx_commit;
+-	} else {
+-		flush_log_at_trx_commit = trx->flush_log_at_trx_commit_session;
+-	}
+-
+ 	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 */
+ 
+@@ -1688,7 +1669,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 */
+ 
+@@ -1948,8 +1929,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
+ 		transaction durable if the OS does not crash. We may also
+@@ -1969,15 +1948,9 @@
+ 
+ 		mutex_exit(&kernel_mutex);
+ 
+-		if (trx->flush_log_at_trx_commit_session == 3) {
+-			flush_log_at_trx_commit = srv_flush_log_at_trx_commit;
+-		} else {
+-			flush_log_at_trx_commit = trx->flush_log_at_trx_commit_session;
+-		}
+-
+-		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 */
+ 
+@@ -1989,7 +1962,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 'test/bootstrap.sh'
--- test/bootstrap.sh	2011-09-21 05:08:24 +0000
+++ test/bootstrap.sh	2011-10-10 06:52:24 +0000
@@ -13,7 +13,7 @@
 tests.
 
 If the argument is one of the build targets passed to build.sh 
-(i.e. innodb51_builtin innodb51 innodb55 xtradb51 xtradb55) then the 
+(i.e. innodb51_builtin innodb51 innodb55 xtradb51 xtradb55 mariadb53) then the 
 appropriate Linux tarball is downloaded from a pre-defined location and
 unpacked into the specified installation  directory ('./server' by default).
 
@@ -36,18 +36,31 @@
     innodb51_builtin | innodb51)
 	url="http://s3.amazonaws.com/percona.com/downloads/community"
 	tarball="mysql-5.1.49-linux-$arch-glibc23.tar.gz"
+	sha1sum="1113d7f9c1061f0c882142e2a0b066d07dd66873"
 	;;
     innodb55)
 	url="http://s3.amazonaws.com/percona.com/downloads/community"
+<<<<<<< TREE
 	tarball="mysql-5.5.16-linux2.6-$arch.tar.gz"
+=======
+	tarball="mysql-5.5.6-rc-linux2.6-$arch.tar.gz"
+	sha1sum="ea6616232d96e0fc768a0d4b33957e163bcc3b3d"
+>>>>>>> MERGE-SOURCE
 	;;
     xtradb51)
 	url="http://s3.amazonaws.com/percona.com/downloads/Percona-Server-5.1/Percona-Server-5.1.57-12.8/Linux/binary"
 	tarball="Percona-Server-5.1.57-rel12.8-233-Linux-$arch.tar.gz"
+	sha1sum="18f8058e29080532d810da95a62be4ca3e3c783c"
 	;;
     xtradb55)
 	url="http://s3.amazonaws.com/percona.com/downloads/Percona-Server-5.5/Percona-Server-5.5.11-20.2/Linux/binary"
 	tarball="Percona-Server-5.5.11-rel20.2-116.Linux.$arch.tar.gz"
+	sha1sum="807b84e7f725634d354ce8154c1522695e638c0f"
+	;;
+    mariadb53)
+	url="http://mirrors.supportex.net/mariadb/mariadb-5.3.1-beta/kvm-bintar-hardy-amd64/"
+	tarball="mariadb-5.3.1-beta-Linux-$arch.tar.gz"
+	sha1sum="bdd9bc0f0e495260c9bff0e618c4c656ee6d42e3"
 	;;
     *)
 	if ! test -r "$1"
@@ -69,7 +82,29 @@
 if test -n "$url"
 then
     echo "Downloading $tarball"
+    set +e
     wget -qc "$url/$tarball"
+    wgeterr=$?
+    set -e
+    if [ $wgeterr -ne 0 ]
+    then
+        echo "Download failed. wget return code: $wgeterr"
+        exit 1
+    fi
+fi
+
+if test -n "$sha1sum"
+then
+    if test -x /usr/bin/sha1sum
+    then
+        echo "Checking SHA1 checksum"
+        sum=`sha1sum $tarball | awk '{ print $1}'`
+        if [ $sum != $sha1sum ]
+        then
+            echo "Stored SHA1 sum (${sha1sum}) does not match calculated sum (${sum})"
+            exit 1
+        fi 
+    fi
 fi
 
 if test -d "$destdir"

=== modified file 'test/run.sh'
--- test/run.sh	2011-07-05 06:22:41 +0000
+++ test/run.sh	2011-10-10 06:52:24 +0000
@@ -155,8 +155,14 @@
 	    else
 		XB_BIN="xtrabackup_innodb55"
 	    fi
+	elif [ "${MYSQL_VERSION:0:3}" = "5.2" ] # MariaDB 5.2
+	then
+	    XB_BIN="xtrabackup"
+	elif [ "${MYSQL_VERSION:0:3}" = "5.3" ] # MariaDB 5.3
+	then
+	    XB_BIN="xtrabackup"
 	else
-	    vlog "Uknown MySQL/InnoDB version: $MYSQL_VERSION/$INNODB_VERSION"
+	    vlog "Unknown MySQL/InnoDB version: $MYSQL_VERSION/$INNODB_VERSION"
 	    exit -1
 	fi
     fi
@@ -226,7 +232,12 @@
 
 if [ -n "$XTRADB_VERSION" ]
 then
-    echo "Running against Percona Server $MYSQL_VERSION (XtraDB $INNODB_VERSION)" | tee -a $OUTFILE
+    if [ ${MYSQL_VERSION:6:7} = "MariaDB" ]
+    then
+        echo "Running against MariaDB $MYSQL_VERSION (XtraDB $INNODB_VERSION)" | tee -a $OUTFILE
+    else
+        echo "Running against Percona Server $MYSQL_VERSION (XtraDB $INNODB_VERSION)" | tee -a $OUTFILE
+    fi
 else
     echo "Running against MySQL $MYSQL_VERSION (InnoDB $INNODB_VERSION)" | tee -a $OUTFILE
 fi

=== added file 'test/t/ib_aria.sh'
--- test/t/ib_aria.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_aria.sh	2011-10-10 06:52:24 +0000
@@ -0,0 +1,67 @@
+. inc/common.sh
+
+if [ ${MYSQL_VERSION:6:7} != "MariaDB" ]
+then
+    echo "Requires MariaDB" >$SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+init
+run_mysqld --innodb_file_per_table
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "create database aria"
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "set sql_mode='NO_ENGINE_SUBSTITUTION'; create table aria (a int NOT NULL ) ENGINE=Aria" aria
+# Adding initial rows
+vlog "Adding initial rows to database..."
+numrow=100
+count=0
+while [ "$numrow" -gt "$count" ]
+do
+	${MYSQL} ${MYSQL_ARGS} -e "insert into aria values ($count);" aria
+	let "count=count+1"
+done
+vlog "Initial rows added"
+
+# Full backup
+# backup root directory
+mkdir -p $topdir/backup
+
+vlog "Starting backup"
+innobackupex $topdir/backup > $OUTFILE 2>&1 
+full_backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{print $2}'`
+vlog "Full backup done to directory $full_backup_dir"
+
+# Saving the checksum of original table
+checksum_a=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table aria;" aria | awk '{print $2}'`
+vlog "Table checksum is $checksum_a"
+
+vlog "Preparing backup"
+# Prepare backup
+echo "###########" >> $OUTFILE
+echo "# PREPARE #" >> $OUTFILE
+echo "###########" >> $OUTFILE
+innobackupex --apply-log $full_backup_dir >> $OUTFILE 2>&1 
+vlog "Data prepared for restore"
+
+# Destroying mysql data
+stop_mysqld
+rm -rf $mysql_datadir/*
+vlog "Data destroyed"
+
+# Restore backup
+vlog "Copying files"
+echo "###########" >> $OUTFILE
+echo "# RESTORE #" >> $OUTFILE
+echo "###########" >> $OUTFILE
+innobackupex --copy-back $full_backup_dir >> $OUTFILE 2>&1
+vlog "Data restored"
+
+run_mysqld --innodb_file_per_table
+vlog "Checking checksums"
+checksum_b=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table aria" incremental_sample | awk '{print $2}'`
+
+if [ $checksum_a -ne $checksum_b  ]
+then 
+	vlog "Checksums are not equal"
+	exit -1
+fi
+vlog "Checksums are OK"

=== modified file 'utils/build.sh'
--- utils/build.sh	2011-10-05 02:31:10 +0000
+++ utils/build.sh	2011-10-10 06:52:24 +0000
@@ -4,6 +4,7 @@
 
 MYSQL_51_VERSION=5.1.56
 MYSQL_55_VERSION=5.5.10
+MARIADB_53_VERSION=5.3.1-beta
 
 AUTO_DOWNLOAD=${AUTO_DOWNLOAD:-no}
 MASTER_SITE="http://s3.amazonaws.com/percona.com/downloads/community"
@@ -44,8 +45,9 @@
     echo "  innodb51_builtin | 5.1	build against built-in InnoDB in MySQL 5.1"
     echo "  innodb51         | plugin	build agsinst InnoDB plugin in MySQL 5.1"
     echo "  innodb55         | 5.5	build against InnoDB in MySQL 5.5"
-    echo "  xtradb51         | xtradb   build against Percona Server with XtraDB 5.1"
-    echo "  xtradb55         | xtradb55 build against Percona Server with XtraDB 5.5"
+    echo "  xtradb51         | xtradb	build against Percona Server with XtraDB 5.1"
+    echo "  xtradb55         | xtradb55	build against Percona Server with XtraDB 5.5"
+    echo "  mariadb53        | mariadb	build against Percona Server with XtraDB 5.5"
     exit -1
 }
 
@@ -102,7 +104,7 @@
     eval $configure_cmd
 
     echo "Building the server"
-    make_dirs include zlib strings mysys dbug extra
+    make_dirs include zlib strings mysys dbug extra libservices
     make_dirs $innodb_dir
     cd $top_dir
 }
@@ -145,8 +147,8 @@
 function build_all()
 {
     local mysql_version_short=${mysql_version:0:3}
-    server_dir=$top_dir/mysql-$mysql_version_short
-    server_tarball=mysql-$mysql_version.tar.gz
+    server_dir=$top_dir/$mysql_brand-$mysql_version_short
+    server_tarball=$mysql_brand-$mysql_version.tar.gz
     innodb_dir=$server_dir/storage/$innodb_name
     build_dir=$innodb_dir/xtrabackup
 
@@ -157,7 +159,7 @@
 
     echo "Preparing sources"
     unpack_and_patch $server_tarball $server_patch
-    mv $top_dir/mysql-$mysql_version $server_dir
+    mv $top_dir/$mysql_brand-$mysql_version $server_dir
 
     build_server
 
@@ -177,6 +179,7 @@
 
 case "$type" in
 "innodb51_builtin" | "5.1")
+	mysql_brand=mysql
 	mysql_version=$MYSQL_51_VERSION
 	server_patch=innodb51_builtin.patch
 	innodb_name=innobase
@@ -192,6 +195,7 @@
 	;;
 
 "innodb51" | "plugin")
+       mysql_brand=mysql
        mysql_version=$MYSQL_51_VERSION
        server_patch=innodb51.patch
        innodb_name=innodb_plugin
@@ -206,6 +210,7 @@
        build_all
        ;;
 "innodb55" | "5.5")
+        mysql_brand=mysql
 	mysql_version=$MYSQL_55_VERSION
 	server_patch=innodb55.patch
 	innodb_name=innobase
@@ -222,6 +227,22 @@
 	build_all
 	;;
 
+"mariadb53" | "mariadb")
+        mysql_brand=mariadb
+	mysql_version=$MARIADB_53_VERSION
+	server_patch=mariadb53.patch
+	innodb_name=xtradb
+	xtrabackup_target=mariadb
+        configure_cmd="./configure --enable-local-infile \
+           --enable-thread-safe-client \
+           --with-plugins=xtradb \
+           --with-zlib-dir=bundled \
+           --enable-shared \
+           --with-extra-charsets=all $extra_config_51"
+
+	build_all
+	;;
+
 "xtradb51" | "xtradb")
 	server_dir=$top_dir/Percona-Server
 	branch_dir=percona-server-5.1-xtrabackup

=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-10-05 02:31:10 +0000
+++ xtrabackup.c	2011-10-10 06:52:24 +0000
@@ -1298,7 +1298,9 @@
 {
   printf("%s version %s for %s %s %s (%s) (revision id: %s)\n", my_progname,
          XTRABACKUP_VERSION,
-#ifdef XTRADB_BASED
+#ifdef MARIADB_BASED
+         "MariaDB",
+#elif XTRADB_BASED
          "Percona Server",
 #else
          "MySQL server",