Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl

into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl


sql/log_event.cc:
  Auto merged

sql/log_event.cc

@@ -5369,7 +5369,7 @@ unpack_row(RELAY_LOG_INFO *rli,
     if (master_reclength)
     {
       if (*field_ptr)
-        *master_reclength = (*field_ptr)->ptr - table->record[0];
+        *master_reclength = (*field_ptr)->ptr - (char*) table->record[0];
       else
         *master_reclength = table->s->reclength;
     }

sql/rpl_utility.cc

@@ -96,6 +96,8 @@ field_length_from_packed(enum_field_types const field_type,
     length= ~0UL;                               // NYI
     break;
   }
+
+  return length;
 }
 
 /*********************************************************************