Merging with mysql-5.1-rep+2-delivery1

sql/rpl_record.cc

@@ -192,6 +192,7 @@ unpack_row(Relay_log_info const *rli,
   DBUG_ASSERT(row_data);
   DBUG_ASSERT(table);
   size_t const master_null_byte_count= (bitmap_bits_set(cols) + 7) / 8;
+  int error= 0;
 
   uchar const *null_ptr= row_data;
   uchar const *pack_ptr= row_data + master_null_byte_count;
@@ -384,7 +385,7 @@ unpack_row(Relay_log_info const *rli,
       *master_reclength = table->s->reclength;
   }
   
-  DBUG_RETURN(0);
+  DBUG_RETURN(error);
 }
 
 /**