Percona Server moved to https://jira.percona.com/projects/PS

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

  1. bug1151723-5.6
  2. Merge into 5.6
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 630
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1151723-5.6
Merge into: lp:percona-server/5.6
Diff against target: 28 lines (+1/-3)
1 file modified
client/mysqlbinlog.cc (+1/-3)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1151723-5.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+227850@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/mysqlbinlog.cc'
2--- client/mysqlbinlog.cc 2014-06-04 14:48:06 +0000
3+++ client/mysqlbinlog.cc 2014-07-23 03:51:05 +0000
4@@ -2585,7 +2585,6 @@
5 }
6
7 pos= my_b_tell(file);
8- DBUG_ASSERT(pos == 0);
9
10 /* fstat the file to check if the file is a regular file. */
11 if (my_fstat(file->file, &my_file_stat, MYF(0)) == -1)
12@@ -2756,7 +2755,7 @@
13 /* read from normal file */
14 if ((fd = my_open(logname, O_RDONLY | O_BINARY, MYF(MY_WME))) < 0)
15 return ERROR_STOP;
16- if (init_io_cache(file, fd, 0, READ_CACHE, (my_off_t) 0, 0,
17+ if (init_io_cache(file, fd, 0, READ_CACHE, start_position_mot, 0,
18 MYF(MY_WME | MY_NABP)))
19 {
20 my_close(fd, MYF(MY_WME));
21@@ -2764,7 +2763,6 @@
22 }
23 if ((retval= check_header(file, print_event_info, logname)) != OK_CONTINUE)
24 goto end;
25- my_b_seek(file, start_position_mot);
26 }
27 else
28 {

Subscribers

People subscribed via source and target branches