From: Luis Soares
Date: September 26 2010 11:06pm
Subject: bzr commit into mysql-next-mr-bugfixing branch (luis.soares:3298) Bug#56912
List-Archive: http://lists.mysql.com/commits/119129
X-Bug: 56912
Message-Id: <201009262307.o8QMAPUI028529@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5287722953149321073=="

--===============5287722953149321073==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/lsoares/Workspace/bzr/work/bugfixing/56912/mysql-next-mr-bugfixing/ based on revid:mats.kindahl@stripped

 3298 Luis Soares	2010-09-27
      BUG#56912: binlog_killed fails sporadically on
                 mysql-next-mr-bugfixing codebase.
      
      Two new event types were added recently. This made the FD event
      to grow 2 bytes, thence the event positions in the binary log
      shifted two bytes as well. Given that sometimes the assertion in
      the binlog_killed test relies on absolute binary log positions,
      it will try to read events from a current obsolete position (175,
      while the new one is 177).
      
      We fix this by making the test to read the current position from
      SHOW MASTER STATUS into $start_pos and then issuing mysqlbinlog
      with --start-position=$start_pos instead of a hardcoded absolute
      position. This will also make the dump to read the BEGIN event
      that precedes the actual INSERT event (whereas before it would
      not), but this should not affect the assertion correctness.

    modified:
      mysql-test/suite/binlog/t/binlog_killed.test
=== modified file 'mysql-test/suite/binlog/t/binlog_killed.test'
--- a/mysql-test/suite/binlog/t/binlog_killed.test	2010-07-12 11:55:16 +0000
+++ b/mysql-test/suite/binlog/t/binlog_killed.test	2010-09-26 23:06:44 +0000
@@ -36,6 +36,7 @@ let $ID= `select connection_id()`;
 # `reset master' problem is to be addressed by bug#15580 fixes.
 #
 reset master;
+let $start_pos= query_get_value("SHOW MASTER STATUS", Position, 1);
 send insert into t2 values (null, null), (null, get_lock("a", 10));
 
 
@@ -51,9 +52,8 @@ connection con2;
 --error 0,ER_QUERY_INTERRUPTED
 reap;
 let $rows= `select count(*) from t2  /* must be 2 or 0 */`;
-
 let $MYSQLD_DATADIR= `select @@datadir`;
---exec $MYSQL_BINLOG --force-if-open --start-position=175 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
+--exec $MYSQL_BINLOG --force-if-open --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select
 (@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog"))
@@ -67,6 +67,14 @@ enable_abort_on_error;
 enable_query_log;
 enable_result_log;
 
+if (`SELECT @result != 0`)
+{
+  -- echo error_code:$error_code, insert:$insert_binlogged, rows:$rows
+  SELECT * FROM t2;
+  
+  -- die
+}
+
 select @result /* must be zero either way */;
 
 


--===============5287722953149321073==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/luis.soares@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: luis.soares@stripped
# target_branch: file:///home/lsoares/Workspace/bzr/work/bugfixing\
#   /56912/mysql-next-mr-bugfixing/
# testament_sha1: e0551ac0b293cdd753ee90ff0eda3834a22652f5
# timestamp: 2010-09-27 00:07:03 +0100
# base_revision_id: mats.kindahl@stripped\
#   lz53e73lcjw38ye7
# 
# Begin bundle
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


--===============5287722953149321073==--