bk commit into 5.1 tree (mats:1.2573) BUG#29549

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-12 18:22:31+02:00, mats@stripped +1 -0
  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@stripped, 2007-10-12 18:22:26+02:00, mats@stripped +1 -0
    Setting bit in write set to prevent assertion from throwing when calling
Field::store().

diff -Nrup a/sql/field.cc b/sql/field.cc
--- a/sql/field.cc	2007-10-12 13:22:41 +02:00
+++ b/sql/field.cc	2007-10-12 18:22:26 +02:00
@@ -7962,6 +7962,7 @@ const uchar *Field_blob::unpack(uchar *t
     param_data > 0 ? param_data & 0xFF : packlength;
   uint32 const length= get_length(from, master_packlength, low_byte_first);
   DBUG_DUMP("packed", from, length + master_packlength);
+  bitmap_set_bit(table->write_set, field_index);
   store(reinterpret_cast<const char*>(from) + master_packlength,
         length, field_charset);
   DBUG_DUMP("record", to, table->s->reclength);