1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merging with mysql-5.1-rep+2-delivery1

Browse Source
This commit is contained in:
Mats Kindahl 2010-01-13 14:00:48 +01:00
commit 6a7e3ca55e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/rpl_record.cc
View File

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