Merge lp:~akopytov/percona-xtrabackup/bug972169_bug999750 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-param/192/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-04-02 02:25:07 +0000
+++ src/xtrabackup.c	2012-05-15 19:47:20 +0000
@@ -6564,6 +6564,22 @@
 		exit(EXIT_FAILURE);
 	}
 
+	if (xtrabackup_incremental && xtrabackup_stream &&
+	    xtrabackup_stream_fmt == XB_STREAM_FMT_TAR) {
+		msg("xtrabackup: error: "
+		    "streaming incremental backups are incompatible with the \n"
+		    "'tar' streaming format. Use --stream=xbstream instead.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	if (xtrabackup_compress && xtrabackup_stream &&
+	    xtrabackup_stream_fmt == XB_STREAM_FMT_TAR) {
+		msg("xtrabackup: error: "
+		    "compressed backups are incompatible with the \n"
+		    "'tar' streaming format. Use --stream=xbstream instead.\n");
+		exit(EXIT_FAILURE);
+	}
+
 	/* cannot execute both for now */
 	{
 		int num = 0;

=== added file 'test/t/bug972169.sh'
--- test/t/bug972169.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug972169.sh	2012-05-15 19:47:20 +0000
@@ -0,0 +1,14 @@
+############################################################################
+# Bug #972169: --compress in 2.0 should be incompatible with --stream=tar
+############################################################################
+
+. inc/common.sh
+
+init
+
+run_mysqld
+
+run_cmd_expect_failure $XB_BIN $XB_ARGS --datadir=$mysql_datadir --backup \
+    --compress --stream=tar
+grep -q "xtrabackup: error: compressed backups are incompatible with the" \
+    $OUTFILE

=== added file 'test/t/bug999750.sh'
--- test/t/bug999750.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug999750.sh	2012-05-15 19:47:20 +0000
@@ -0,0 +1,21 @@
+############################################################################
+# Bug #999750: incremental backups should be incompatible with --stream=tar
+############################################################################
+
+. inc/common.sh
+
+init
+
+# Exclude the built-in InnoDB configuration as it requires a different format
+# for --incremental-lsn.
+if [ -z "$INNODB_VERSION" ]; then
+    echo "Requires InnoDB plugin or XtraDB" >$SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+run_mysqld
+
+run_cmd_expect_failure $XB_BIN $XB_ARGS --datadir=$mysql_datadir --backup \
+    --incremental-lsn=0 --stream=tar
+grep -q "xtrabackup: error: streaming incremental backups are incompatible with the " \
+    $OUTFILE

=== modified file 'test/t/ib_stream_incremental.sh'
--- test/t/ib_stream_incremental.sh	2012-02-13 13:04:59 +0000
+++ test/t/ib_stream_incremental.sh	2012-05-15 19:47:20 +0000
@@ -102,13 +102,6 @@
     clean
 }
 
-for stream_format in tar xbstream; do
-    case "$stream_format" in
-	"tar")
-	    stream_extract_cmd="$TAR -ixvf";;
-	"xbstream")
-	    stream_extract_cmd="xbstream -xv <";;
-    esac
-
-    test_streaming_incremental
-done
+stream_format="xbstream"
+stream_extract_cmd="xbstream -xv <"
+test_streaming_incremental