Commit c2c6ff41 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Cédric de Saint Martin

version up : xtrabackup-1.6.2.

parent 8585e77a
...@@ -36,8 +36,8 @@ filename = ${:_buildout_section_name_} ...@@ -36,8 +36,8 @@ filename = ${:_buildout_section_name_}
[xtrabackup] [xtrabackup]
recipe = hexagonit.recipe.cmmi recipe = hexagonit.recipe.cmmi
url = http://www.percona.com/redir/downloads/XtraBackup/XtraBackup-1.6/source/xtrabackup-1.6.tar.gz url = http://www.percona.com/redir/downloads/XtraBackup/xtrabackup-1.6.2/source/xtrabackup-1.6.2.tar.gz
md5sum = 7c263723312cba36539df4cd7a119744 md5sum = 933243ae362156c98f1211eb87b3b4ea
make-binary = true make-binary = true
patches = patches =
${xtrabackup-build-patch-download:location}/${xtrabackup-build-patch-download:filename} ${xtrabackup-build-patch-download:location}/${xtrabackup-build-patch-download:filename}
......
diff --git a/Makefile b/Makefile diff -ur xtrabackup-1.6.2.orig/Makefile xtrabackup-1.6.2/Makefile
index dbb15d5..852a627 100644 --- xtrabackup-1.6.2.orig/Makefile 2011-07-19 05:16:22.000000000 +0900
--- a/Makefile +++ xtrabackup-1.6.2/Makefile 2011-07-27 17:58:38.108925111 +0900
+++ b/Makefile @@ -137,5 +137,5 @@
@@ -137,5 +137,5 @@ $(TARGET): xtrabackup.o $(INNODBOBJS) $(MYSQLOBJS)
clean: clean:
rm -f *.o xtrabackup_* rm -f *.o xtrabackup_*
install: install:
- install -m 755 innobackupex-1.5.1 $(BIN_DIR) - install -m 755 innobackupex-1.5.1 $(BIN_DIR)
+ install -m 755 innobackupex-1.5.1 $(BIN_DIR)/innobackupex + install -m 755 innobackupex-1.5.1 $(BIN_DIR)/innobackupex
install -m 755 xtrabackup_* $(BIN_DIR) install -m 755 xtrabackup_* $(BIN_DIR)
diff --git a/utils/build.sh b/utils/build.sh diff -ur xtrabackup-1.6.2.orig/utils/build.sh xtrabackup-1.6.2/utils/build.sh
index 3f0cee7..c41dc89 100755 --- xtrabackup-1.6.2.orig/utils/build.sh 2011-07-19 05:16:22.000000000 +0900
--- a/utils/build.sh +++ xtrabackup-1.6.2/utils/build.sh 2011-07-27 18:01:53.809212142 +0900
+++ b/utils/build.sh @@ -21,12 +21,14 @@
@@ -21,12 +21,14 @@ function usage()
{ {
echo "Build an xtrabackup binary against the specified InnoDB flavor." echo "Build an xtrabackup binary against the specified InnoDB flavor."
echo echo
...@@ -29,7 +27,7 @@ index 3f0cee7..c41dc89 100755 ...@@ -29,7 +27,7 @@ index 3f0cee7..c41dc89 100755
exit -1 exit -1
} }
@@ -79,7 +81,12 @@ function build_server() @@ -79,7 +81,12 @@
{ {
echo "Configuring the server" echo "Configuring the server"
cd $server_dir cd $server_dir
...@@ -43,19 +41,22 @@ index 3f0cee7..c41dc89 100755 ...@@ -43,19 +41,22 @@ index 3f0cee7..c41dc89 100755
eval $configure_cmd eval $configure_cmd
echo "Building the server" echo "Building the server"
@@ -92,9 +99,10 @@ function build_xtrabackup() @@ -92,12 +99,13 @@
echo "Building XtraBackup" echo "Building XtraBackup"
mkdir $build_dir mkdir $build_dir
cp $top_dir/Makefile $top_dir/xtrabackup.c $build_dir cp $top_dir/Makefile $top_dir/xtrabackup.c $build_dir
+ cp $top_dir/innobackupex $build_dir/innobackupex-1.5.1 + cp $top_dir/innobackupex $build_dir/innobackupex-1.5.1
# Read XTRABACKUP_VERSION from the VERSION file
. $top_dir/VERSION
cd $build_dir cd $build_dir
- $MAKE_CMD $xtrabackup_target - $MAKE_CMD $xtrabackup_target XTRABACKUP_VERSION=$XTRABACKUP_VERSION
+ $MAKE_CMD PREFIX=$1 $xtrabackup_target + $MAKE_CMD $xtrabackup_target XTRABACKUP_VERSION=$XTRABACKUP_VERSION PREFIX=$1
cd $top_dir cd $top_dir
} }
@@ -103,11 +111,36 @@ function build_tar4ibd() @@ -106,11 +114,36 @@
echo "Building tar4ibd" echo "Building tar4ibd"
unpack_and_patch libtar-1.2.11.tar.gz tar4ibd_libtar-1.2.11.patch unpack_and_patch libtar-1.2.11.tar.gz tar4ibd_libtar-1.2.11.patch
cd libtar-1.2.11 cd libtar-1.2.11
...@@ -93,7 +94,7 @@ index 3f0cee7..c41dc89 100755 ...@@ -93,7 +94,7 @@ index 3f0cee7..c41dc89 100755
################################################################################ ################################################################################
# Do all steps to build the server, xtrabackup and tar4ibd # Do all steps to build the server, xtrabackup and tar4ibd
# Expects the following variables to be set before calling: # Expects the following variables to be set before calling:
@@ -136,9 +169,15 @@ function build_all() @@ -141,9 +174,15 @@
build_server build_server
...@@ -111,7 +112,7 @@ index 3f0cee7..c41dc89 100755 ...@@ -111,7 +112,7 @@ index 3f0cee7..c41dc89 100755
} }
if ! test -f xtrabackup.c if ! test -f xtrabackup.c
@@ -148,6 +187,15 @@ then @@ -153,6 +192,15 @@
fi fi
type=$1 type=$1
...@@ -127,20 +128,20 @@ index 3f0cee7..c41dc89 100755 ...@@ -127,20 +128,20 @@ index 3f0cee7..c41dc89 100755
top_dir=`pwd` top_dir=`pwd`
case "$type" in case "$type" in
@@ -161,9 +209,10 @@ case "$type" in @@ -166,9 +214,10 @@
--with-plugins=innobase \ --with-plugins=innobase \
--with-zlib-dir=bundled \ --with-zlib-dir=bundled \
--enable-shared \ --enable-shared \
- --with-extra-charsets=complex" - --with-extra-charsets=all"
+ --with-extra-charsets=complex \ + --with-extra-charsets=all \
+ --prefix=$2" + --prefix=$2"
- build_all - build_all
+ build_all $2 + build_all $2
;; ;;
"innodb55" | "5.5") "innodb55" | "5.5")
@@ -225,7 +274,7 @@ case "$type" in @@ -230,7 +279,7 @@
build_server build_server
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment