Merge lp:~sergei.glushchenko/percona-server/mysqlbinlog-stdin-5.1 into lp:percona-server/5.1

[Sergei Glushchenko]

Bug #933969: mysqlbinlog doesn't accept stdin
mysqlbinlog can't handle stdin when "|" used.
mysqlbinlog fails after making an attempt to execute seek on pipe handle.
Buffered read used in mysqlbinlog and it's possible to seek inside buffer
window. But in check_header routine seek(0) made before any read
operation, when buffer is empty. Due to it actual seek is performed.
Solution is to avoid seek(0) operation in check_header before any read is
performed, e.g. when we are at the beginning of the file.

[Sergei Glushchenko (sergei.glushchenko)]

Jenkins build:
http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-param/258/

[Alexey Kopytov (akopytov)]

Same comments as in https://code.launchpad.net/~sergei.glushchenko/percona-server/mysqlbinlog-stdin/+merge/93761

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

[Sergei Glushchenko (sergei.glushchenko)]

The new fix makes mysqlbinlog not to seek to start pos before header checked.

[Sergei Glushchenko (sergei.glushchenko)]

Jenkins build:
http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-param/262/

[Alexey Kopytov (akopytov)]

Approved. But you don't really need a typecast in "(my_off_t)0". And, if you do it, there must be a space before 0. Minor thing of course, feel free to leave it as is, just something to keep in mind in future.

review: Approve

=== modified file 'Percona-Server/client/mysqlbinlog.cc'
--- Percona-Server/client/mysqlbinlog.cc	2011-07-11 16:13:27 +0000
+++ Percona-Server/client/mysqlbinlog.cc	2012-02-23 08:49:20 +0000
@@ -1752,7 +1752,7 @@
   }
 
   pos= my_b_tell(file);
-  my_b_seek(file, (my_off_t)0);
+  DBUG_ASSERT(pos == 0);
   if (my_b_read(file, header, sizeof(header)))
   {
     error("Failed reading header; probably an empty file.");
@@ -1912,7 +1912,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, start_position_mot, 0,
+    if (init_io_cache(file, fd, 0, READ_CACHE, (my_off_t) 0, 0,
 		      MYF(MY_WME | MY_NABP)))
     {
       my_close(fd, MYF(MY_WME));
@@ -1920,6 +1920,7 @@
     }
     if ((retval= check_header(file, print_event_info, logname)) != OK_CONTINUE)
       goto end;
+    my_b_seek(file, start_position_mot);
   }
   else
   {
 
=== added file 'Percona-Server/mysql-test/r/percona_bug933969.result'
--- Percona-Server/mysql-test/r/percona_bug933969.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug933969.result	2012-02-23 08:49:20 +0000
@@ -0,0 +1,16 @@
+RESET MASTER;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (word VARCHAR(20));
+INSERT INTO t1 VALUES ("hamite");
+INSERT INTO t1 VALUES ("hoho");
+INSERT INTO t1 VALUES ("znamenito");
+INSERT INTO t1 VALUES ("mrachny");
+INSERT INTO t1 VALUES ("mrak");
+INSERT INTO t1 VALUES ("zhut");
+INSERT INTO t1 VALUES ("parnisha");
+INSERT INTO t1 VALUES ("krrasota!");
+INSERT INTO t1 VALUES ("podumayesh");
+INSERT INTO t1 VALUES ("ogo!");
+FLUSH LOGS;
+DROP TABLE t1;
+RESET MASTER;
 
=== added file 'Percona-Server/mysql-test/t/percona_bug933969.test'
--- Percona-Server/mysql-test/t/percona_bug933969.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug933969.test	2012-02-23 08:49:20 +0000
@@ -0,0 +1,42 @@
+###################### percona_bug933969.test ########################
+# Bug #933969: mysqlbinlog doesn't accept stdin                      #
+#                                                                    #
+# The goal of this testcase is to test that mysqlbinlog handle       #
+# stdin correctly when stdin is pipe.                                #
+# i.e. "cat log | mysqlbinlog -" don't cause mysqlbinlog failure     #
+######################################################################
+-- source include/have_log_bin.inc
+-- source include/not_windows.inc
+-- source include/not_embedded.inc
+
+# deletes all the binary logs
+RESET MASTER;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+# produce some statements for binlog
+
+CREATE TABLE t1 (word VARCHAR(20));
+
+INSERT INTO t1 VALUES ("hamite");
+INSERT INTO t1 VALUES ("hoho");
+INSERT INTO t1 VALUES ("znamenito");
+INSERT INTO t1 VALUES ("mrachny");
+INSERT INTO t1 VALUES ("mrak");
+INSERT INTO t1 VALUES ("zhut");
+INSERT INTO t1 VALUES ("parnisha");
+INSERT INTO t1 VALUES ("krrasota!");
+INSERT INTO t1 VALUES ("podumayesh");
+INSERT INTO t1 VALUES ("ogo!");
+
+FLUSH LOGS;
+
+# run mysqlbinlog and make sure it ends normally
+
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+--system cat $MYSQLD_DATADIR/master-bin.000001 | $MYSQL_BINLOG - >/dev/null
+
+DROP TABLE t1;
+RESET MASTER;