Merge lp:~laurynas-biveinis/percona-server/BT-16274-bug1087202-10872128-5.5-2 into lp:percona-server/5.5

[Laurynas Biveinis]

Merge the 2nd bug 1087202 and 10872128 fix branch from 5.1. It was supposed to be a null merge yet it isn't, meaning that some changes must have been lost when the 1st branch was merged.

No Jenkins.

[Laurynas Biveinis (laurynas-biveinis)]

Self-approving as this has been approved already.

review: Approve

=== modified file 'Percona-Server/storage/innobase/log/log0online.c'
--- Percona-Server/storage/innobase/log/log0online.c	2012-12-07 12:01:53 +0000
+++ Percona-Server/storage/innobase/log/log0online.c	2013-01-04 15:30:37 +0000
@@ -431,10 +431,10 @@
 {
 	ut_ad(last_tracked_lsn != tracking_start_lsn);
 
-	fprintf(stderr, "InnoDB: last tracked LSN is %llu, but the last "
-		"checkpoint LSN is %llu.  This might be due to a server "
-		"crash or a very fast shutdown.  ", last_tracked_lsn,
-		tracking_start_lsn);
+	fprintf(stderr, "InnoDB: last tracked LSN in \'%s\' is %llu, but the "
+		"last checkpoint LSN is %llu.  This might be due to a server "
+		"crash or a very fast shutdown.  ", log_bmp_sys->out.name,
+		last_tracked_lsn, tracking_start_lsn);
 
 	/* See if we can fully recover the missing interval */
 	if (log_online_can_track_missing(last_tracked_lsn,