bk commit into 5.1 tree (cbell:1.2547)

[cbell]

Below is the list of changes that have just been committed into a local
5.1 repository of cbell. When cbell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-30 17:39:54-04:00, cbell@mysql_cab_desk. +3 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  Minor refactoring to remove compile warnings and possibly fix the
  Solaris test failures.

  sql/log_event.cc@stripped, 2007-07-30 17:39:48-04:00, cbell@mysql_cab_desk. +4 -4
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    Minor refactoring.

  sql/rpl_utility.cc@stripped, 2007-07-30 17:39:49-04:00, cbell@mysql_cab_desk. +1 -2
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    Minor refactoring.

  sql/rpl_utility.h@stripped, 2007-07-30 17:39:49-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    Minor refactoring.

diff -Nrup a/sql/log_event.cc b/sql/log_event.cc
--- a/sql/log_event.cc	2007-07-29 18:10:24 -04:00
+++ b/sql/log_event.cc	2007-07-30 17:39:48 -04:00
@@ -6412,7 +6412,7 @@ const int Table_map_log_event::calc_fiel
     case MYSQL_TYPE_VARCHAR:
     case MYSQL_TYPE_SET:
     {
-      size= size + sizeof(short int); // Store short int here.
+      size= size + 2; // Store short int here.
       break;
     }
     default:
@@ -6515,7 +6515,7 @@ int Table_map_log_event::save_field_meta
     {
       char *ptr= (char *)&m_field_metadata[index];
       int2store(ptr, m_table->s->field[i]->field_length);
-      index= index + sizeof(short int);
+      index= index + 2;
       break;
     }
     case MYSQL_TYPE_STRING:
@@ -6709,6 +6709,7 @@ Table_map_log_event::Table_map_log_event
     if (bytes_read < event_len)
     {
       m_field_metadata_size= net_field_length(&ptr_after_colcnt);
+      DBUG_ASSERT(m_field_metadata_size <= (m_colcnt * 2));
       uint num_null_bytes= (m_colcnt + 7) / 8;
       m_meta_memory= (uchar *)my_multi_malloc(MYF(MY_WME),
                                      &m_null_bits, num_null_bytes,
@@ -6934,8 +6935,7 @@ bool Table_map_log_event::write_data_bod
     Store the size of the field metadata.
   */
   uchar mbuf[sizeof(m_field_metadata_size)];
-  uchar *const mbuf_end= net_store_length(mbuf, 
-                                         (size_t) m_field_metadata_size);
+  uchar *const mbuf_end= net_store_length(mbuf, m_field_metadata_size);
 
   return (my_b_safe_write(file, dbuf,      sizeof(dbuf)) ||
           my_b_safe_write(file, (const uchar*)m_dbnam,   m_dblen+1) ||
diff -Nrup a/sql/rpl_utility.cc b/sql/rpl_utility.cc
--- a/sql/rpl_utility.cc	2007-07-30 12:55:17 -04:00
+++ b/sql/rpl_utility.cc	2007-07-30 17:39:49 -04:00
@@ -97,7 +97,7 @@ uint32 table_def::calc_field_size(uint c
   {
     uint from_len= (m_field_metadata[col] >> 8U) & 0x00ff;
     uint from_bit_len= m_field_metadata[col] & 0x00ff;
-    DBUG_ASSERT(from_len >= 0 && from_bit_len >= 0 && from_bit_len <= 7);
+    DBUG_ASSERT(from_bit_len >= 0 && from_bit_len <= 7);
     length= from_len + ((from_bit_len > 0) ? 1 : 0);
     break;
   }
@@ -121,7 +121,6 @@ uint32 table_def::calc_field_size(uint c
   default:
     length= -1;
   }
-  DBUG_ASSERT(length >= 0);
   return length;
 }
 
diff -Nrup a/sql/rpl_utility.h b/sql/rpl_utility.h
--- a/sql/rpl_utility.h	2007-07-29 18:10:27 -04:00
+++ b/sql/rpl_utility.h	2007-07-30 17:39:49 -04:00
@@ -123,7 +123,7 @@ public:
           */
           char *ptr= (char *)&field_metadata[index];
           m_field_metadata[i]= sint2korr(ptr);
-          index= index + sizeof(short int);
+          index= index + 2;
           break;
         }
         case MYSQL_TYPE_NEWDECIMAL:
@@ -238,7 +238,7 @@ public:
 private:
   ulong m_size;           // Number of elements in the types array
   field_type *m_type;                     // Array of type descriptors
-  short int *m_field_metadata;
+  uint16 *m_field_metadata;
   uchar *m_null_bits;
   uchar *m_memory;
 };