Merge lp:~akopytov/percona-xtrabackup/bug610614 into lp:percona-xtrabackup/1.6

[Alexey Kopytov]

[Stewart Smith (stewart)]

running through param-build: http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-1.6-param/9/

[Stewart Smith (stewart)]

param build shows that innodb55 targets are failing all tests (incorrect xtrabackup binary detection) - this is likely due to more-test-suite-fixes branch.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

Fixed innodb55 targets by merging from more-test-suite-fixes. http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-1.6-param/12/

[Stewart Smith (stewart)]

looks good - I'll merge.

review: Approve

=== modified file 'Makefile'
--- Makefile	2011-03-23 20:08:04 +0000
+++ Makefile	2011-06-15 06:05:55 +0000
@@ -11,7 +11,7 @@
 LIBS = -lpthread
 DEFS = -DUNIV_LINUX -DMYSQL_SERVER
 
-CFLAGS += -O3 -g -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
+CFLAGS += -O3 -g -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
 
 TARGET=xtrabackup
 PREFIX=/usr

=== added file 'VERSION'
--- VERSION	1970-01-01 00:00:00 +0000
+++ VERSION	2011-06-15 06:05:55 +0000
@@ -0,0 +1,1 @@
+XTRABACKUP_VERSION=1.6.2

=== added file 'test/t/xb_version.sh'
--- test/t/xb_version.sh	1970-01-01 00:00:00 +0000
+++ test/t/xb_version.sh	2011-06-15 06:05:55 +0000
@@ -0,0 +1,4 @@
+. inc/common.sh
+
+xtrabackup --version
+

=== modified file 'utils/build-binary.sh'
--- utils/build-binary.sh	2011-06-12 07:48:43 +0000
+++ utils/build-binary.sh	2011-06-15 06:05:55 +0000
@@ -12,8 +12,6 @@
 # Bail out on errors, be strict
 set -ue
 
-XTRABACKUP_VERSION=1.6.2
-
 # Examine parameters
 TARGET="$(uname -m)"
 TARGET_CFLAGS=''
@@ -79,7 +77,8 @@
 SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
 test -e "$SOURCEDIR/Makefile" || exit 2
 
-# Extract version from the Makefile
+# Read XTRABACKUP_VERSION from the VERSION file
+. $SOURCEDIR/VERSION
 
 # Build information
 REVISION="$(cd "$SOURCEDIR"; bzr log -r-1 | grep ^revno: | cut -d ' ' -f 2)"

=== modified file 'utils/build-dpkg.sh'
--- utils/build-dpkg.sh	2011-06-12 07:48:43 +0000
+++ utils/build-dpkg.sh	2011-06-15 06:05:55 +0000
@@ -11,8 +11,6 @@
 # Bail out on errors, be strict
 set -ue
 
-XTRABACKUP_VERSION='1.6.2'
-
 # Examine parameters
 go_out="$(getopt --options "k:K" --longoptions key:,nosign \
     --name "$(basename "$0")" -- "$@")"
@@ -62,7 +60,9 @@
 
 SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
 
-# Extract version from the Makefile
+# Read XTRABACKUP_VERSION from the VERSION file
+. $SOURCEDIR/VERSION
+
 DEBIAN_VERSION="$(lsb_release -sc)"
 REVISION="$(cd "$SOURCEDIR"; bzr log -r-1 | grep ^revno: | cut -d ' ' -f 2)"
 

=== modified file 'utils/build-rpm.sh'
--- utils/build-rpm.sh	2011-06-12 07:48:43 +0000
+++ utils/build-rpm.sh	2011-06-15 06:05:55 +0000
@@ -91,6 +91,9 @@
 SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
 test -e "$SOURCEDIR/Makefile" || exit 2
 
+# Read XTRABACKUP_VERSION from the VERSION file
+. $SOURCEDIR/VERSION
+
 # Build information
 REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
     cut -d ' ' -f 2)"

=== modified file 'utils/build.sh'
--- utils/build.sh	2011-06-12 07:47:07 +0000
+++ utils/build.sh	2011-06-15 06:05:55 +0000
@@ -93,8 +93,11 @@
     mkdir $build_dir
     cp $top_dir/Makefile $top_dir/xtrabackup.c $build_dir
 
+    # Read XTRABACKUP_VERSION from the VERSION file
+    . $top_dir/VERSION
+
     cd $build_dir
-    $MAKE_CMD $xtrabackup_target
+    $MAKE_CMD $xtrabackup_target XTRABACKUP_VERSION=$XTRABACKUP_VERSION
     cd $top_dir
 }
 

=== modified file 'utils/xtrabackup.spec'
--- utils/xtrabackup.spec	2011-06-12 07:48:43 +0000
+++ utils/xtrabackup.spec	2011-06-15 06:05:55 +0000
@@ -5,8 +5,6 @@
 %{!?buildnumber:%define buildnumber 1}
 %define distribution  rhel%{redhat_version}
 %define release       %{buildnumber}.%{distribution}
-%define xtrabackup_version 1.6.2
-%define xtradb_version 11
 %{!?xtrabackup_revision:%define xtrabackup_revision undefined}
 
 %define __os_install_post /usr/lib/rpm/brp-compress

=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-03-31 06:45:03 +0000
+++ xtrabackup.c	2011-06-15 06:05:55 +0000
@@ -556,6 +556,7 @@
 /* === xtrabackup specific options === */
 char xtrabackup_real_target_dir[FN_REFLEN] = "./xtrabackup_backupfiles/";
 char *xtrabackup_target_dir= xtrabackup_real_target_dir;
+my_bool xtrabackup_version = FALSE;
 my_bool xtrabackup_backup = FALSE;
 my_bool xtrabackup_stats = FALSE;
 my_bool xtrabackup_prepare = FALSE;
@@ -868,6 +869,9 @@
 
 static struct my_option my_long_options[] =
 {
+  {"version", 'v', "print xtrabackup version information",
+   (G_PTR *) &xtrabackup_version, (G_PTR *) &xtrabackup_version, 0, GET_BOOL,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
   {"target-dir", OPT_XTRA_TARGET_DIR, "destination directory", (G_PTR*) &xtrabackup_target_dir,
    (G_PTR*) &xtrabackup_target_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"backup", OPT_XTRA_BACKUP, "take backup to target-dir",
@@ -1166,8 +1170,14 @@
 
 static void print_version(void)
 {
-  printf("%s  Ver %s Rev %s for %s %s (%s)\n" ,my_progname,
-	  XTRABACKUP_VERSION, XTRABACKUP_REVISION, MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE);
+  printf("%s version %s for %s %s %s (%s) (revision id: %s)\n", my_progname,
+         XTRABACKUP_VERSION,
+#ifdef XTRADB_BASED
+         "Percona Server",
+#else
+         "MySQL server",
+#endif
+         MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE, XTRABACKUP_REVISION);
 }
 
 static void usage(void)
@@ -1211,6 +1221,10 @@
     usage();
     exit(EXIT_SUCCESS);
     break;
+  case 'v':
+    print_version();
+    exit(EXIT_SUCCESS);
+    break;
   default:
     break;
   }