Merge lp:~akopytov/percona-xtrabackup/bug1254227-2.2 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

Manual merge from 2.1.

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/72/

[Vlad Lesin (vlad-lesin)]

review: Approve (g2)

=== modified file 'storage/innobase/trx/trx0trx.cc'
--- storage/innobase/trx/trx0trx.cc	2013-11-27 08:36:11 +0000
+++ storage/innobase/trx/trx0trx.cc	2014-01-06 14:04:46 +0000
@@ -520,9 +520,9 @@
 
 			if (srv_force_recovery == 0) {
 
-				trx->state = TRX_STATE_PREPARED;
-				trx_sys->n_prepared_trx++;
-				trx_sys->n_prepared_recovered_trx++;
+				/* XtraBackup should rollback prepared XA
+				transactions */
+				trx->state = TRX_STATE_ACTIVE;
 			} else {
 				fprintf(stderr,
 					"InnoDB: Since innodb_force_recovery"
@@ -588,7 +588,9 @@
 				ut_ad(trx_state_eq(trx, TRX_STATE_PREPARED));
 			}
 
-			trx->state = TRX_STATE_PREPARED;
+			/* XtraBackup should rollback prepared XA
+			transactions */
+			trx->state = TRX_STATE_ACTIVE;
 		} else {
 			fprintf(stderr,
 				"InnoDB: Since innodb_force_recovery"

=== added file 'storage/innobase/xtrabackup/test/t/bug1254227.sh'
--- storage/innobase/xtrabackup/test/t/bug1254227.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1254227.sh	2014-01-06 14:04:46 +0000
@@ -0,0 +1,42 @@
+#########################################################################
+# Bug #1254227: xtrabackup_56 does not roll back prepared XA transactions
+#########################################################################
+
+start_server
+
+mkfifo $topdir/fifo
+
+$MYSQL $MYSQL_ARGS <$topdir/fifo &
+
+client_pid=$!
+
+# Open the pipe for writing. This is required to prevent cat from closing the
+# pipe when stdout is redirected to it
+
+exec 3>$topdir/fifo
+
+cat >&3 <<EOF
+CREATE TABLE test.t(a INT) ENGINE=InnoDB;
+XA START 'xatrx';
+INSERT INTO test.t VALUES(1);
+XA END 'xatrx';
+XA PREPARE 'xatrx';
+EOF
+
+innobackupex --no-timestamp $topdir/full
+
+# Terminate the background client
+echo "exit" >&3
+exec 3>&-
+wait $client_pid
+
+innobackupex --apply-log $topdir/full
+
+stop_server
+
+rm -rf $MYSQLD_DATADIR/*
+
+innobackupex --copy-back $topdir/full
+
+# The server will fail to start if it has MySQL bug #47134 fixed.
+start_server