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

Proposed by Laurynas Biveinis on 2013-01-04
Status: Merged
Approved by: Laurynas Biveinis on 2013-01-04
Approved revision: 388
Merged at revision: 390
Proposed branch: lp:~laurynas-biveinis/percona-server/BT-16274-bug1087202-10872128-5.5-2
Merge into: lp:percona-server/5.5
Diff against target: 18 lines (+4/-4)
1 file modified
Percona-Server/storage/innobase/log/log0online.c (+4/-4)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/BT-16274-bug1087202-10872128-5.5-2
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve on 2013-01-04
Review via email: mp+141938@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

Self-approving as this has been approved already.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/storage/innobase/log/log0online.c'
2--- Percona-Server/storage/innobase/log/log0online.c 2012-12-07 12:01:53 +0000
3+++ Percona-Server/storage/innobase/log/log0online.c 2013-01-04 15:30:37 +0000
4@@ -431,10 +431,10 @@
5 {
6 ut_ad(last_tracked_lsn != tracking_start_lsn);
7
8- fprintf(stderr, "InnoDB: last tracked LSN is %llu, but the last "
9- "checkpoint LSN is %llu. This might be due to a server "
10- "crash or a very fast shutdown. ", last_tracked_lsn,
11- tracking_start_lsn);
12+ fprintf(stderr, "InnoDB: last tracked LSN in \'%s\' is %llu, but the "
13+ "last checkpoint LSN is %llu. This might be due to a server "
14+ "crash or a very fast shutdown. ", log_bmp_sys->out.name,
15+ last_tracked_lsn, tracking_start_lsn);
16
17 /* See if we can fully recover the missing interval */
18 if (log_online_can_track_missing(last_tracked_lsn,

Subscribers

People subscribed via source and target branches