Merge lp:~sergei.glushchenko/percona-xtrabackup/2.2-ST43302-xb-bug1340717 into lp:percona-xtrabackup/2.2

[Sergei Glushchenko]

Manual merge from 2.1

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

[Tom Manville (tdmanville)]

Any update on when this will be merged?

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/fil/fil0fil.cc'
--- storage/innobase/fil/fil0fil.cc	2014-04-30 13:14:18 +0000
+++ storage/innobase/fil/fil0fil.cc	2014-08-17 09:54:24 +0000
@@ -45,6 +45,7 @@
 #include "page0zip.h"
 #include "pars0pars.h"
 #include "que0que.h"
+#include "trx0purge.h"
 #include "trx0sys.h"
 #include "row0mysql.h"
 #ifndef UNIV_HOTBACKUP
@@ -3691,7 +3692,9 @@
 		ib_logf(IB_LOG_LEVEL_WARN,
 			"It will be removed from the data dictionary.");
 
-		fil_remove_invalid_table_from_data_dict(tablename);
+		if (purge_sys) {
+			fil_remove_invalid_table_from_data_dict(tablename);
+		}
 
 		err = DB_CORRUPTION;
 
@@ -4900,7 +4903,7 @@
 
 		mutex_exit(&fil_system->mutex);
 
-		if (remove_from_data_dict) {
+		if (remove_from_data_dict && purge_sys) {
 			fil_remove_invalid_table_from_data_dict(name);
 		}
 

=== added file 'storage/innobase/xtrabackup/test/t/bug1340717.sh'
--- storage/innobase/xtrabackup/test/t/bug1340717.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1340717.sh	2014-08-17 09:54:24 +0000
@@ -0,0 +1,35 @@
+########################################################################
+# Test resurrect table locks
+########################################################################
+
+. inc/common.sh
+
+require_server_version_higher_than 5.6.0
+
+################################################################################
+# Start an uncommitted transaction pause "indefinitely" to keep the connection
+# open
+################################################################################
+function start_uncomitted_transaction()
+{
+    run_cmd $MYSQL $MYSQL_ARGS sakila <<EOF
+START TRANSACTION;
+DELETE FROM payment;
+SELECT SLEEP(10000);
+EOF
+}
+
+start_server
+load_sakila
+
+start_uncomitted_transaction &
+job_master=$!
+
+sleep 5;
+
+innobackupex --no-timestamp --include="sakila.actor" $topdir/backup
+
+kill -SIGKILL $job_master
+stop_server
+
+innobackupex --apply-log $topdir/backup