Merge lp:~gl-az/percona-xtrabackup/2.1-valgrind into lp:percona-xtrabackup/2.1

[George Ormond Lorch III]

Added new environment variables to control build:
  MAKE_ONLY - Set this to 1 to only re 'make' the server and xtrabackup. Nothing will be downloaded, unpacked or patched. This is not advised if any compiler or other flags are being changed from previous builds.
  RELWITHDEBINFO - Set this to 1 to eliminate optimizations by changing C/CXXFLAGS to -g -O0 and pass CMAKE_BUILD_TYPE=RelWithDebInfo to PS or MySQL 5.5+ cmake.
  WITH_VALGRIND - Set this to 1 to perform Valgrind compatible build. Eliminates optimizations just like RELWITHDEBINFO and also passes WITH_VALGRIND=ON to PS or MySQL 5.5+ cmake.
Added innobackupex option --use-valgrind which will prefix backup and apply-log calls to xtrabackup with "valgrind".
The valgrind binary must be within path and valgrind options may be set by either using the ~/.valgrindrc file or setting the environment variable VALGRIND_OPTS.

[Stewart Smith (stewart)]

This will probably conflict with https://code.launchpad.net/~stewart/percona-xtrabackup/source-dist-refactor/+merge/167709 as I've moved things about a bit with regards to downloading/unpacking things and it may have the same end result as MAKE_ONLY

[lp:~gl-az/percona-xtrabackup/2.1-valgrind]

610. By Alexey Kopytov on 2013-06-14

Bug #1190716: innobackupex --safe-slave-backup hangs when used on
              master

The problem was in uninitialized value usage in wait_for_safe_slave()
when the server is not a replication slave, i.e. when no values in
$con->{slave_status} are defined.

Fixed by moving the check for $con->{slave_status}->{Slave_SQL_Running}
after the check for $host_is_slave and checking if Slave_SQL_Running is
defined when setting $host_is_slave for extra-safety.

611. By <email address hidden> on 2013-06-19

Merge lp:~hrvojem/percona-xtrabackup/bug1181317

612. By Alexey Kopytov on 2013-06-21

Empty merge from 2.0.

613. By Alexey Kopytov on 2013-06-21

Merged lp:~sergei.glushchenko/percona-xtrabackup/BT30559-kill-long-selects.

614. By Alexey Kopytov on 2013-06-21

Merge lp:~stewart/percona-xtrabackup/test-more-parallel.

615. By Alexey Kopytov on 2013-06-21

Merged lp:~gl-az/percona-xtrabackup/2.1-bug1190610.

616. By Alexey Kopytov on 2013-06-21

Merged lp:~stewart/percona-xtrabackup/2.1-bug1028949-test-fast.

617. By Alexey Kopytov on 2013-06-21

Merged lp:~gl-az/percona-xtrabackup/2.1-bug1192347.

618. By Alexey Kopytov on 2013-06-21

Empty merge from 2.0.

619. By Alexey Kopytov on 2013-06-28

Automerge from 2.0.

620. By Alexey Kopytov on 2013-07-01

Merged lp:~akopytov/percona-xtrabackup/bugs-1177206-and-1187071-2.1.

621. By Alexey Kopytov on 2013-07-01

Empty merge from 2.0.

622. By Alexey Kopytov on 2013-07-08

Bug #1198220: xtrabackup typo: Temporary instance for recovery is set as
              followings

Corrected language in the mentioned messages.

623. By Alexey Kopytov on 2013-07-08

Merged lp:~stewart/percona-xtrabackup/deb-pkg-updates.

624. By Alexey Kopytov on 2013-07-08

Merged lp:~vlad-lesin/percona-xtrabackup/bug1182726-2.1.

[Alexey Kopytov (akopytov)]

This needs a bug/BP and rebasing on trunk (as source-dist-refactor has been merged to 2.1).

review: Needs Fixing

[lp:~gl-az/percona-xtrabackup/2.1-valgrind]

625. By Alexey Kopytov on 2013-07-10

Merged lp:~akopytov/percona-xtrabackup/test-suite-cleanups-2.1.

626. By Alexey Kopytov on 2013-07-10

Empty merge from 2.0.

627. By Alexey Kopytov on 2013-07-10

Merged lp:~gl-az/percona-xtrabackup/2.1-bug1197644.

628. By Alexey Kopytov on 2013-07-10

Manual merge from lp:~raghavendra-prabhu/percona-xtrabackup/2.1-Bug1182995.

629. By George Ormond Lorch III on 2013-07-12

Added new environment variables to control build:
  MAKE_ONLY - Set this to 1 to only re 'make' the server and xtrabackup. Nothing will be downloaded, unpacked or patched. This is not advised if any compiler or other flags are being changed from previous builds.
  RELWITHDEBINFO - Set this to 1 to eliminate optimizations by changing C/CXXFLAGS to -g -O0 and pass CMAKE_BUILD_TYPE=RelWithDebInfo to PS or MySQL 5.5+ cmake.
  WITH_VALGRIND - Set this to 1 to perform Valgrind compatible build. Eliminates optimizations just like RELWITHDEBINFO and also passes WITH_VALGRIND=ON to PS or MySQL 5.5+ cmake.
Added innobackupex option --use-valgrind which will prefix backup and apply-log calls to xtrabackup with "valgrind".
The valgrind binary must be within path and valgrind options may be set by either using the ~/.valgrindrc file or setting the environment variable VALGRIND_OPTS.

Unmerged revisions

629. By George Ormond Lorch III on 2013-07-12

Added new environment variables to control build:
  MAKE_ONLY - Set this to 1 to only re 'make' the server and xtrabackup. Nothing will be downloaded, unpacked or patched. This is not advised if any compiler or other flags are being changed from previous builds.
  RELWITHDEBINFO - Set this to 1 to eliminate optimizations by changing C/CXXFLAGS to -g -O0 and pass CMAKE_BUILD_TYPE=RelWithDebInfo to PS or MySQL 5.5+ cmake.
  WITH_VALGRIND - Set this to 1 to perform Valgrind compatible build. Eliminates optimizations just like RELWITHDEBINFO and also passes WITH_VALGRIND=ON to PS or MySQL 5.5+ cmake.
Added innobackupex option --use-valgrind which will prefix backup and apply-log calls to xtrabackup with "valgrind".
The valgrind binary must be within path and valgrind options may be set by either using the ~/.valgrindrc file or setting the environment variable VALGRIND_OPTS.

=== modified file 'utils/build.sh'
--- utils/build.sh	2013-06-05 08:39:54 +0000
+++ utils/build.sh	2013-07-12 19:13:29 +0000
@@ -35,8 +35,20 @@
         ;;
 esac
 
+if [ -n "$WITH_VALGRIND" ]
+then
+    export CFLAGS="$CFLAGS -g -O0"
+    export CXXFLAGS="$CXXFLAGS -g -O0"
+    extra_config_51=
+    extra_config_55plus="-DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_VALGRIND=ON"
+elif [ -n "$RELWITHDEBINFO" ]
+then
+    export CFLAGS="$CFLAGS -g -O0"
+    export CXXFLAGS="$CXXFLAGS -g -O0"
+    extra_config_51=
+    extra_config_55plus="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
 # Percona Server 5.5 does not build with -Werror, so ignore DEBUG for now
-if [ -n "$DEBUG" -a "$type" != "xtradb55" -a "$type" != "xtradb51" ]
+elif if [ -n "$DEBUG" -a "$type" != "xtradb55" -a "$type" != "xtradb51" ]
 then
     # InnoDB extra debug flags
     innodb_extra_debug="-DUNIV_DEBUG -DUNIV_MEM_DEBUG \
@@ -219,14 +231,17 @@
     server_tarball=mysql-$mysql_version.tar.gz
     innodb_dir=$server_dir/storage/$innodb_name
 
-    echo "Downloading sources"
-    auto_download $server_tarball
-
-    test -d $server_dir && rm -r $server_dir
-
-    echo "Preparing sources"
-    unpack_and_patch $server_tarball $server_patch
-    mv $top_dir/mysql-$mysql_version $server_dir
+    if [ -z "$MAKE_ONLY" ]
+    then
+        echo "Downloading sources"
+        auto_download $server_tarball
+
+        test -d $server_dir && rm -r $server_dir
+
+        echo "Preparing sources"
+        unpack_and_patch $server_tarball $server_patch
+        mv $top_dir/mysql-$mysql_version $server_dir
+    fi
 
     build_server $type
 
@@ -302,35 +317,43 @@
 	fi
 
 
-	echo "Downloading sources"
+	if [ -z "$MAKE_ONLY" ]
+	then
+		echo "Downloading sources"
 	
-	# Get Percona Server
-	if [ -d $branch_dir ]
-	then
-	    rm -rf $branch_dir
-	fi
-
-        if [ ! -f Percona-Server-XtraBackup-$PS_51_VERSION.tar.gz ]
-        then
-	    make ps51source
-	fi
-
-	rm -rf $branch_dir
-	tar xfz Percona-Server-XtraBackup-$PS_51_VERSION.tar.gz
-	cd $branch_dir
-	$MAKE_CMD main
-	cd $top_dir
-	rm -rf $server_dir
-	ln -s $branch_dir/Percona-Server $server_dir
-
-	# Patch Percona Server
-	cd $server_dir
-	patch -p1 < $top_dir/patches/xtradb51.patch
-
-	build_server $type
-
-	build_xtrabackup
-
+		# Get Percona Server
+		if [ -d $branch_dir ]
+		then
+		    rm -rf $branch_dir
+		fi
+
+        	if [ ! -f Percona-Server-XtraBackup-$PS_51_VERSION.tar.gz ]
+	        then
+		    make ps51source
+		fi
+
+		rm -rf $branch_dir
+		tar xfz Percona-Server-XtraBackup-$PS_51_VERSION.tar.gz
+		cd $branch_dir
+		$MAKE_CMD main
+		cd $top_dir
+		rm -rf $server_dir
+		ln -s $branch_dir/Percona-Server $server_dir
+
+		# Patch Percona Server
+		cd $server_dir
+		patch -p1 < $top_dir/patches/xtradb51.patch
+
+		build_server $type
+
+		build_xtrabackup
+	else
+		cd $server_dir
+
+		build_server $type
+
+		build_xtrabackup
+	fi
 	;;
 "xtradb55" )
 	server_dir=$top_dir/Percona-Server-5.5
@@ -350,37 +373,44 @@
 		configure_cmd="LIBS=-lrt $configure_cmd"
 	fi
 
-
-	echo "Downloading sources"
+	if [ -z "$MAKE_ONLY" ]
+	then
+		echo "Downloading sources"
 	
-	# Get Percona Server
-	if [ -d $branch_dir ]
-	then
-	    rm -rf $branch_dir
-	fi
-
-        if [ ! -f Percona-Server-XtraBackup-$PS_55_VERSION.tar.gz ]
-        then
-	    make ps55source
-	fi
-
-	rm -rf $branch_dir
-	tar xfz Percona-Server-XtraBackup-$PS_55_VERSION.tar.gz
-	cd $branch_dir
-
-	$MAKE_CMD PERCONA_SERVER=Percona-Server-5.5 main
-	cd $top_dir
-	rm -rf $server_dir
-	ln -s $branch_dir/Percona-Server $server_dir
-
-	# Patch Percona Server
-	cd $server_dir
-	patch -p1 < $top_dir/patches/xtradb55.patch
-
-	build_server $type
-
-	build_xtrabackup
-
+		# Get Percona Server
+		if [ -d $branch_dir ]
+		then
+		    rm -rf $branch_dir
+		fi
+
+	        if [ ! -f Percona-Server-XtraBackup-$PS_55_VERSION.tar.gz ]
+        	then
+		    make ps55source
+		fi
+
+		rm -rf $branch_dir
+		tar xfz Percona-Server-XtraBackup-$PS_55_VERSION.tar.gz
+		cd $branch_dir
+
+		$MAKE_CMD PERCONA_SERVER=Percona-Server-5.5 main
+		cd $top_dir
+		rm -rf $server_dir
+		ln -s $branch_dir/Percona-Server $server_dir
+
+		# Patch Percona Server
+		cd $server_dir
+		patch -p1 < $top_dir/patches/xtradb55.patch
+
+		build_server $type
+
+		build_xtrabackup
+	else
+		cd $server_dir
+
+		build_server $type
+
+		build_xtrabackup
+	fi
 	;;
 *)
 	usage