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

[Laurynas Biveinis]

Fix bug 1151723 (Remove our own fix for bug #933969) by reverting the
Percona fix but keeping the testcase.

http://jenkins.percona.com/job/percona-server-5.5-param/1028/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'client/mysqlbinlog.cc'
--- client/mysqlbinlog.cc	2014-02-15 00:06:35 +0000
+++ client/mysqlbinlog.cc	2014-07-23 03:49:22 +0000
@@ -1989,7 +1989,6 @@
   }
 
   pos= my_b_tell(file);
-  DBUG_ASSERT(pos == 0);
 
   /* fstat the file to check if the file is a regular file. */
   if (my_fstat(file->file, &my_file_stat, MYF(0)) == -1)
@@ -2159,7 +2158,7 @@
     /* read from normal file */
     if ((fd = my_open(logname, O_RDONLY | O_BINARY, MYF(MY_WME))) < 0)
       return ERROR_STOP;
-    if (init_io_cache(file, fd, 0, READ_CACHE, (my_off_t) 0, 0,
+    if (init_io_cache(file, fd, 0, READ_CACHE, start_position_mot, 0,
 		      MYF(MY_WME | MY_NABP)))
     {
       my_close(fd, MYF(MY_WME));
@@ -2167,7 +2166,6 @@
     }
     if ((retval= check_header(file, print_event_info, logname)) != OK_CONTINUE)
       goto end;
-    my_b_seek(file, start_position_mot);
   }
   else
   {