bzr push into mysql-6.0-bugteam branch (aelkin:3170 to 3171) Bug#42977

[Andrei Elkin]

 3171 Andrei Elkin	2009-03-26 [merge]
      merge from 5.1-pe-stage to 6.0 for bug#42977 compilation warning issue
modified:
  sql/log_event.cc

 3170 Ramil Kalimullin	2009-03-25 [merge]
      Fix for bug#35383 null-merged to 6.0

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2009-03-25 11:38:10 +0000
+++ b/sql/log_event.cc	2009-03-26 09:30:21 +0000
@@ -7812,7 +7812,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() */