Merge lp:~percona-dev/percona-xtrabackup/mysql-5-5-8-cmake into lp:percona-xtrabackup/2.0

[Ignacio Nin]

Allows xtrabackup to build MySQL 5.5.8, which uses cmake as build system instead of autotools.

[Alexey Kopytov (akopytov)]

Looks good to me.

review: Approve

[Vadim Tkachenko (vadim-tk)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2010-11-24 08:32:10 +0000
+++ Makefile	2010-12-26 18:44:52 +0000
@@ -5,6 +5,7 @@
 #
 # Default is xtradb - to build XtraBackup for Percona Server
 # 5.1 - XtraBackup for MySQL versions 5.1.* with plugin innobase
+# 5.5 - XtraBackup for MySQL versions 5.5.8 and up with plugin innobase
 # plugin - XtraBackup for MySQL versions 5.1.* with plugin innodb_plugin
 
 LIBS = -lpthread
@@ -62,9 +63,9 @@
 
 # XtraBackup for MySQL 5.5
 5.5: INC = -I. -I.. -I./../include -I./../../include -I./../../../include
-5.5: INNODBOBJS = ../libinnobase_a-btr0btr.o ../libinnobase_a-btr0cur.o ../libinnobase_a-btr0pcur.o ../libinnobase_a-btr0sea.o ../libinnobase_a-buf0buddy.o ../libinnobase_a-buf0buf.o ../libinnobase_a-buf0flu.o ../libinnobase_a-buf0lru.o ../libinnobase_a-buf0rea.o ../libinnobase_a-data0data.o ../libinnobase_a-data0type.o ../libinnobase_a-dict0boot.o ../libinnobase_a-dict0crea.o ../libinnobase_a-dict0dict.o ../libinnobase_a-dict0load.o ../libinnobase_a-dict0mem.o ../libinnobase_a-dyn0dyn.o ../libinnobase_a-eval0eval.o ../libinnobase_a-eval0proc.o ../libinnobase_a-fil0fil.o ../libinnobase_a-fsp0fsp.o ../libinnobase_a-fut0fut.o ../libinnobase_a-fut0lst.o ../libinnobase_a-ha0ha.o ../libinnobase_a-ha0storage.o ../libinnobase_a-hash0hash.o ../libinnobase_a-ibuf0ibuf.o ../libinnobase_a-lock0iter.o ../libinnobase_a-lock0lock.o ../libinnobase_a-log0log.o ../libinnobase_a-log0recv.o ../libinnobase_a-mach0data.o ../libinnobase_a-mem0mem.o ../libinnobase_a-mem0pool.o ../libinnobase_a-mtr0log.o ../libinnobase_a-mtr0mtr.o ../libinnobase_a-os0file.o ../libinnobase_a-os0proc.o ../libinnobase_a-os0sync.o ../libinnobase_a-os0thread.o ../libinnobase_a-page0cur.o ../libinnobase_a-page0page.o ../libinnobase_a-page0zip.o ../libinnobase_a-lexyy.o ../libinnobase_a-pars0grm.o ../libinnobase_a-pars0opt.o ../libinnobase_a-pars0pars.o ../libinnobase_a-pars0sym.o ../libinnobase_a-que0que.o ../libinnobase_a-read0read.o ../libinnobase_a-rem0cmp.o ../libinnobase_a-rem0rec.o ../libinnobase_a-row0ext.o ../libinnobase_a-row0ins.o ../libinnobase_a-row0merge.o ../libinnobase_a-row0mysql.o ../libinnobase_a-row0purge.o ../libinnobase_a-row0row.o ../libinnobase_a-row0sel.o ../libinnobase_a-row0uins.o ../libinnobase_a-row0umod.o ../libinnobase_a-row0undo.o ../libinnobase_a-row0upd.o ../libinnobase_a-row0vers.o ../libinnobase_a-srv0srv.o ../libinnobase_a-srv0start.o ../libinnobase_a-sync0arr.o ../libinnobase_a-sync0rw.o ../libinnobase_a-sync0sync.o ../libinnobase_a-thr0loc.o ../libinnobase_a-trx0purge.o ../libinnobase_a-trx0rec.o ../libinnobase_a-trx0roll.o ../libinnobase_a-trx0rseg.o ../libinnobase_a-trx0sys.o ../libinnobase_a-trx0trx.o ../libinnobase_a-trx0undo.o ../libinnobase_a-usr0sess.o ../libinnobase_a-ut0byte.o ../libinnobase_a-ut0dbg.o ../libinnobase_a-ut0list.o ../libinnobase_a-ut0mem.o ../libinnobase_a-ut0rnd.o ../libinnobase_a-ut0ut.o ../libinnobase_a-ut0vec.o ../libinnobase_a-ut0wqueue.o ../libinnobase_a-ut0rbt.o
+5.5: INNODBOBJS= ../libinnobase.a
 
-5.5: MYSQLOBJS= ../../../mysys/libmysys.a ../../../strings/libmystrings.a ../../../zlib/.libs/libzlt.a
+5.5: MYSQLOBJS= ../../../mysys/libmysys.a ../../../strings/libstrings.a ../../../zlib/libzlib.a
 5.5: LIBS += -laio
 5.5: TARGET := xtrabackup_55
 5.5: $(TARGET)
 
=== modified file 'utils/build.sh'
--- utils/build.sh	2010-12-19 17:36:46 +0000
+++ utils/build.sh	2010-12-26 18:44:52 +0000
@@ -110,15 +110,14 @@
 
 	echo "Compile MySQL"
 	cd $top_dir/mysql-$mysql_version
-	# We do not support CMake at the moment
-	export HAVE_CMAKE=no
 	# We need to build with partitioning due to MySQL bug #58632
-	./configure --enable-local-infile \
-	    --enable-thread-safe-client \
-	    --with-plugins=innobase,partition \
-	    --with-zlib-dir=bundled \
-	    --enable-shared \
-	    --with-extra-charsets=complex --disable-dtrace
+	cmake . \
+		-DENABLED_LOCAL_INFILE=ON \
+		-DWITH_INNOBASE_STORAGE_ENGINE=ON \
+		-DWITH_PARTITION_STORAGE_ENGINE=ON \
+		-DWITH_ZLIB=BUNDLED \
+		-DWITH_EXTRA_CHARSETS=complex \
+		-DENABLE_DTRACE=OFF
 	$MAKE_CMD all
 	
 	echo "Compile XtraBackup"
 
=== modified file 'xtrabackup.c'
--- xtrabackup.c	2010-12-02 18:59:42 +0000
+++ xtrabackup.c	2010-12-26 18:44:52 +0000
@@ -4223,6 +4223,8 @@
 			if (dict_table_get_first_index(table)) {
 #ifdef XTRADB_BASED
 				dict_update_statistics_low(table, TRUE, FALSE);
+#elif MYSQL_VERSION_ID >= 50508
+				dict_update_statistics(table, TRUE);
 #else
 				dict_update_statistics_low(table, TRUE);
 #endif