Commit b3b01cf4 authored by unknown's avatar unknown

BUG#29549 (Endians: rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb and rpl_ndb_mix_innodb failed on):

Post-merge fixes. Setting write bit before calling Field::store() since the function asserts that
the write bit has been set.


sql/field.cc:
  Setting bit in write set to prevent assertion from throwing when calling Field::store().
parent 7619a5ef
...@@ -7962,6 +7962,7 @@ const uchar *Field_blob::unpack(uchar *to, ...@@ -7962,6 +7962,7 @@ const uchar *Field_blob::unpack(uchar *to,
param_data > 0 ? param_data & 0xFF : packlength; param_data > 0 ? param_data & 0xFF : packlength;
uint32 const length= get_length(from, master_packlength, low_byte_first); uint32 const length= get_length(from, master_packlength, low_byte_first);
DBUG_DUMP("packed", from, length + master_packlength); DBUG_DUMP("packed", from, length + master_packlength);
bitmap_set_bit(table->write_set, field_index);
store(reinterpret_cast<const char*>(from) + master_packlength, store(reinterpret_cast<const char*>(from) + master_packlength,
length, field_charset); length, field_charset);
DBUG_DUMP("record", to, table->s->reclength); DBUG_DUMP("record", to, table->s->reclength);
......
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