Merge lp:~percona-dev/percona-xtrabackup/percona-xtrabackup-windows into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Vadim Tkachenko (vadim-tk)]

Looks good. I assume Unix test pass.?

review: Approve

[Vadim Tkachenko (vadim-tk)]

I am trying to build on x64 under
"Visual Studio 10 Win64"
and I got:

2>xtrabackup.c(5909): error C2198: 'my_regex_init' : too few arguments for call

review: Needs Fixing

[Alexey Kopytov (akopytov)]

It's not merged into trunk yet, restoring the status.

[Valentine Gostev (longbow)]

Linux tests are good.

review: Approve (qa)

[Vadim Tkachenko (vadim-tk)]

ok for me

review: Approve

=== added file 'BUILD-WIN.txt'
--- BUILD-WIN.txt	1970-01-01 00:00:00 +0000
+++ BUILD-WIN.txt	2011-04-21 06:37:17 +0000
@@ -0,0 +1,83 @@
+How to build XtraBackup on Windows
+==================================
+
+Prerequisites:
+--------------
+
+To build XtraBackup on Windows you need the following:
+
+- a Windows installation. These instructions have been tested on 
+  Windows XP.
+
+- CMake, an open source build system available from
+  http://www.cmake.org/
+
+- Visual Studio. Both commercial and Express editions should work. These
+  instructions have been tested on Visual Studio 2005 Express.
+
+- the patch utility. The Windows version can be downloaded from
+  http://gnuwin32.sourceforge.net/packages/patch.htm
+
+*** Important note for Windows Vista and Windows 7 users ***
+
+These Windows versions demand running any executable with the word
+'patch' in the name only with administrative privileges. So if want to
+use the patch utility under an unprivileged user account, you should
+rename "patch.exe" to something else, e.g. "patsh.exe".
+
+Building instructions:
+----------------------
+
+1. Download the source code for the appropriate version of the
+server. You can check the currently supported version by looking up the
+value of the MYSQL_55_VERSION variable in utils/build.sh.
+
+The currently supported version is usually older than the latest
+released one. Older versions are available from
+http://downloads.mysql.com/archives.php
+
+2. Unpack and patch the server source.
+
+- unpack the server source archive downloaded at step 1.
+
+- start Visual Studio Command Prompt and run the following commands:
+
+cd "folder with the server source tree"
+patch --binary -p1 -i "path to the xtrabackup source tree"\patches\innodb55.patch
+
+Make sure the patch utility is in the PATH environment variable or
+specify the full path to it. Replace "patch" with the new name if you
+had to rename it on Vista/7 (see the notes above ). 
+
+The --binary switch is required to make patch work with the Unix
+end-of-line format.
+
+3. Build the patched server source:
+
+Run the following commands from the server source folder:
+
+cmake . -G "Visual Studio 8 2005" -DENABLED_LOCAL_INFILE=ON -DWITH_INNOBASE_STORAGE_ENGINE=ON -DWITH_PARTITION_STORAGE_ENGINE=ON -DWITH_ZLIB=bundled -DWITH_EXTRA_CHARSETS=all
+
+devenv mysql.sln /build relwithdebinfo
+
+The -G argument should be the Visual Studio version that will be used to
+build. The complete list of available generators can be found in the
+CMake documentation. Make sure to add the "Win64" suffix when creating
+an x64 build.
+
+You may also need to replace "devenv" with "vcexpress" for Express editions
+of Visual Studio.
+
+4. Build XtraBackup:
+
+From the XtraBackup source folder:
+
+cmake . -G "Visual Studio 8 2005" 
+        -DMYSQL_ROOT_DIR="path to the server source folder built at step #3"
+
+devenv xtrabackup.sln /build relwithdebinfo
+
+The same comments about the -G argument and devenv from #3 apply here as well.
+
+Once the build completes xtrabackup.exe can be found in the
+relwithdebinfo subfolder of the XtraBackup source folder.

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2011-04-21 06:37:17 +0000
@@ -0,0 +1,59 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.6)
+  CMAKE_POLICY(VERSION 2.8)
+ENDIF()
+
+IF (NOT DEFINED MYSQL_ROOT_DIR)
+  MESSAGE(FATAL_ERROR
+    "You must specify a path to the server source directory with
+ -DMYSQL_ROOT_DIR")
+ENDIF()
+
+if(COMMAND cmake_policy)
+   cmake_policy(SET CMP0015 NEW)
+endif(COMMAND cmake_policy)
+
+LINK_DIRECTORIES (
+  ${MYSQL_ROOT_DIR}/mysys/RelWithDebInfo
+  ${MYSQL_ROOT_DIR}/strings/RelWithDebInfo
+  ${MYSQL_ROOT_DIR}/storage/innobase/RelWithDebInfo
+  ${MYSQL_ROOT_DIR}/zlib/RelWithDebInfo
+  ${MYSQL_ROOT_DIR}/regex/RelWithDebInfo
+)
+
+PROJECT(XtraBackup)
+ADD_EXECUTABLE(xtrabackup
+  xtrabackup.c
+  xb_regex.h
+)
+
+if(COMMAND cmake_policy)
+   cmake_policy(SET CMP0016 NEW)
+endif(COMMAND cmake_policy)
+
+# Enable debug info also in Release build, and create PDB to be able to
+# analyze crashes
+SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi")
+SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /debug")
+
+# Force static runtime libraries
+FOREACH(flag
+    CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO
+    CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT
+    CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    CMAKE_CXX_FLAGS_DEBUG  CMAKE_CXX_FLAGS_DEBUG_INIT)
+  STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
+ENDFOREACH()
+
+# Silence "deprecated API" warnings.
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996")
+
+INCLUDE_DIRECTORIES(
+  ${MYSQL_ROOT_DIR}/include
+  ${MYSQL_ROOT_DIR}/regex
+  ${MYSQL_ROOT_DIR}/storage/innobase/include
+)
+
+TARGET_LINK_LIBRARIES(xtrabackup mysys strings innobase zlib regex)
+ADD_DEFINITIONS(-DDBUG_OFF -DHAVE_CONFIG_H -DWIN_ASYNC_IO
+  -DHAVE_WINDOWS_ATOMICS)

=== modified file 'Makefile'
--- Makefile	2011-03-23 20:08:04 +0000
+++ Makefile	2011-04-21 06:37:17 +0000
@@ -128,7 +128,7 @@
 xtradb55: $(TARGET)
 
 
-xtrabackup.o: xtrabackup.c
+xtrabackup.o: xtrabackup.c xb_regex.h
 	$(CC) $(CFLAGS) $(INC) $(DEFS) -c $*.c
 
 $(TARGET): xtrabackup.o $(INNODBOBJS) $(MYSQLOBJS)
@@ -136,6 +136,3 @@
 
 clean:
 	rm -f *.o xtrabackup_* 
-install:
-	install -m 755 innobackupex-1.5.1 $(BIN_DIR)
-	install -m 755 xtrabackup_*  $(BIN_DIR)

=== removed symlink 'innobackupex-1.5.1'
=== target was 'innobackupex'
=== modified file 'test/t/ib_partition.sh'
--- test/t/ib_partition.sh	2011-03-16 18:07:07 +0000
+++ test/t/ib_partition.sh	2011-04-21 06:37:17 +0000
@@ -29,12 +29,12 @@
 # partial backup of partitioned table
 mkdir -p $topdir/data/full
 vlog "Starting backup"
-innobackupex-1.5.1 --user=root --socket=$mysql_socket --defaults-file=$topdir/my.cnf --tables-file=$topdir/list $topdir/data/full > $OUTFILE 2>&1 || die "innobackupex-1.5.1 died with exit code $?"
-backup_dir=`grep "innobackupex-1.5.1: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
+innobackupex --user=root --socket=$mysql_socket --defaults-file=$topdir/my.cnf --tables-file=$topdir/list $topdir/data/full > $OUTFILE 2>&1 || die "innobackupex-1.5.1 died with exit code $?"
+backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
 vlog "Partial backup done"
 
 # Prepare backup
-innobackupex-1.5.1 --defaults-file=$topdir/my.cnf --apply-log $backup_dir
+innobackupex --defaults-file=$topdir/my.cnf --apply-log $backup_dir
 vlog "Log applied to backup"
 
 # removing rows
@@ -47,7 +47,7 @@
 
 vlog "Copying files"
 rm -rf $mysql_datadir/part_range_sample
-innobackupex-1.5.1 --copy-back --defaults-file=$topdir/my.cnf $backup_dir
+innobackupex --copy-back --defaults-file=$topdir/my.cnf $backup_dir
 vlog "Data restored"
 
 run_mysqld --innodb_file_per_table

=== modified file 'utils/build.sh'
--- utils/build.sh	2011-04-17 10:13:53 +0000
+++ utils/build.sh	2011-04-21 06:37:17 +0000
@@ -90,7 +90,7 @@
 {
     echo "Building XtraBackup"
     mkdir $build_dir
-    cp $top_dir/Makefile $top_dir/xtrabackup.c $build_dir
+    cp $top_dir/Makefile $top_dir/xtrabackup.c $top_dir/xb_regex.h $build_dir
 
     cd $build_dir
     $MAKE_CMD $xtrabackup_target

=== added file 'xb_regex.h'
--- xb_regex.h	1970-01-01 00:00:00 +0000
+++ xb_regex.h	2011-04-21 06:37:17 +0000
@@ -0,0 +1,71 @@
+/******************************************************
+Copyright (c) 2011 Percona Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*******************************************************/
+
+/* This file is required to abstract away regex(3) calls so that
+my_regex is used on Windows and native calls are used on POSIX platforms. */
+
+#ifndef XB_REGEX_H
+#define XB_REGEX_H
+
+#ifdef _WIN32
+
+#include <my_regex.h>
+
+typedef my_regex_t xb_regex_t;
+typedef my_regmatch_t xb_regmatch_t;
+
+#define xb_regex_init() my_regex_init(&my_charset_latin1)
+
+#define xb_regexec(preg,string,nmatch,pmatch,eflags) \
+	my_regexec(preg, string, nmatch, pmatch, eflags)
+
+#define xb_regerror(errcode,preg,errbuf,errbuf_size) \
+	my_regerror(errcode, preg, errbuf, errbuf_size)
+
+#define xb_regcomp(preg,regex,cflags) \
+	my_regcomp(preg, regex, cflags, &my_charset_latin1)
+
+#define xb_regfree(preg) my_regfree(preg)
+
+#define xb_regex_end() my_regex_end()
+
+#else /* ! _WIN32 */
+
+#include <regex.h>
+
+typedef regex_t xb_regex_t;
+typedef regmatch_t xb_regmatch_t;
+
+#define xb_regex_init() do { } while(0)
+
+#define xb_regexec(preg,string,nmatch,pmatch,eflags)	\
+	regexec(preg, string, nmatch, pmatch, eflags)
+
+#define xb_regerror(errcode,preg,errbuf,errbuf_size)	\
+	regerror(errcode, preg, errbuf, errbuf_size)
+
+#define xb_regcomp(preg,regex,cflags)				\
+	regcomp(preg, regex, cflags)
+
+#define xb_regfree(preg) regfree(preg)
+
+#define xb_regex_end() do { } while (0)
+
+#endif /* _WIN32 */
+
+#endif /* XB_REGEX_H */

=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-04-11 00:44:07 +0000
+++ xtrabackup.c	2011-04-21 06:37:17 +0000
@@ -62,11 +62,14 @@
 #include <sync0sync.h>
 #include <fil0fil.h>
 #include <trx0xa.h>
+#include <fcntl.h>
 
 #ifdef INNODB_VERSION_SHORT
 #include <ibuf0ibuf.h>
 #endif
 
+#include "xb_regex.h"
+
 #ifndef INNODB_VERSION_SHORT
 #define IB_INT64 ib_longlong
 #define LSN64 dulint
@@ -232,8 +235,77 @@
 					a file, so this is either "open" or
 					"create" */
 
-#include <fcntl.h>
-#include <regex.h>
+/****************************************************************//**
+A simple function to open or create a file.
+@return own: handle to the file, not defined if error, error number
+can be retrieved with os_file_get_last_error */
+UNIV_INLINE
+os_file_t
+xb_file_create_no_error_handling(
+/*=============================*/
+	const char*	name,	/*!< in: name of the file or path as a
+				null-terminated string */
+	ulint		create_mode,/*!< in: OS_FILE_OPEN if an existing file
+				is opened (if does not exist, error), or
+				OS_FILE_CREATE if a new file is created
+				(if exists, error) */
+	ulint		access_type,/*!< in: OS_FILE_READ_ONLY,
+				OS_FILE_READ_WRITE, or
+				OS_FILE_READ_ALLOW_DELETE; the last option is
+				used by a backup program reading the file */
+	ibool*		success);/*!< out: TRUE if succeed, FALSE if error */
+
+/****************************************************************//**
+Opens an existing file or creates a new.
+@return own: handle to the file, not defined if error, error number
+can be retrieved with os_file_get_last_error */
+UNIV_INLINE
+os_file_t
+xb_file_create(
+/*===========*/
+	const char*	name,	/*!< in: name of the file or path as a
+				null-terminated string */
+	ulint		create_mode,/*!< in: OS_FILE_OPEN if an existing file
+				is opened (if does not exist, error), or
+				OS_FILE_CREATE if a new file is created
+				(if exists, error),
+				OS_FILE_OVERWRITE if a new file is created
+				or an old overwritten;
+				OS_FILE_OPEN_RAW, if a raw device or disk
+				partition should be opened */
+	ulint		purpose,/*!< in: OS_FILE_AIO, if asynchronous,
+				non-buffered i/o is desired,
+				OS_FILE_NORMAL, if any normal file;
+				NOTE that it also depends on type, os_aio_..
+				and srv_.. variables whether we really use
+				async i/o or unbuffered i/o: look in the
+				function source code for the exact rules */
+	ulint		type,	/*!< in: OS_DATA_FILE or OS_LOG_FILE */
+	ibool*		success);/*!< out: TRUE if succeed, FALSE if error */
+
+/***********************************************************************//**
+Renames a file (can also move it to another directory). It is safest that the
+file is closed before calling this function.
+@return	TRUE if success */
+UNIV_INLINE
+ibool
+xb_file_rename(
+/*===========*/
+	const char*	oldpath,/*!< in: old file path as a null-terminated
+				string */
+	const char*	newpath);/*!< in: new file path */
+
+UNIV_INLINE
+void
+xb_file_set_nocache(
+/*================*/
+	os_file_t	fd,		/* in: file descriptor to alter */
+	const char*	file_name,	/* in: used in the diagnostic message */
+	const char*	operation_name);/* in: used in the diagnostic message,
+					we call os_file_set_nocache()
+					immediately after opening or creating
+					a file, so this is either "open" or
+					"create" */
 
 #ifdef POSIX_FADV_NORMAL
 #define USE_POSIX_FADVISE
@@ -586,8 +658,8 @@
 
 char *xtrabackup_tables = NULL;
 int tables_regex_num;
-regex_t *tables_regex;
-regmatch_t tables_regmatch[1];
+xb_regex_t *tables_regex;
+xb_regmatch_t tables_regmatch[1];
 
 char *xtrabackup_tables_file = NULL;
 hash_table_t* tables_hash;
@@ -633,8 +705,14 @@
 
 #define XB_DELTA_INFO_SUFFIX ".meta"
 
+#ifdef __WIN__
+#define XB_FILE_UNDEFINED NULL
+#else
+#define XB_FILE_UNDEFINED (-1)
+#endif
+
 /* === sharing with thread === */
-os_file_t       dst_log = -1;
+os_file_t       dst_log = XB_FILE_UNDEFINED;
 char            dst_log_path[FN_REFLEN];
 
 /* === some variables from mysqld === */
@@ -1390,7 +1468,29 @@
 		will be passed to fdopen(), it will be closed by invoking
 		fclose(), which in turn will invoke close() instead of
 		my_close(). */
+#ifdef _WIN32
+		/* Note that on Windows, the integer returned by mysql_tmpfile
+		has no relation to C runtime file descriptor. Here, we need
+		to call my_get_osfhandle to get the HANDLE and then convert it
+		to C runtime filedescriptor. */
+		{
+			HANDLE hFile = my_get_osfhandle(fd);
+			HANDLE hDup;
+			BOOL bOK =
+				DuplicateHandle(GetCurrentProcess(), hFile,
+						GetCurrentProcess(), &hDup, 0,
+						FALSE, DUPLICATE_SAME_ACCESS);
+			if(bOK) {
+				fd2 = _open_osfhandle((intptr_t)hDup,0);
+			}
+			else {
+				my_osmaperr(GetLastError());
+				fd2 = -1;
+			}
+		}
+#else
 		fd2 = dup(fd);
+#endif
 		if (fd2 < 0) {
 			fprintf(stderr, "xtrabackup: Got error %d on dup\n",fd2);
                 }
@@ -1430,19 +1530,16 @@
 void
 innobase_print_identifier(
 	FILE*	f,
-	trx_t*	trx,
-	ibool	table_id,
+	trx_t*	trx __attribute__((unused)),
+	ibool	table_id __attribute__((unused)),
 	const char*	name,
 	ulint	namelen)
 {
-	(void)trx;
-	(void)table_id;
-
         const char*     s       = name;
         const char*     e = s + namelen;
         int             q;
 
-        q = '"';
+	q = '"';
 
         putc(q, f);
         while (s < e) {
@@ -1467,13 +1564,12 @@
 	ulint		buflen,	/*!< in: length of buf, in bytes */
 	const char*	id,	/*!< in: identifier to convert */
 	ulint		idlen,	/*!< in: length of id, in bytes */
-	void*		thd,	/*!< in: MySQL connection thread, or NULL */
-	ibool		file_id)/*!< in: TRUE=id is a table or database name;
-				FALSE=id is an UTF-8 string */
+	void*		thd __attribute__((unused)), 
+						/*!< in: MySQL connection thread, or NULL */
+	ibool		file_id __attribute__((unused)))
+						/*!< in: TRUE=id is a table or database name;
+						FALSE=id is an UTF-8 string */
 {
-	(void)thd;
-	(void)file_id;
-
 	const char*	s	= id;
 	int		q;
 
@@ -2116,7 +2212,7 @@
 #ifndef INNODB_VERSION_SHORT
 	srv_use_adaptive_hash_indexes = (ibool) innobase_adaptive_hash_index;
 #else
-	btr_search_enabled = (ibool) innobase_adaptive_hash_index;
+	btr_search_enabled = (char) innobase_adaptive_hash_index;
 #endif
 
 	os_use_large_pages = (ibool) innobase_use_large_pages;
@@ -2124,7 +2220,7 @@
 
 	row_rollback_on_timeout = (ibool) innobase_rollback_on_timeout;
 
-	srv_file_per_table = (ibool) innobase_file_per_table;
+	srv_file_per_table = (my_bool) innobase_file_per_table;
 
         srv_locks_unsafe_for_binlog = (ibool) innobase_locks_unsafe_for_binlog;
 
@@ -2424,6 +2520,119 @@
 	}
 }
 
+#ifdef INNODB_VERSION_SHORT
+#define XB_HASH_SEARCH(NAME, TABLE, FOLD, DATA, ASSERTION, TEST) \
+	HASH_SEARCH(NAME, TABLE, FOLD, xtrabackup_tables_t*, DATA, ASSERTION, \
+		    TEST)
+#else
+#define XB_HASH_SEARCH(NAME, TABLE, FOLD, DATA, ASSERTION, TEST) \
+	HASH_SEARCH(NAME, TABLE, FOLD, DATA, TEST)
+#endif
+
+/****************************************************************//**
+A simple function to open or create a file.
+@return own: handle to the file, not defined if error, error number
+can be retrieved with os_file_get_last_error */
+UNIV_INLINE
+os_file_t
+xb_file_create_no_error_handling(
+/*=============================*/
+	const char*	name,	/*!< in: name of the file or path as a
+				null-terminated string */
+	ulint		create_mode,/*!< in: OS_FILE_OPEN if an existing file
+				is opened (if does not exist, error), or
+				OS_FILE_CREATE if a new file is created
+				(if exists, error) */
+	ulint		access_type,/*!< in: OS_FILE_READ_ONLY,
+				OS_FILE_READ_WRITE, or
+				OS_FILE_READ_ALLOW_DELETE; the last option is
+				used by a backup program reading the file */
+	ibool*		success)/*!< out: TRUE if succeed, FALSE if error */
+{
+#if MYSQL_VERSION_ID > 50500
+	return os_file_create_simple_no_error_handling(
+		0, /* innodb_file_data_key */
+		name, create_mode, access_type, success);
+#else
+	return os_file_create_simple_no_error_handling(
+		name, create_mode, access_type, success);
+#endif
+}
+
+/****************************************************************//**
+Opens an existing file or creates a new.
+@return own: handle to the file, not defined if error, error number
+can be retrieved with os_file_get_last_error */
+UNIV_INLINE
+os_file_t
+xb_file_create(
+/*===========*/
+	const char*	name,	/*!< in: name of the file or path as a
+				null-terminated string */
+	ulint		create_mode,/*!< in: OS_FILE_OPEN if an existing file
+				is opened (if does not exist, error), or
+				OS_FILE_CREATE if a new file is created
+				(if exists, error),
+				OS_FILE_OVERWRITE if a new file is created
+				or an old overwritten;
+				OS_FILE_OPEN_RAW, if a raw device or disk
+				partition should be opened */
+	ulint		purpose,/*!< in: OS_FILE_AIO, if asynchronous,
+				non-buffered i/o is desired,
+				OS_FILE_NORMAL, if any normal file;
+				NOTE that it also depends on type, os_aio_..
+				and srv_.. variables whether we really use
+				async i/o or unbuffered i/o: look in the
+				function source code for the exact rules */
+	ulint		type,	/*!< in: OS_DATA_FILE or OS_LOG_FILE */
+	ibool*		success)/*!< out: TRUE if succeed, FALSE if error */
+{
+#if MYSQL_VERSION_ID > 50500
+	return os_file_create(0 /* innodb_file_data_key */,
+			      name, create_mode, purpose, type, success);
+#else
+	return os_file_create(name, create_mode, purpose, type, success);
+#endif
+}
+
+/***********************************************************************//**
+Renames a file (can also move it to another directory). It is safest that the
+file is closed before calling this function.
+@return	TRUE if success */
+UNIV_INLINE
+ibool
+xb_file_rename(
+/*===========*/
+	const char*	oldpath,/*!< in: old file path as a null-terminated
+				string */
+	const char*	newpath)/*!< in: new file path */
+{
+#if MYSQL_VERSION_ID > 50500
+	return os_file_rename(
+		0 /* innodb_file_data_key */, oldpath, newpath);
+#else
+	return os_file_rename(oldpath, newpath);
+#endif
+}
+
+UNIV_INLINE
+void
+xb_file_set_nocache(
+/*================*/
+	os_file_t	fd,		/* in: file descriptor to alter */
+	const char*	file_name,	/* in: used in the diagnostic message */
+	const char*	operation_name) /* in: used in the diagnostic message,
+					we call os_file_set_nocache()
+					immediately after opening or creating
+					a file, so this is either "open" or
+					"create" */
+{
+#ifndef __WIN__
+	if (srv_unix_file_flush_method == SRV_UNIX_O_DIRECT) {
+		os_file_set_nocache(fd, file_name, operation_name);
+	}
+#endif
+}
 
 /* TODO: We may tune the behavior (e.g. by fil_aio)*/
 #define COPY_CHUNK 64
@@ -2431,8 +2640,8 @@
 static my_bool
 xtrabackup_copy_datafile(fil_node_t* node, uint thread_n)
 {
-	os_file_t	src_file = -1;
-	os_file_t	dst_file = -1;
+	os_file_t	src_file = XB_FILE_UNDEFINED;
+	os_file_t	dst_file = XB_FILE_UNDEFINED;
 	char		dst_path[FN_REFLEN];
 	char		meta_path[FN_REFLEN];
 	ibool		success;
@@ -2483,7 +2692,8 @@
 		*(p - 1) = '.';
 
 		for (i = 0; i < tables_regex_num; i++) {
-			regres = regexec(&tables_regex[i], prev, 1, tables_regmatch, 0);
+			regres = xb_regexec(&tables_regex[i], prev, 1,
+					    tables_regmatch, 0);
 			if (regres != REG_NOMATCH)
 				break;
 		}
@@ -2528,15 +2738,10 @@
 		tmp = p[p_len];
 		p[p_len] = 0;
 
-		HASH_SEARCH(name_hash, tables_hash, ut_fold_string(prev),
-#ifdef INNODB_VERSION_SHORT
-			    xtrabackup_tables_t*,
-#endif
-			    table,
-#ifdef INNODB_VERSION_SHORT
-			    ut_ad(table->name),
-#endif
-	    		    !strcmp(table->name, prev));
+		XB_HASH_SEARCH(name_hash, tables_hash, ut_fold_string(prev),
+			       table,
+			       ut_ad(table->name),
+			       !strcmp(table->name, prev));
 
 		p[p_len] = tmp;
 
@@ -2611,12 +2816,10 @@
 
 	/* open src_file*/
 	if (!node->open) {
-		src_file = os_file_create_simple_no_error_handling(
-#if (MYSQL_VERSION_ID > 50500)
-						0 /* dummy of innodb_file_data_key */,
-#endif
-						node->name, OS_FILE_OPEN,
-						OS_FILE_READ_ONLY, &success);
+		src_file = xb_file_create_no_error_handling(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);
@@ -2630,9 +2833,7 @@
 			goto skip;
 		}
 
-		if (srv_unix_file_flush_method == SRV_UNIX_O_DIRECT) {
-			os_file_set_nocache(src_file, node->name, "OPEN");
-		}
+		xb_file_set_nocache(src_file, node->name, "OPEN");
 	} else {
 		src_file = node->handle;
 	}
@@ -2643,21 +2844,17 @@
 #endif
 
 	/* open dst_file */
-	/* os_file_create reads srv_unix_file_flush_method */
-	dst_file = os_file_create(
-#if (MYSQL_VERSION_ID > 50500)
-			0 /* dummy of innodb_file_data_key */,
-#endif
-			dst_path, OS_FILE_CREATE,
-			OS_FILE_NORMAL, OS_DATA_FILE, &success);
-                if (!success) {
-                        /* The following call prints an error message */
-                        os_file_get_last_error(TRUE);
+	/* xb_file_create reads srv_unix_file_flush_method */
+	dst_file = xb_file_create(dst_path, OS_FILE_CREATE,
+				  OS_FILE_NORMAL, OS_DATA_FILE, &success);
+	if (!success) {
+		/* The following call prints an error message */
+		os_file_get_last_error(TRUE);
 
-			fprintf(stderr,"[%02u] xtrabackup: error: "
-				"cannot open %s\n", thread_n, dst_path);
-                        goto error;
-                }
+		fprintf(stderr,"[%02u] xtrabackup: error: "
+			"cannot open %s\n", thread_n, dst_path);
+		goto error;
+	}
 
 #ifdef USE_POSIX_FADVISE
 	posix_fadvise(dst_file, 0, 0, POSIX_FADV_DONTNEED);
@@ -2857,9 +3054,9 @@
 	ut_free(buf2);
 	return(FALSE);
 error:
-	if (src_file != -1 && !node->open)
+	if (src_file != XB_FILE_UNDEFINED && !node->open)
 		os_file_close(src_file);
-	if (dst_file != -1)
+	if (dst_file != XB_FILE_UNDEFINED)
 		os_file_close(dst_file);
 	if (buf2)
 		ut_free(buf2);
@@ -2868,9 +3065,9 @@
 	return(TRUE); /*ERROR*/
 
 skip:
-	if (src_file != -1 && !node->open)
+	if (src_file != XB_FILE_UNDEFINED && !node->open)
 		os_file_close(src_file);
-	if (dst_file != -1)
+	if (dst_file != XB_FILE_UNDEFINED)
 		os_file_close(dst_file);
 	if (buf2)
 		ut_free(buf2);
@@ -2890,7 +3087,7 @@
 	ibool		success;
 
 	if (!xtrabackup_stream)
-		ut_a(dst_log != -1);
+		ut_a(dst_log != XB_FILE_UNDEFINED);
 
 	/* read from checkpoint_lsn_start to current */
 	contiguous_lsn = ut_dulint_align_down(from_lsn,
@@ -3042,7 +3239,7 @@
 		if (!finished) {
 			write_size = RECV_SCAN_SIZE;
 		} else {
-			write_size = ut_dulint_minus(
+			write_size = (ulint) ut_dulint_minus(
 					ut_dulint_align_up(group_scanned_lsn, OS_FILE_LOG_BLOCK_SIZE),
 					start_lsn);
 		}
@@ -3158,13 +3355,12 @@
 ulint
 #endif
 log_copying_thread(
-	void*	arg)
+	void*	arg __attribute__((unused)))
 {
-	(void)arg;
 	ulint	counter = 0;
 
 	if (!xtrabackup_stream)
-		ut_a(dst_log != -1);
+		ut_a(dst_log != XB_FILE_UNDEFINED);
 
 	log_copying_running = TRUE;
 
@@ -3378,6 +3574,7 @@
         if(innodb_init_param())
                 exit(EXIT_FAILURE);
 
+#ifndef __WIN__        
         if (srv_file_flush_method_str == NULL) {
         	/* These are the default options */
 #if (MYSQL_VERSION_ID < 50100)
@@ -3385,8 +3582,6 @@
 #else /* MYSQL_VERSION_ID < 51000 */
 		srv_unix_file_flush_method = SRV_UNIX_FSYNC;
 #endif
-		srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED;
-#ifndef __WIN__        
 #if (MYSQL_VERSION_ID < 50100)
 	} else if (0 == ut_strcmp(srv_file_flush_method_str, "fdatasync")) {
 	  	srv_unix_file_flush_method = SRV_UNIX_FDATASYNC;
@@ -3406,25 +3601,23 @@
 
 	} else if (0 == ut_strcmp(srv_file_flush_method_str, "nosync")) {
 	  	srv_unix_file_flush_method = SRV_UNIX_NOSYNC;
-#else
-	} else if (0 == ut_strcmp(srv_file_flush_method_str, "normal")) {
-	  	srv_win_file_flush_method = SRV_WIN_IO_NORMAL;
-	  	os_aio_use_native_aio = FALSE;
-
-	} else if (0 == ut_strcmp(srv_file_flush_method_str, "unbuffered")) {
-	  	srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED;
-	  	os_aio_use_native_aio = FALSE;
-
-	} else if (0 == ut_strcmp(srv_file_flush_method_str,
-							"async_unbuffered")) {
-	  	srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED;	
-#endif
 	} else {
 	  	fprintf(stderr, 
           	"xtrabackup: Unrecognized value %s for innodb_flush_method\n",
           				srv_file_flush_method_str);
 	  	exit(EXIT_FAILURE);
 	}
+#else /* __WIN__ */
+	/* We can only use synchronous unbuffered IO on Windows for now */
+	if (srv_file_flush_method_str != NULL) {
+		fprintf(stderr,
+			"xtrabackupp: Warning: "
+			"ignoring innodb_flush_method = %s on Windows.\n");
+	}
+
+	srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED;
+	srv_use_native_aio = FALSE;
+#endif
 
 #ifndef INNODB_VERSION_SHORT
         if (srv_pool_size >= 1000 * 1024) {
@@ -3703,13 +3896,11 @@
 		/* open 'xtrabackup_logfile' */
 		sprintf(dst_log_path, "%s%s", xtrabackup_target_dir, "/xtrabackup_logfile");
 		srv_normalize_path_for_win(dst_log_path);
-		/* os_file_create reads srv_unix_file_flush_method for OS_DATA_FILE*/
-		dst_log = os_file_create(
-#if (MYSQL_VERSION_ID > 50500)
-				0 /* dummy of innodb_file_data_key */,
-#endif
-				dst_log_path, OS_FILE_CREATE,
-				OS_FILE_NORMAL, OS_DATA_FILE, &success);
+		/* xb_file_create reads srv_unix_file_flush_method for
+		OS_DATA_FILE*/
+		dst_log = xb_file_create(dst_log_path, OS_FILE_CREATE,
+					 OS_FILE_NORMAL, OS_DATA_FILE,
+					 &success);
 
                 if (!success) {
                         /* The following call prints an error message */
@@ -3749,7 +3940,7 @@
 
 	log_copy_offset += LOG_FILE_HDR_SIZE;
 	if (!success) {
-		if (dst_log != -1)
+		if (dst_log != XB_FILE_UNDEFINED)
 			os_file_close(dst_log);
 		exit(EXIT_FAILURE);
 	}
@@ -3839,7 +4030,7 @@
 
 	/* suspend-at-end */
 	if (xtrabackup_suspend_at_end) {
-		os_file_t	suspend_file = -1;
+		os_file_t	suspend_file = XB_FILE_UNDEFINED;
 		char	suspend_path[FN_REFLEN];
 		ibool	success, exists;
 		os_file_type_t	type;
@@ -3848,19 +4039,16 @@
 			"/xtrabackup_suspended");
 
 		srv_normalize_path_for_win(suspend_path);
-		/* os_file_create reads srv_unix_file_flush_method */
-		suspend_file = os_file_create(
-#if (MYSQL_VERSION_ID > 50500)
-					0 /* dummy of innodb_file_data_key */,
-#endif
-					suspend_path, OS_FILE_OVERWRITE,
-					OS_FILE_NORMAL, OS_DATA_FILE, &success);
+		/* xb_file_create reads srv_unix_file_flush_method */
+		suspend_file = xb_file_create(suspend_path, OS_FILE_OVERWRITE,
+					      OS_FILE_NORMAL, OS_DATA_FILE,
+					      &success);
 
 		if (!success) {
 			fprintf(stderr, "xtrabackup: Error: failed to create file 'xtrabackup_suspended'\n");
 		}
 
-		if (suspend_file != -1)
+		if (suspend_file != XB_FILE_UNDEFINED)
 			os_file_close(suspend_file);
 
 		exists = TRUE;
@@ -4011,14 +4199,12 @@
 	ulonglong sum_data, sum_data_extern;
 	ulonglong n_recs;
 	ulint	page_size;
+	buf_block_t*	block;
+	ulint	zip_size;
 
 	n_pages = sum_data = n_recs = 0;
 	n_pages_extern = sum_data_extern = 0;
 
-#ifdef INNODB_VERSION_SHORT
-	buf_block_t*	block;
-	ulint	zip_size;
-#endif
 
 	if (level == 0)
 		fprintf(stdout, "        leaf pages: ");
@@ -4388,7 +4574,9 @@
 				*p = '.';
 
 			for (i = 0; i < tables_regex_num; i++) {
-				regres = regexec(&tables_regex[i], table->name, 1, tables_regmatch, 0);
+				regres = xb_regexec(&tables_regex[i],
+						    table->name, 1,
+						    tables_regmatch, 0);
 				if (regres != REG_NOMATCH)
 					break;
 			}
@@ -4403,15 +4591,11 @@
 		if (xtrabackup_tables_file) {
 			xtrabackup_tables_t*	xtable;
 
-			HASH_SEARCH(name_hash, tables_hash, ut_fold_string(table->name),
-#ifdef INNODB_VERSION_SHORT
-				    xtrabackup_tables_t*,
-#endif
-				    xtable,
-#ifdef INNODB_VERSION_SHORT
-				    ut_ad(xtable->name),
-#endif
-				    !strcmp(xtable->name, table->name));
+			XB_HASH_SEARCH(name_hash, tables_hash,
+				       ut_fold_string(table->name),
+				       xtable,
+				       ut_ad(xtable->name),
+				       !strcmp(xtable->name, table->name));
 
 			if (!xtable)
 				goto skip;
@@ -4527,7 +4711,7 @@
 static my_bool
 xtrabackup_init_temp_log(void)
 {
-	os_file_t	src_file = -1;
+	os_file_t	src_file = XB_FILE_UNDEFINED;
 	char	src_path[FN_REFLEN];
 	char	dst_path[FN_REFLEN];
 	ibool	success;
@@ -4557,12 +4741,9 @@
 	srv_normalize_path_for_win(dst_path);
 	srv_normalize_path_for_win(src_path);
 retry:
-	src_file = os_file_create_simple_no_error_handling(
-#if (MYSQL_VERSION_ID > 50500)
-					0 /* dummy of innodb_file_data_key */,
-#endif
-					src_path, OS_FILE_OPEN,
-					OS_FILE_READ_WRITE /* OS_FILE_READ_ONLY */, &success);
+	src_file = xb_file_create_no_error_handling(src_path, OS_FILE_OPEN,
+						    OS_FILE_READ_WRITE,
+						    &success);
 	if (!success) {
 		/* The following call prints an error message */
 		os_file_get_last_error(TRUE);
@@ -4572,12 +4753,10 @@
 			src_path);
 
 		/* check if ib_logfile0 may be xtrabackup_logfile */
-		src_file = os_file_create_simple_no_error_handling(
-#if (MYSQL_VERSION_ID > 50500)
-				0 /* dummy of innodb_file_data_key */,
-#endif
-				dst_path, OS_FILE_OPEN,
-				OS_FILE_READ_WRITE /* OS_FILE_READ_ONLY */, &success);
+		src_file = xb_file_create_no_error_handling(dst_path,
+							    OS_FILE_OPEN,
+							    OS_FILE_READ_WRITE,
+							    &success);
 		if (!success) {
 			os_file_get_last_error(TRUE);
 			fprintf(stderr,
@@ -4604,14 +4783,10 @@
 			log_buf_ = NULL;
 
 			os_file_close(src_file);
-			src_file = -1;
+			src_file = XB_FILE_UNDEFINED;
 
 			/* rename and try again */
-			success = os_file_rename(
-#if (MYSQL_VERSION_ID > 50500)
-					0 /* dummy of innodb_file_data_key */,
-#endif
-					dst_path, src_path);
+			success = xb_file_rename(dst_path, src_path);
 			if (!success) {
 				goto error;
 			}
@@ -4627,7 +4802,7 @@
 		log_buf_ = NULL;
 
 		os_file_close(src_file);
-		src_file = -1;
+		src_file = XB_FILE_UNDEFINED;
 
 		goto error;
 	}
@@ -4637,9 +4812,7 @@
 	posix_fadvise(src_file, 0, 0, POSIX_FADV_DONTNEED);
 #endif
 
-	if (srv_unix_file_flush_method == SRV_UNIX_O_DIRECT) {
-		os_file_set_nocache(src_file, src_path, "OPEN");
-	}
+	xb_file_set_nocache(src_file, src_path, "OPEN");
 
 	file_size = os_file_get_size_as_iblonglong(src_file);
 
@@ -4702,7 +4875,7 @@
 	/* It seems to be needed to overwrite the both checkpoint area. */
 	MACH_WRITE_64(log_buf + LOG_CHECKPOINT_1 + LOG_CHECKPOINT_LSN, max_lsn);
 	mach_write_to_4(log_buf + LOG_CHECKPOINT_1 + LOG_CHECKPOINT_OFFSET,
-			LOG_FILE_HDR_SIZE + ut_dulint_minus(max_lsn,
+			LOG_FILE_HDR_SIZE + (ulint) ut_dulint_minus(max_lsn,
 			ut_dulint_align_down(max_lsn,OS_FILE_LOG_BLOCK_SIZE)));
 #ifdef XTRADB_BASED
 	MACH_WRITE_64(log_buf + LOG_CHECKPOINT_1 + LOG_CHECKPOINT_ARCHIVED_LSN,
@@ -4718,7 +4891,7 @@
 
 	MACH_WRITE_64(log_buf + LOG_CHECKPOINT_2 + LOG_CHECKPOINT_LSN, max_lsn);
         mach_write_to_4(log_buf + LOG_CHECKPOINT_2 + LOG_CHECKPOINT_OFFSET,
-                        LOG_FILE_HDR_SIZE + ut_dulint_minus(max_lsn,
+                        LOG_FILE_HDR_SIZE + (ulint) ut_dulint_minus(max_lsn,
                         ut_dulint_align_down(max_lsn,OS_FILE_LOG_BLOCK_SIZE)));
 #ifdef XTRADB_BASED
 	MACH_WRITE_64(log_buf + LOG_CHECKPOINT_2 + LOG_CHECKPOINT_ARCHIVED_LSN,
@@ -4745,7 +4918,7 @@
 		success = os_file_write(src_path, src_file, log_buf,
 				(ulint)(file_size & 0xFFFFFFFFUL),
 				(ulint)(file_size >> 32),
-				UNIV_PAGE_SIZE - (file_size % UNIV_PAGE_SIZE));
+				UNIV_PAGE_SIZE - (ulint) (file_size % UNIV_PAGE_SIZE));
 		if (!success) {
 			goto error;
 		}
@@ -4758,7 +4931,7 @@
 		ulint	expand;
 
 		memset(log_buf, 0, UNIV_PAGE_SIZE * 128);
-		expand = file_size / UNIV_PAGE_SIZE / 8;
+		expand = (ulint) (file_size / UNIV_PAGE_SIZE / 8);
 
 		for (; expand > 128; expand -= 128) {
 			success = os_file_write(src_path, src_file, log_buf,
@@ -4808,7 +4981,7 @@
 #endif
 
 	os_file_close(src_file);
-	src_file = -1;
+	src_file = XB_FILE_UNDEFINED;
 
 	/* Backup log parameters */
 	innobase_log_group_home_dir_backup = innobase_log_group_home_dir;
@@ -4823,11 +4996,7 @@
 	srv_thread_concurrency = 0;
 
 	/* rename 'xtrabackup_logfile' to 'ib_logfile0' */
-	success = os_file_rename(
-#if (MYSQL_VERSION_ID > 50500)
-			0 /* dummy of innodb_file_data_key */,
-#endif
-			src_path, dst_path);
+	success = xb_file_rename(src_path, dst_path);
 	if (!success) {
 		goto error;
 	}
@@ -4839,12 +5008,12 @@
 
 skip_modify:
 	os_file_close(src_file);
-	src_file = -1;
+	src_file = XB_FILE_UNDEFINED;
 	ut_free(log_buf_);
 	return(FALSE);
 
 error:
-	if (src_file != -1)
+	if (src_file != XB_FILE_UNDEFINED)
 		os_file_close(src_file);
 	if (log_buf_)
 		ut_free(log_buf_);
@@ -4881,11 +5050,10 @@
 	const char*	dbname,		/* in: database name (ibdata: NULL) */
 	const char*	filename,	/* in: file name (not a path),
 					including the .delta extension */
-	my_bool check_newer)
+	my_bool check_newer __attribute__((unused)))
 {
-	(void)check_newer;
-	os_file_t	src_file = -1;
-	os_file_t	dst_file = -1;
+	os_file_t	src_file = XB_FILE_UNDEFINED;
+	os_file_t	dst_file = XB_FILE_UNDEFINED;
 	char	src_path[FN_REFLEN];
 	char	dst_path[FN_REFLEN];
 	char	meta_path[FN_REFLEN];
@@ -4938,11 +5106,9 @@
 		goto error;
 	}
 	
-	src_file = os_file_create_simple_no_error_handling(
-#if (MYSQL_VERSION_ID > 50500)
-			0 /* dummy of innodb_file_data_key */,
-#endif
-			src_path, OS_FILE_OPEN, OS_FILE_READ_WRITE, &success);
+	src_file = xb_file_create_no_error_handling(src_path, OS_FILE_OPEN,
+						    OS_FILE_READ_WRITE,
+						    &success);
 	if (!success) {
 		os_file_get_last_error(TRUE);
 		fprintf(stderr,
@@ -4956,15 +5122,11 @@
 	posix_fadvise(src_file, 0, 0, POSIX_FADV_DONTNEED);
 #endif
 
-	if (srv_unix_file_flush_method == SRV_UNIX_O_DIRECT) {
-		os_file_set_nocache(src_file, src_path, "OPEN");
-	}
+	xb_file_set_nocache(src_file, src_path, "OPEN");
 
-	dst_file = os_file_create_simple_no_error_handling(
-#if (MYSQL_VERSION_ID > 50500)
-			0 /* dummy of innodb_file_data_key */,
-#endif
-			dst_path, OS_FILE_OPEN, OS_FILE_READ_WRITE, &success);
+	dst_file = xb_file_create_no_error_handling(dst_path, OS_FILE_OPEN,
+						    OS_FILE_READ_WRITE,
+						    &success);
 	if (!success) {
 		os_file_get_last_error(TRUE);
 		fprintf(stderr,
@@ -4977,9 +5139,7 @@
 	posix_fadvise(dst_file, 0, 0, POSIX_FADV_DONTNEED);
 #endif
 
-	if (srv_unix_file_flush_method == SRV_UNIX_O_DIRECT) {
-		os_file_set_nocache(dst_file, dst_path, "OPEN");
-	}
+	xb_file_set_nocache(dst_file, dst_path, "OPEN");
 
 	printf("Applying %s ...\n", src_path);
 
@@ -5063,16 +5223,16 @@
 		incremental_buffers++;
 	}
 
-	if (src_file != -1)
+	if (src_file != XB_FILE_UNDEFINED)
 		os_file_close(src_file);
-	if (dst_file != -1)
+	if (dst_file != XB_FILE_UNDEFINED)
 		os_file_close(dst_file);
 	return;
 
 error:
-	if (src_file != -1)
+	if (src_file != XB_FILE_UNDEFINED)
 		os_file_close(src_file);
-	if (dst_file != -1)
+	if (dst_file != XB_FILE_UNDEFINED)
 		os_file_close(dst_file);
 	fprintf(stderr, "xtrabackup: Error: xtrabackup_apply_delta() failed.\n");
 	return;
@@ -5188,7 +5348,7 @@
 static my_bool
 xtrabackup_close_temp_log(my_bool clear_flag)
 {
-	os_file_t	src_file = -1;
+	os_file_t	src_file = XB_FILE_UNDEFINED;
 	char	src_path[FN_REFLEN];
 	char	dst_path[FN_REFLEN];
 	ibool	success;
@@ -5217,11 +5377,7 @@
 	srv_normalize_path_for_win(dst_path);
 	srv_normalize_path_for_win(src_path);
 
-	success = os_file_rename(
-#if (MYSQL_VERSION_ID > 50500)
-			0 /* dummy of innodb_file_data_key */,
-#endif
-			dst_path, src_path);
+	success = xb_file_rename(dst_path, src_path);
 	if (!success) {
 		goto error;
 	}
@@ -5231,12 +5387,9 @@
 		return(FALSE);
 
 	/* clear LOG_FILE_WAS_CREATED_BY_HOT_BACKUP field */
-	src_file = os_file_create_simple_no_error_handling(
-#if (MYSQL_VERSION_ID > 50500)
-				0 /* dummy of innodb_file_data_key */,
-#endif
-				src_path, OS_FILE_OPEN,
-				OS_FILE_READ_WRITE, &success);
+	src_file = xb_file_create_no_error_handling(src_path, OS_FILE_OPEN,
+						    OS_FILE_READ_WRITE,
+						    &success);
 	if (!success) {
 		goto error;
 	}
@@ -5245,9 +5398,7 @@
 	posix_fadvise(src_file, 0, 0, POSIX_FADV_DONTNEED);
 #endif
 
-	if (srv_unix_file_flush_method == SRV_UNIX_O_DIRECT) {
-		os_file_set_nocache(src_file, src_path, "OPEN");
-	}
+	xb_file_set_nocache(src_file, src_path, "OPEN");
 
 	log_buf_ = ut_malloc(LOG_FILE_HDR_SIZE * 2);
 	log_buf = ut_align(log_buf_, LOG_FILE_HDR_SIZE);
@@ -5265,11 +5416,11 @@
 	}
 
 	os_file_close(src_file);
-	src_file = -1;
+	src_file = XB_FILE_UNDEFINED;
 
 	return(FALSE);
 error:
-	if (src_file != -1)
+	if (src_file != XB_FILE_UNDEFINED)
 		os_file_close(src_file);
 	if (log_buf_)
 		ut_free(log_buf_);
@@ -5471,7 +5622,7 @@
 			fil_system_t*	f_system = fil_system;
 			fil_space_t*	space;
 			fil_node_t*	node;
-			os_file_t	info_file = -1;
+			os_file_t	info_file = XB_FILE_UNDEFINED;
 			char		info_file_path[FN_REFLEN];
 			ibool		success;
 			char		table_name[FN_REFLEN];
@@ -5587,12 +5738,11 @@
 					}
 
 					srv_normalize_path_for_win(info_file_path);
-					info_file = os_file_create(
-#if (MYSQL_VERSION_ID > 50500)
-								0 /* dummy of innodb_file_data_key */,
-#endif
-								info_file_path, OS_FILE_OVERWRITE,
-								OS_FILE_NORMAL, OS_DATA_FILE, &success);
+					info_file = xb_file_create(
+						info_file_path,
+						OS_FILE_OVERWRITE,
+						OS_FILE_NORMAL, OS_DATA_FILE,
+						&success);
 					if (!success) {
 						os_file_get_last_error(TRUE);
 						goto next_node;
@@ -5609,9 +5759,9 @@
 						goto next_node;
 					}
 next_node:
-					if (info_file != -1) {
+					if (info_file != XB_FILE_UNDEFINED) {
 						os_file_close(info_file);
-						info_file = -1;
+						info_file = XB_FILE_UNDEFINED;
 					}
 					mutex_exit(&(dict_sys->mutex));
 					mutex_enter(&(f_system->mutex));
@@ -5756,6 +5906,7 @@
 	int ho_error;
 
 	MY_INIT(argv[0]);
+	xb_regex_init();
 
 	load_defaults("my",load_default_groups,&argc,&argv);
 
@@ -5824,7 +5975,7 @@
 			tables_regex_num++;
 		}
 
-		tables_regex = ut_malloc(sizeof(regex_t) * tables_regex_num);
+		tables_regex = ut_malloc(sizeof(xb_regex_t) * tables_regex_num);
 
 		p = xtrabackup_tables;
 		for (i=0; i < tables_regex_num; i++) {
@@ -5835,9 +5986,11 @@
 			if (i != tables_regex_num - 1)
 				*(next - 1) = '\0';
 
-			regerror(regcomp(&tables_regex[i],p,REG_EXTENDED),
-					&tables_regex[i],errbuf,sizeof(errbuf));
-			fprintf(stderr, "xtrabackup: tables regcomp(%s): %s\n",p,errbuf);
+			xb_regerror(xb_regcomp(&tables_regex[i], p,
+					       REG_EXTENDED),
+				    &tables_regex[i], errbuf, sizeof(errbuf));
+			fprintf(stderr, "xtrabackup: tables regcomp(%s): %s\n",
+				p, errbuf);
 
 			if (i != tables_regex_num - 1)
 				*(next - 1) = ',';
@@ -6080,7 +6233,7 @@
 		int i;
 
 		for (i = 0; i < tables_regex_num; i++) {
-			regfree(&tables_regex[i]);
+			xb_regfree(&tables_regex[i]);
 		}
 		ut_free(tables_regex);
 	}
@@ -6109,5 +6262,7 @@
 		hash_table_free(tables_hash);
 	}
 
+	xb_regex_end();
+
 	exit(EXIT_SUCCESS);
 }