Merge lp:~laurynas-biveinis/percona-xtrabackup/BT-28340-cpp-2.0 into lp:percona-xtrabackup/2.0

[Laurynas Biveinis]

3rd MP: xtrabackup_stream declaration and bug 1130581 fixed.
http://jenkins.percona.com/job/percona-xtrabackup-2.0-param/333/

2nd MP: compress.c changes as described in a comment.
http://jenkins.percona.com/job/percona-xtrabackup-2.0-param/332/

1st MP:
BT 28340
http://jenkins.percona.com/job/percona-xtrabackup-2.0-param/331/
Build InnoDB-facing parts of XtraBackup with a C++ compiler,
implementing
https://blueprints.launchpad.net/percona-xtrabackup/+spec/xtrabackup-cpp

For 2.0, the InnoDB-facing parts is defined as xtrabackup.cc, renamed
from xtrabackup.c. The rest is built with a C compiler.

utils/build.sh: add -fpermissive to CXXFLAGS for 5.0 and 5.1-builtin
InnoDB.

src/Makefile: define CXXFLAGS, define COMMON_FLAGS for C- and
C++-shared flags. Split XTRABACKUPOBJS into XTRABACKUPCOBJS and
XTRABACKUPCCOBJS. Add a C++ build rule.

Fix a bunch of compilation warnings, including new C++ warnings (and
errors) and some of the existing ones.

[Laurynas Biveinis (laurynas-biveinis)]

Missed that compress.c includes univ.i and uses ibool and ut_a. The fix is trivial, not affecting anything else, thus leaving as "Needs Review" for now.

=== modified file 'src/compress.c'
--- src/compress.c 2013-02-14 05:45:51 +0000
+++ src/compress.c 2013-02-19 07:34:28 +0000
@@ -21,7 +21,6 @@
 #include <mysql_version.h>
 #include <my_base.h>
 #include <quicklz.h>
-#include <univ.i>
 #include <zlib.h>
 #include "common.h"
 #include "datasink.h"
@@ -63,9 +62,9 @@
  size_t bytes_processed;
 } ds_compress_file_t;

-extern ibool xtrabackup_stream;
+extern my_bool xtrabackup_stream;
 extern uint xtrabackup_parallel;
-extern ibool xtrabackup_compress_threads;
+extern my_bool xtrabackup_compress_threads;

 static ds_ctxt_t *compress_init(const char *root);
 static ds_file_t *compress_open(ds_ctxt_t *ctxt, const char *path,
@@ -272,7 +271,7 @@
         &thd->data_mutex);
    }

- ut_a(threads[i].to_len > 0);
+ xb_a(threads[i].to_len > 0);

    if (dest_ds->write(dest_file, "NEWBNEWB", 8) ||
        write_uint64_le(dest_ds, dest_file,

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

The instant after submitting the 2nd MP I realized that
- xtrabackup_stream needs its declaration adjusted in xtrabackup.cc;
- xtrabackup_compress_threads is declared ibool/my_bool in compress.c and uint in xtrabackup.cc!

review: Needs Fixing

[Alexey Kopytov (akopytov)]

>utils/build.sh: add -fpermissive to CXXFLAGS for 5.0 and 5.1-builtin
> InnoDB.

Unfortunately this breaks building with clang which doesn't support -fpermissive.

Which is not a big deal for me, "CC=gcc CXX=g++ utils/build.sh" works just fine. But someone somewhere might get hit by this.

[Laurynas Biveinis (laurynas-biveinis)]

Fixing 5.0 and 5.1-builtin not to need -fpermissive needs making a rather large patch for include/*.ic in an effort that is IMHO hard to justify. I suggest we document that building with clang is not supported for these two configurations.

=== modified file 'src/Makefile'
--- src/Makefile	2013-01-07 06:17:40 +0000
+++ src/Makefile	2013-02-21 12:24:29 +0000
@@ -12,10 +12,13 @@
 LIBS += -lpthread
 DEFS = -DUNIV_LINUX -DMYSQL_SERVER
 
-CFLAGS += -DXTRABACKUP_VERSION=\"$(XTRABACKUP_VERSION)\" -pedantic -Wall -Wundef -Wshadow  -fdiagnostics-show-option  -fno-strict-aliasing -Wno-strict-aliasing -Wextra -Wformat -Wno-format-nonliteral -Wno-format-security -Wno-long-long  -Wmissing-declarations  -Wno-redundant-decls --std=gnu99
+COMMON_FLAGS = -DXTRABACKUP_VERSION=\"$(XTRABACKUP_VERSION)\" -pedantic -Wall -Wundef -Wshadow  -fdiagnostics-show-option  -fno-strict-aliasing -Wno-strict-aliasing -Wextra -Wformat -Wno-format-nonliteral -Wno-format-security -Wno-long-long  -Wmissing-declarations  -Wno-redundant-decls
+CFLAGS += $(COMMON_FLAGS) --std=gnu99
+CXXFLAGS += $(COMMON_FLAGS)
 
 ifneq ($(DEBUG),)
 CFLAGS += -DXB_DEBUG=1
+CXXFLAGS += -DXB_DEBUG=1
 endif
 
 TARGET=xtrabackup
@@ -23,9 +26,10 @@
 BIN_DIR=$(PREFIX)/bin
 
 COMMON_INC = -I. -I libarchive/libarchive -I quicklz
-XTRABACKUPOBJS = xtrabackup.o stream.o local.o compress.o buffer.o \
+XTRABACKUPCOBJS = stream.o local.o compress.o buffer.o \
 	xbstream_write.o \
 	quicklz/quicklz.o
+XTRABACKUPCCOBJS = xtrabackup.o
 XBSTREAMOBJS = xbstream.o xbstream_write.o xbstream_read.o
 
 LIBARCHIVE_A = libarchive/libarchive/libarchive.a
@@ -171,20 +175,23 @@
 xtradb55: TARGET := xtrabackup_55
 xtradb55: $(TARGET) xbstream
 
-$(XTRABACKUPOBJS): %.o: %.c
+$(XTRABACKUPCOBJS): %.o: %.c
 	$(CC) $(CFLAGS) $(INC) $(DEFS) -c $< -o $@
 
+$(XTRABACKUPCCOBJS): %.o: %.cc
+	$(CXX) $(CXXFLAGS) $(INC) $(DEFS) -c $< -o $@
+
 xbstream.o xbstream_read.o: %.o: %.c
 	$(CC) $(CFLAGS) $(INC) $(DEFS) -c $< -o $@
 
 xbstream: $(XBSTREAMOBJS) $(MYSQLOBJS) local.o
 	$(CC) $(CFLAGS) $^ $(INC) $(MYSQLOBJS) $(LIBS) -o $@
 
-xtrabackup.o: xtrabackup.c xb_regex.h
+xtrabackup.o: xtrabackup.cc xb_regex.h
 
-$(TARGET): $(XTRABACKUPOBJS) $(INNODBOBJS) $(MYSQLOBJS) $(LIBARCHIVE_A)
-	$(CC) $(CFLAGS) $(XTRABACKUPOBJS) $(INNODBOBJS) $(MYSQLOBJS) $(LIBS) \
+$(TARGET): $(XTRABACKUPCCOBJS) $(XTRABACKUPCOBJS) $(INNODBOBJS) $(MYSQLOBJS) $(LIBARCHIVE_A)
+	$(CXX) $(CFXXLAGS) $(XTRABACKUPCCOBJS) $(XTRABACKUPCOBJS) $(INNODBOBJS) $(MYSQLOBJS) $(LIBS) \
 	$(LIBARCHIVE_A) -o $(TARGET)
 
 clean:
-	rm -f $(XTRABACKUPOBJS) $(XBSTREAMOBJS) xtrabackup xtrabackup_* 
+	rm -f $(XTRABACKUPCCOBJS) $(XTRABACKUPCOBJS) $(XBSTREAMOBJS) xtrabackup xtrabackup_* 

=== modified file 'src/buffer.c'
--- src/buffer.c	2013-01-07 06:17:40 +0000
+++ src/buffer.c	2013-02-21 12:24:29 +0000
@@ -23,6 +23,7 @@
 specified buffer size (DS_DEFAULT_BUFFER_SIZE by default), with the only
 exception for the last write for a file. */
 
+#include <mysql_version.h>
 #include <my_base.h>
 #include "common.h"
 #include "datasink.h"

=== modified file 'src/compress.c'
--- src/compress.c	2013-01-13 12:28:59 +0000
+++ src/compress.c	2013-02-21 12:24:29 +0000
@@ -18,10 +18,9 @@
 
 *******************************************************/
 
-
+#include <mysql_version.h>
 #include <my_base.h>
 #include <quicklz.h>
-#include <univ.i>
 #include <zlib.h>
 #include "common.h"
 #include "datasink.h"
@@ -63,9 +62,9 @@
 	size_t			bytes_processed;
 } ds_compress_file_t;
 
-extern ibool 	xtrabackup_stream;
+extern my_bool	xtrabackup_stream;
 extern uint	xtrabackup_parallel;
-extern ibool	xtrabackup_compress_threads;
+extern uint	xtrabackup_compress_threads;
 
 static ds_ctxt_t *compress_init(const char *root);
 static ds_file_t *compress_open(ds_ctxt_t *ctxt, const char *path,
@@ -272,7 +271,7 @@
 						  &thd->data_mutex);
 			}
 
-			ut_a(threads[i].to_len > 0);
+			xb_a(threads[i].to_len > 0);
 
 			if (dest_ds->write(dest_file, "NEWBNEWB", 8) ||
 			    write_uint64_le(dest_ds, dest_file,

=== modified file 'src/compress.h'
--- src/compress.h	2013-01-11 12:56:00 +0000
+++ src/compress.h	2013-02-21 12:24:29 +0000
@@ -25,7 +25,15 @@
 
 extern datasink_t datasink_compress;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Return a target datasink for the specified compress datasink */
 ds_ctxt_t *compress_get_dest_ctxt(ds_ctxt_t *);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

=== modified file 'src/local.c'
--- src/local.c	2013-01-11 12:56:00 +0000
+++ src/local.c	2013-02-21 12:24:29 +0000
@@ -18,6 +18,7 @@
 
 *******************************************************/
 
+#include <mysql_version.h>
 #include <my_base.h>
 #include <mysys_err.h>
 #include "common.h"

=== modified file 'src/stream.c'
--- src/stream.c	2013-01-11 12:56:00 +0000
+++ src/stream.c	2013-02-21 12:24:29 +0000
@@ -18,6 +18,7 @@
 
 *******************************************************/
 
+#include <mysql_version.h>
 #include <my_base.h>
 #include <archive.h>
 #include <archive_entry.h>

=== modified file 'src/xbstream.c'
--- src/xbstream.c	2013-01-11 12:56:00 +0000
+++ src/xbstream.c	2013-02-21 12:24:29 +0000
@@ -18,6 +18,7 @@
 
 *******************************************************/
 
+#include <mysql_version.h>
 #include <my_base.h>
 #include <my_getopt.h>
 #include <hash.h>

=== modified file 'src/xbstream_read.c'
--- src/xbstream_read.c	2013-01-11 12:56:00 +0000
+++ src/xbstream_read.c	2013-02-21 12:24:29 +0000
@@ -18,6 +18,7 @@
 
 *******************************************************/
 
+#include <mysql_version.h>
 #include <my_base.h>
 #include <zlib.h>
 #include "common.h"

=== modified file 'src/xbstream_write.c'
--- src/xbstream_write.c	2013-01-11 12:56:00 +0000
+++ src/xbstream_write.c	2013-02-21 12:24:29 +0000
@@ -18,6 +18,7 @@
 
 *******************************************************/
 
+#include <mysql_version.h>
 #include <my_base.h>
 #include <zlib.h>
 #include "common.h"

=== renamed file 'src/xtrabackup.c' => 'src/xtrabackup.cc'
--- src/xtrabackup.c	2013-01-13 22:34:01 +0000
+++ src/xtrabackup.cc	2013-02-21 12:24:29 +0000
@@ -48,9 +48,9 @@
 
 //#define XTRABACKUP_TARGET_IS_PLUGIN
 
+#include <mysql_version.h>
 #include <my_base.h>
 #include <my_getopt.h>
-#include <mysql_version.h>
 #include <mysql_com.h>
 
 #if (MYSQL_VERSION_ID < 50100)
@@ -59,6 +59,8 @@
 #define G_PTR uchar*
 #endif
 
+extern "C" {
+
 #include <univ.i>
 #include <os0file.h>
 #include <os0thread.h>
@@ -86,12 +88,16 @@
 #include <btr0sea.h>
 #include <log0recv.h>
 #include <fcntl.h>
+#include <buf0flu.h>
 #include <buf0lru.h>
 
 #ifdef INNODB_VERSION_SHORT
 #include <ibuf0ibuf.h>
+#include <page0zip.h>
 #endif
 
+} /* extern "C" */
+
 #include "common.h"
 #include "datasink.h"
 #include "local.h"
@@ -145,6 +151,8 @@
 #define UNIV_PAGE_SIZE_SHIFT_MAX UNIV_PAGE_SIZE_SHIFT
 #endif
 
+extern "C" {
+
 #if MYSQL_VERSION_ID >= 50507
 /*
    As of MySQL 5.5.7, InnoDB uses thd_wait plugin service.
@@ -168,7 +176,7 @@
 
 #endif /* MYSQL_VERSION_ID >= 50507 */
 
-/* prototypes for static functions in original */
+/* prototypes for static and non-prototyped functions in original */
 #ifndef INNODB_VERSION_SHORT
 page_t*
 btr_node_ptr_get_child(
@@ -177,7 +185,92 @@
 	rec_t*		node_ptr,/* in: node pointer */
 	const ulint*	offsets,/* in: array returned by rec_get_offsets() */
 	mtr_t*		mtr);	/* in: mtr */
-#else
+
+ibool
+thd_is_replication_slave_thread(
+	void*	thd);
+
+ibool
+thd_has_edited_nontrans_tables(
+	void*	thd);
+
+ibool
+thd_is_select(
+	const void*	thd);
+
+void
+innobase_mysql_print_thd(
+	FILE*   f,
+	void*   input_thd,
+	uint	max_query_len);
+
+void
+innobase_convert_from_table_id(
+	char*	to,
+	const char*	from,
+	ulint	len);
+
+void
+innobase_convert_from_id(
+	char*	to,
+	const char*	from,
+	ulint	len);
+
+int
+innobase_strcasecmp(
+	const char*	a,
+	const char*	b);
+
+void
+innobase_casedn_str(
+	char*	a);
+
+struct charset_info_st*
+innobase_get_charset(
+	void*   mysql_thd);
+
+int
+innobase_mysql_tmpfile(void);
+
+void
+innobase_invalidate_query_cache(
+	trx_t*	trx,
+	char*	full_name,
+	ulint	full_name_len);
+
+/*****************************************************************//**
+Convert a table or index name to the MySQL system_charset_info (UTF-8)
+and quote it if needed.
+@return	pointer to the end of buf */
+char*
+innobase_convert_name(
+/*==================*/
+	char*		buf,	/*!< out: buffer for converted identifier */
+	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		table_id);/*!< in: TRUE=id is a table or database name;
+					   FALSE=id is an index name */
+
+int
+innobase_mysql_cmp(
+	int		mysql_type,
+	uint		charset_number,
+	unsigned char*	a,
+	unsigned int	a_length,
+	unsigned char*	b,
+	unsigned int	b_length);
+
+ulint
+innobase_get_at_most_n_mbchars(
+	ulint charset_id,
+	ulint prefix_len,
+	ulint data_len,
+	const char* str);
+
+#else /* #ifndef INNODB_VERSION_SHORT */
+
 buf_block_t*
 btr_node_ptr_get_child(
 /*===================*/
@@ -191,8 +284,30 @@
 /*===============*/
 	dict_index_t*	index,	/*!< in: index tree */
 	mtr_t*		mtr);	/*!< in: mtr */
+
+int
+innobase_mysql_cmp(
+/*===============*/
+	int		mysql_type,
+	uint		charset_number,
+	unsigned char*	a,
+	unsigned int	a_length,
+	unsigned char*	b,
+	unsigned int	b_length);
+
+#endif /* #ifndef INNODB_VERSION_SHORT */
+
+#ifdef XTRADB_BASED
+trx_t*
+innobase_get_trx();
 #endif
 
+void
+innobase_get_cset_width(
+	ulint	cset,
+	ulint*	mbminlen,
+	ulint*	mbmaxlen);
+
 int
 fil_file_readdir_next_file(
 /*=======================*/
@@ -269,6 +384,8 @@
 					a file, so this is either "open" or
 					"create" */
 
+} /* extern "C" */
+
 /****************************************************************//**
 A simple function to open or create a file.
 @return own: handle to the file, not defined if error, error number
@@ -723,7 +840,9 @@
 	const char*	name)	/*!< in: space name */
 {
 	fil_space_t*	space;
+#ifdef INNODB_VERSION_SHORT
 	ulint		fold;
+#endif
 
 	ut_ad(mutex_own(&fil_system->mutex));
 
@@ -745,6 +864,7 @@
 
 /*******************************************************************//**
 Free all spaces in space_list. */
+static
 void
 fil_free_all_spaces(void)
 /*=====================*/
@@ -756,7 +876,6 @@
 	space = UT_LIST_GET_FIRST(fil_system->space_list);
 
 	while (space != NULL) {
-		fil_node_t*	node;
 		fil_space_t*	prev_space = space;
 
 		space = UT_LIST_GET_NEXT(space_list, space);
@@ -841,9 +960,9 @@
 
 char *xtrabackup_stream_str = NULL;
 xb_stream_fmt_t xtrabackup_stream_fmt;
-ibool xtrabackup_stream = FALSE;
+my_bool xtrabackup_stream = FALSE;
 
-char *xtrabackup_compress_alg = NULL;
+static const char *xtrabackup_compress_alg = NULL;
 ibool xtrabackup_compress = FALSE;
 uint xtrabackup_compress_threads;
 
@@ -907,7 +1026,9 @@
 long innobase_open_files = 300L;
 
 long innobase_page_size = (1 << 14); /* 16KB */
+#ifdef XTRADB_BASED
 static ulong innobase_log_block_size = 512;
+#endif
 my_bool innobase_fast_checksum = FALSE;
 my_bool	innobase_extra_undoslots = FALSE;
 char*	innobase_doublewrite_file = NULL;
@@ -970,7 +1091,8 @@
 {
 	datafiles_iter_t *it;
 
-	it = ut_malloc(sizeof(datafiles_iter_t));
+	it = static_cast<datafiles_iter_t *>
+		(ut_malloc(sizeof(datafiles_iter_t)));
 	it->mutex = OS_MUTEX_CREATE();
 
 	it->system = f_system;
@@ -1426,7 +1548,7 @@
 }
 #endif
 
-UNIV_INLINE
+static
 void
 debug_sync_point(const char *name)
 {
@@ -1434,7 +1556,6 @@
 	FILE	*fp;
 	pid_t	pid;
 	char	pid_path[FN_REFLEN];
-	int	stat_loc;
 
 	if (xtrabackup_debug_sync == NULL) {
 		return;
@@ -1562,6 +1683,8 @@
 
 /* ================ Dummys =================== */
 
+extern "C" {
+
 ibool
 thd_is_replication_slave_thread(
 	void*	thd)
@@ -1590,18 +1713,6 @@
 }
 
 void
-innobase_mysql_prepare_print_arbitrary_thd(void)
-{
-	/* do nothing */
-}
-
-void
-innobase_mysql_end_print_arbitrary_thd(void)
-{
-	/* do nothing */
-}
-
-void
 innobase_mysql_print_thd(
 	FILE*   f,
 	void*   input_thd,
@@ -1695,6 +1806,8 @@
 	return(NULL);
 }
 
+#ifdef INNODB_VERSION_SHORT
+
 const char*
 innobase_get_stmt(
 	void*	mysql_thd,
@@ -1706,6 +1819,8 @@
 	return("nothing");
 }
 
+#endif
+
 int
 innobase_mysql_tmpfile(void)
 {
@@ -1764,12 +1879,15 @@
 	return(fd2);
 }
 
+} /* extern "C" */
+
 /***********************************************************************
 Creates a temporary file in tmpdir with a specified prefix in the file
 name. The file will be automatically removed on close.
 Unlike innobase_mysql_tmpfile(), dup() is not used, so the returned
 file must be closed with my_close().
 @return file descriptor or a negative number in case of error.*/
+static
 File
 xtrabackup_create_tmpfile(char *path, const char *prefix)
 {
@@ -1793,6 +1911,8 @@
 	return(fd);
 }
 
+extern "C" {
+
 void
 innobase_invalidate_query_cache(
 	trx_t*	trx,
@@ -1809,43 +1929,7 @@
 	/* do nothing */
 }
 
-int
-mysql_get_identifier_quote_char(
-	trx_t*		trx,
-	const char*	name,
-	ulint		namelen)
-{
-	(void)trx;
-	(void)name;
-	(void)namelen;
-	return '"';
-}
-
-void
-innobase_print_identifier(
-	FILE*	f,
-	trx_t*	trx __attribute__((unused)),
-	ibool	table_id __attribute__((unused)),
-	const char*	name,
-	ulint	namelen)
-{
-        const char*     s       = name;
-        const char*     e = s + namelen;
-        int             q;
-
-	q = '"';
-
-        putc(q, f);
-        while (s < e) {
-                int     c = *s++;
-                if (c == q) {
-                        putc(c, f);
-                }
-                putc(c, f);
-        }
-        putc(q, f);
-}
-
+#if MYSQL_VERSION_ID >= 50500
 /**********************************************************************//**
 It should be safe to use lower_case_table_names=0 for xtrabackup. If it causes
 any problems, we can add the lower_case_table_names option to xtrabackup
@@ -1870,6 +1954,9 @@
 
 	return((name) ? name : "null");
 }
+#endif
+
+} /* extern "C" */
 
 /*****************************************************************//**
 Convert an SQL identifier to the MySQL system_charset_info (UTF-8)
@@ -1935,6 +2022,8 @@
 	return(buf);
 }
 
+extern "C" {
+
 /*****************************************************************//**
 Convert a table or index name to the MySQL system_charset_info (UTF-8)
 and quote it if needed.
@@ -2133,13 +2222,6 @@
 	return(char_length);
 }
 
-ibool
-innobase_query_is_update(void)
-{
-	msg("xtrabackup: innobase_query_is_update() is called\n");
-	return(0);
-}
-
 #ifdef INNODB_VERSION_SHORT
 ulint
 innobase_raw_format(
@@ -2206,6 +2288,8 @@
 #endif
 #endif
 
+} /* extern "C" */
+
 /***********************************************************************//**
 Compatibility wrapper around os_file_flush().
 @return	TRUE if success */
@@ -2225,7 +2309,7 @@
 /***********************************************************************
 Computes bit shift for a given value. If the argument is not a power
 of 2, returns 0.*/
-UNIV_INLINE
+static inline
 ulint
 get_bit_shift(ulint value)
 {
@@ -3179,8 +3263,8 @@
 	ibool	 success;
 	ulint	 space;
 
-	buf = ut_malloc(2 * UNIV_PAGE_SIZE_MAX);
-	page = ut_align(buf, UNIV_PAGE_SIZE_MAX);
+	buf = static_cast<byte *>(ut_malloc(2 * UNIV_PAGE_SIZE_MAX));
+	page = static_cast<byte *>(ut_align(buf, UNIV_PAGE_SIZE_MAX));
 
 	success = os_file_read(file, page, 0, 0, UNIV_PAGE_SIZE_MAX);
 	if (!success) {
@@ -3301,10 +3385,13 @@
 
 	if (xtrabackup_incremental) {
 		/* allocate buffer for incremental backup (4096 pages) */
-		incremental_buffer_base = ut_malloc((UNIV_PAGE_SIZE_MAX / 4 + 1)
-						    * UNIV_PAGE_SIZE_MAX);
-		incremental_buffer = ut_align(incremental_buffer_base,
-				      UNIV_PAGE_SIZE_MAX);
+		incremental_buffer_base
+			= static_cast<byte *>(ut_malloc((UNIV_PAGE_SIZE_MAX
+							 / 4 + 1)
+							* UNIV_PAGE_SIZE_MAX));
+		incremental_buffer
+			= static_cast<byte *>(ut_align(incremental_buffer_base,
+						       UNIV_PAGE_SIZE_MAX));
 
 		snprintf(meta_name, sizeof(meta_name),
 			 "%s%s", dst_name, XB_DELTA_INFO_SUFFIX);
@@ -3350,8 +3437,9 @@
 		    node->name, dstfile->path);
 	}
 
-	buf2 = ut_malloc(COPY_CHUNK * page_size + UNIV_PAGE_SIZE);
-	page = ut_align(buf2, UNIV_PAGE_SIZE);
+	buf2 = static_cast<byte *>(ut_malloc(COPY_CHUNK
+					     * page_size + UNIV_PAGE_SIZE));
+	page = static_cast<byte *>(ut_align(buf2, UNIV_PAGE_SIZE));
 
 	success = os_file_read(src_file, page, 0, 0, UNIV_PAGE_SIZE);
 	if (!success) {
@@ -3910,6 +3998,7 @@
 Initialize the tablespace memory cache and populate it by scanning for and
 opening data files.
 @returns DB_SUCCESS or error code.*/
+static
 ulint
 xb_data_files_init(void)
 /*====================*/
@@ -3991,6 +4080,7 @@
 /*********************************************************************//**
 Normalizes init parameter values to use units we use inside InnoDB.
 @return	DB_SUCCESS or error code */
+static
 void
 xb_normalize_init_values(void)
 /*==========================*/
@@ -4030,6 +4120,7 @@
 
 /************************************************************************
 Destroy the tablespace memory cache. */
+static
 void
 xb_data_files_close(void)
 /*====================*/
@@ -4082,42 +4173,6 @@
 	srv_shutdown_state = SRV_SHUTDOWN_NONE;
 }
 
-/***************************************************************************
-Creates an output directory for a given tablespace, if it does not exist */
-static
-int
-xtrabackup_create_output_dir(
-/*==========================*/
-				/* out: 0 if succes, -1 if failure */
-	fil_space_t *space)	/* in: tablespace */
-{
-	char	path[FN_REFLEN];
-	char	*ptr1, *ptr2;
-
-	/* mkdir if not exist */
-	ptr1 = strstr(space->name, SRV_PATH_SEPARATOR_STR);
-	if (ptr1) {
-		ptr2 = strstr(ptr1 + 1, SRV_PATH_SEPARATOR_STR);
-	} else {
-		ptr2 = NULL;
-	}
-	if(!trx_sys_sys_space(space->id) && ptr2)
-	{
-		/* single table space */
-		*ptr2 = 0; /* temporary (it's my lazy..)*/
-		snprintf(path, sizeof(path), "%s%s", xtrabackup_target_dir,
-			 ptr1);
-		*ptr2 = SRV_PATH_SEPARATOR;
-
-		if (my_mkdir(path, 0777, MYF(0)) < 0 && my_errno != EEXIST) {
-			msg("xtrabackup: Error: cannot mkdir %d: %s\n",
-			    my_errno, path);
-			return -1;
-		}
-	}
-	return 0;
-}
-
 /**************************************************************************
 Datafiles copying thread.*/
 static
@@ -4128,7 +4183,6 @@
 {
 	data_thread_ctxt_t	*ctxt = (data_thread_ctxt_t *) arg;
 	uint			num = ctxt->num;
-	fil_space_t*		space;
 	fil_node_t*     	node;
 
 	/*
@@ -4140,7 +4194,6 @@
 	debug_sync_point("data_copy_thread_func");
 
 	while ((node = datafiles_iter_next(ctxt->it)) != NULL) {
-		space = node->space;
 
 		/* copy the datafile */
 		if(xtrabackup_copy_datafile(node, num, ctxt->ds_ctxt)) {
@@ -4279,7 +4332,8 @@
 			tables_regex_num++;
 		}
 
-		tables_regex = ut_malloc(sizeof(xb_regex_t) * tables_regex_num);
+		tables_regex = static_cast<xb_regex_t *>
+			(ut_malloc(sizeof(xb_regex_t) * tables_regex_num));
 
 		p = xtrabackup_tables;
 		for (i=0; i < tables_regex_num; i++) {
@@ -4331,7 +4385,9 @@
 				*p = '\0';
 			}
 
-			table = malloc(sizeof(xtrabackup_tables_t) + strlen(name_buf) + 1);
+			table = static_cast<xtrabackup_tables_t *>
+				(malloc(sizeof(xtrabackup_tables_t)
+					+ strlen(name_buf) + 1));
 			memset(table, '\0', sizeof(xtrabackup_tables_t) + strlen(name_buf) + 1);
 			table->name = ((char*)table) + sizeof(xtrabackup_tables_t);
 			strcpy(table->name, name_buf);
@@ -4361,12 +4417,14 @@
 		for (i = 0; i < hash_get_n_cells(tables_hash); i++) {
 			xtrabackup_tables_t*	table;
 
-			table = HASH_GET_FIRST(tables_hash, i);
+			table = static_cast<xtrabackup_tables_t *>
+				(HASH_GET_FIRST(tables_hash, i));
 
 			while (table) {
 				xtrabackup_tables_t*	prev_table = table;
 
-				table = HASH_GET_NEXT(name_hash, prev_table);
+				table = static_cast<xtrabackup_tables_t *>
+					(HASH_GET_NEXT(name_hash, prev_table));
 
 				HASH_DELETE(xtrabackup_tables_t, name_hash, tables_hash,
 						ut_fold_string(prev_table->name), prev_table);
@@ -4585,7 +4643,7 @@
 	log_group_t*	max_cp_group;
 	ulint		max_cp_field;
 	byte*		buf;
-	byte		log_hdr_buf_[LOG_FILE_HDR_SIZE + OS_FILE_LOG_BLOCK_SIZE];
+	byte*		log_hdr_buf_;
 	byte*		log_hdr_buf;
 	ulint		err;
 
@@ -4593,7 +4651,10 @@
 	os_thread_id_t log_copying_thread_id;
 	datafiles_iter_t *it;
 
-	log_hdr_buf = ut_align(log_hdr_buf_, OS_FILE_LOG_BLOCK_SIZE);
+	log_hdr_buf_ = static_cast<byte *>
+		(ut_malloc(LOG_FILE_HDR_SIZE + OS_FILE_LOG_BLOCK_SIZE));
+	log_hdr_buf = static_cast<byte *>
+		(ut_align(log_hdr_buf_, OS_FILE_LOG_BLOCK_SIZE));
 
 	/* get current checkpoint_lsn */
 	/* Look for the latest checkpoint from any of the log groups */
@@ -4604,6 +4665,7 @@
 
 	if (err != DB_SUCCESS) {
 
+		ut_free(log_hdr_buf_);
 		exit(EXIT_FAILURE);
 	}
 		
@@ -4630,6 +4692,7 @@
 
         if (err != DB_SUCCESS) {
 
+		ut_free(log_hdr_buf_);
                 exit(EXIT_FAILURE);
         }
 
@@ -4656,6 +4719,7 @@
 				msg("xtrabackup: error: "
 				    "xtrabackup_create_tmpfile() failed. "
 				    "(errno: %d)\n", my_errno);
+				ut_free(log_hdr_buf_);
 				exit(EXIT_FAILURE);
 			}
 		} else {
@@ -4667,6 +4731,7 @@
 			if (dst_log_fd < 0) {
 				msg("xtrabackup: error: cannot open %s "
 				    "(errno: %d)\n", dst_log_path, my_errno);
+				ut_free(log_hdr_buf_);
 				exit(EXIT_FAILURE);
 			}
 		}
@@ -4675,6 +4740,7 @@
 		if (dst_log_fd < 0) {
 			msg("xtrabackup: error: dup() failed (errno: %d)",
 			    errno);
+			ut_free(log_hdr_buf_);
 			exit(EXIT_FAILURE);
 		}
 	}
@@ -4688,9 +4754,12 @@
 
 	if (my_write(dst_log_fd, log_hdr_buf, LOG_FILE_HDR_SIZE,
 		     MYF(MY_WME | MY_NABP))) {
+		ut_free(log_hdr_buf_);
 		exit(EXIT_FAILURE);
 	}
 
+	ut_free(log_hdr_buf_);
+
 	/* start flag */
 	log_copying = TRUE;
 
@@ -4960,8 +5029,10 @@
 	ulonglong sum_data, sum_data_extern;
 	ulonglong n_recs;
 	ulint	page_size;
+#ifdef INNODB_VERSION_SHORT
 	buf_block_t*	block;
 	ulint	zip_size;
+#endif
 
 	n_pages = sum_data = n_recs = 0;
 	n_pages_extern = sum_data_extern = 0;
@@ -5516,8 +5587,10 @@
 			goto error;
 		}
 
-		log_buf_ = ut_malloc(LOG_FILE_HDR_SIZE * 2);
-		log_buf = ut_align(log_buf_, LOG_FILE_HDR_SIZE);
+		log_buf_ = static_cast<byte *>
+			(ut_malloc(LOG_FILE_HDR_SIZE * 2));
+		log_buf = static_cast<byte *>
+			(ut_align(log_buf_, LOG_FILE_HDR_SIZE));
 
 		success = os_file_read(src_file, log_buf, 0, 0, LOG_FILE_HDR_SIZE);
 		if (!success) {
@@ -5567,8 +5640,8 @@
 
 
 	/* TODO: We should skip the following modifies, if it is not the first time. */
-	log_buf_ = ut_malloc(UNIV_PAGE_SIZE * 129);
-	log_buf = ut_align(log_buf_, UNIV_PAGE_SIZE);
+	log_buf_ = static_cast<byte *>(ut_malloc(UNIV_PAGE_SIZE * 129));
+	log_buf = static_cast<byte *>(ut_align(log_buf_, UNIV_PAGE_SIZE));
 
 	/* read log file header */
 	success = os_file_read(src_file, log_buf, 0, 0, LOG_FILE_HDR_SIZE);
@@ -5831,9 +5904,9 @@
 		return ret;
 	}
 
-	buf = ut_malloc(3 * UNIV_PAGE_SIZE);
+	buf = static_cast<byte *>(ut_malloc(3 * UNIV_PAGE_SIZE));
 	/* Align the memory for file i/o if we might have O_DIRECT set */
-	page = ut_align(buf, UNIV_PAGE_SIZE);
+	page = static_cast<byte *>(ut_align(buf, UNIV_PAGE_SIZE));
 
 	memset(page, '\0', UNIV_PAGE_SIZE);
 
@@ -6155,10 +6228,12 @@
 	xb_file_set_nocache(dst_file, dst_path, "OPEN");
 
 	/* allocate buffer for incremental backup (4096 pages) */
-	incremental_buffer_base = ut_malloc((UNIV_PAGE_SIZE_MAX / 4 + 1) *
-					 UNIV_PAGE_SIZE_MAX);
-	incremental_buffer = ut_align(incremental_buffer_base,
-				      UNIV_PAGE_SIZE_MAX);
+	incremental_buffer_base = static_cast<byte *>
+		(ut_malloc((UNIV_PAGE_SIZE_MAX / 4 + 1) *
+			   UNIV_PAGE_SIZE_MAX));
+	incremental_buffer = static_cast<byte *>
+		(ut_align(incremental_buffer_base,
+			  UNIV_PAGE_SIZE_MAX));
 
 	msg("Applying %s to %s...\n", src_path, dst_path);
 
@@ -6439,8 +6514,8 @@
 
 	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);
+	log_buf_ = static_cast<byte *>(ut_malloc(LOG_FILE_HDR_SIZE * 2));
+	log_buf = static_cast<byte *>(ut_align(log_buf_, LOG_FILE_HDR_SIZE));
 
 	success = os_file_read(src_file, log_buf, 0, 0, LOG_FILE_HDR_SIZE);
 	if (!success) {
@@ -6668,8 +6743,10 @@
 			byte*		page;
 			byte*		buf = NULL;
 
-			buf = ut_malloc(UNIV_PAGE_SIZE * 2);
-			page = ut_align(buf, UNIV_PAGE_SIZE);
+			buf = static_cast<byte *>
+				(ut_malloc(UNIV_PAGE_SIZE * 2));
+			page = static_cast<byte *>
+				(ut_align(buf, UNIV_PAGE_SIZE));
 
 			/* flush insert buffer at shutdwon */
 			innobase_fast_shutdown = 0;

=== modified file 'utils/build.sh'
--- utils/build.sh	2013-01-02 04:20:08 +0000
+++ utils/build.sh	2013-02-21 12:24:29 +0000
@@ -30,6 +30,12 @@
     extra_config_55=
 fi
 
+if [ "$1" = "innodb51_builtin" -o "$1" = "innodb50" ]
+then
+    # include/*.ic in pre-5.1-plugin InnoDB do not compile well in C++.
+    export CXXFLAGS="$CXXFLAGS -fpermissive"
+fi
+
 MAKE_CMD=make
 if gmake --version > /dev/null 2>&1
 then
@@ -176,7 +182,7 @@
     build_xtrabackup
 }
 
-if ! test -f src/xtrabackup.c
+if ! test -f src/xtrabackup.cc
 then
 	echo "`basename $0` must be run from the directory with XtraBackup sources"
 	usage