List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:March 26 2009 9:28am
Subject:bzr push into mysql-5.1-bugteam branch (aelkin:2843)
View as plain text  
 2843 Andrei Elkin	2009-03-26 [merge]
      merge from 5.1-pe-stage to a local tree
modified:
  mysql-test/extra/binlog_tests/binlog.test
  mysql-test/suite/binlog/r/binlog_row_binlog.result
  mysql-test/suite/binlog/r/binlog_stm_binlog.result
  mysql-test/suite/rpl/r/rpl_temporary.result
  mysql-test/suite/rpl/t/rpl_temporary.test
  sql/sp_head.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_parse.cc

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2009-03-25 10:53:56 +0000
+++ b/sql/log_event.cc	2009-03-26 09:25:43 +0000
@@ -7764,7 +7764,7 @@ Table_map_log_event::Table_map_log_event
   m_data_size+= m_dblen + 2;	// Include length and terminating \0
   m_data_size+= m_tbllen + 2;	// Include length and terminating \0
   cbuf_end= net_store_length(cbuf, (size_t) m_colcnt);
-  DBUG_ASSERT((cbuf_end - cbuf) <= sizeof(cbuf));
+  DBUG_ASSERT(static_cast<size_t>(cbuf_end - cbuf) <= sizeof(cbuf));
   m_data_size+= (cbuf_end - cbuf) + m_colcnt;	// COLCNT and column types
 
   /* If malloc fails, caught in is_valid() */

Thread
bzr push into mysql-5.1-bugteam branch (aelkin:2843)Andrei Elkin26 Mar