List:Commits« Previous MessageNext Message »
From:Luis Soares Date:September 30 2010 9:57am
Subject:bzr commit into mysql-next-mr-bugfixing branch (luis.soares:3309)
View as plain text  
#At file:///home/lsoares/Workspace/bzr/work/MC/push.next-mr-bf/mysql-next-mr-bugfixing-push/ based on revid:marc.alff@stripped

 3309 Luis Soares	2010-09-30 [merge]
      Merging WL 4033 and WL 5404 post-push fixes into 
      mysql-next-mr-bugfixing.

    modified:
      mysql-test/suite/binlog/t/binlog_killed.test
      sql/log_event.cc
=== 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 */;
 
 

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2010-09-01 02:51:08 +0000
+++ b/sql/log_event.cc	2010-09-24 15:24:54 +0000
@@ -9864,7 +9864,7 @@ Rows_query_log_event::Rows_query_log_eve
   read_str(&ptr, str_end, &str, &len);
   if (!(m_rows_query= (char*) my_malloc(len+1, MYF(MY_WME))))
     return;
-  my_snprintf(m_rows_query, len+1, "%s", str);
+  strmake(m_rows_query, str, len);
   DBUG_PRINT("info", ("m_rows_query: %s", m_rows_query));
   DBUG_VOID_RETURN;
 }


Attachment: [text/bzr-bundle] bzr/luis.soares@oracle.com-20100930095730-k04pqy3nk9xf8vht.bundle
Thread
bzr commit into mysql-next-mr-bugfixing branch (luis.soares:3309) Luis Soares30 Sep