Merge lp:~laurynas-biveinis/percona-server/bug1404565 into lp:percona-server/5.6

[Laurynas Biveinis]

Fix bug 1404565 (SHOW ENGINE INNODB STATUS has two TRANSACTIONS
sections).

The bug is caused by a merge regression in the initial 5.6 port:
XtraDB moves the transaction section to the end of status output, but
the merge failed to remove it from its original location.

The patch to move the transaction section to the end of status output
originates from Google patches for 5.0.37. The purpose of the patch is
to provide useful InnoDB status output in the case of very long
transaction list that would not fit into 64KB that is the maximum
possible result set length in that version. Since then, the maximum
status output limit has been raised to 1MB
(http://bugs.mysql.com/bug.php?id=56922). Given this and that we
haven't received any truncated status issue reports while we were
printing the transaction list even twice in the output, remove the
Google patch bit and leave the transaction list in its upstream
location.

http://jenkins.percona.com/job/percona-server-5.6-param/788/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'storage/innobase/srv/srv0srv.cc'
--- storage/innobase/srv/srv0srv.cc	2014-12-01 07:53:48 +0000
+++ storage/innobase/srv/srv0srv.cc	2015-01-05 12:19:47 +0000
@@ -1559,15 +1559,6 @@
 	srv_n_rows_deleted_old = srv_stats.n_rows_deleted;
 	srv_n_rows_read_old = srv_stats.n_rows_read;
 
-	/* Only if lock_print_info_summary proceeds correctly,
-	before we call the lock_print_info_all_transactions
-	to print all the lock information. */
-	ret = lock_print_info_summary(file, nowait);
-
-	if (ret) {
-		lock_print_info_all_transactions(file);
-	}
-
 	fputs("----------------------------\n"
 	      "END OF INNODB MONITOR OUTPUT\n"
 	      "============================\n", file);