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

[Alexey Kopytov]

    Bug #1254227: xtrabackup_56 does not roll back prepared XA transactions

    The problem was that XtraBackup did not roll back prepared XA
    transactions when applying the log. Which was a regression introduced
    with the original port of XtraBackup patches to 5.6.

    Fixed by restoring code that has been lost in the port.

http://jenkins.percona.com/view/PXB%202.1/job/percona-xtrabackup-2.1-param/509/

[Vlad Lesin (vlad-lesin)]

review: Approve (g2)

=== modified file 'patches/innodb56.patch'
--- patches/innodb56.patch	2013-11-12 08:56:58 +0000
+++ patches/innodb56.patch	2014-01-06 14:04:16 +0000
@@ -2635,7 +2635,31 @@
  	total_trx = UT_LIST_GET_LEN(trx_sys->rw_trx_list)
 --- a/storage/innobase/trx/trx0trx.cc
 +++ b/storage/innobase/trx/trx0trx.cc
-@@ -2084,7 +2084,8 @@
+@@ -421,9 +421,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"
+@@ -489,7 +489,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"
+@@ -2084,7 +2086,8 @@
  		scenario where some undo generated by a transaction,
  		has XA stuff, and other undo, generated by the same
  		transaction, doesn't. */

=== added file 'test/t/bug1254227.sh'
--- test/t/bug1254227.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1254227.sh	2014-01-06 14:04:16 +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