Skip to content

M
mariadb
Commit 9b4470ec authored by Mats Kindahl's avatar Mats Kindahl
Browse files
Options

Merging with mysql-5.1-rep+2-delivery1

parents 4abdd9f1 cf40bc3f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
sql/rpl_record.cc
View file @ 9b4470ec
...@@ -192,6 +192,7 @@ unpack_row(Relay_log_info const *rli, ...@@ -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, ...@@ -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);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7