Merging with mysql-5.1-rep+2-delivery1

Mats Kindahl · Mats Kindahl · commit 6a7e3ca55e7f · 2010-01-13T14:00:48.000+01:00
diff --git a/sql/rpl_record.cc b/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);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,7 @@ unpack_row(Relay_log_info const *rli,`
`192`	`192`	`DBUG_ASSERT(row_data);`
`193`	`193`	`DBUG_ASSERT(table);`
`194`	`194`	`size_t const master_null_byte_count= (bitmap_bits_set(cols) + 7) / 8;`
	`195`	`+ int error= 0;`
`195`	`196`
`196`	`197`	`uchar const *null_ptr= row_data;`
`197`	`198`	`uchar const *pack_ptr= row_data + master_null_byte_count;`
`@@ -384,7 +385,7 @@ unpack_row(Relay_log_info const *rli,`
`384`	`385`	`*master_reclength = table->s->reclength;`
`385`	`386`	`}`
`386`	`387`
`387`		`- DBUG_RETURN(0);`
	`388`	`+ DBUG_RETURN(error);`
`388`	`389`	`}`
`389`	`390`
`390`	`391`	`/**`