Commit ccdf6415 authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
parents c2cde303 bb5b8176

sql/ha_ndbcluster.cc

+6 −2
Original line number Diff line number Diff line
@@ -3121,11 +3121,15 @@ void ndb_unpack_record(TABLE *table, NdbValue *value, 
  my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);

  DBUG_ENTER("ndb_unpack_record");



 // Set filler bits

  if (table->s->null_bytes > 0)

       buf[table->s->null_bytes - 1]|= 256U - (1U <<

					       table->s->last_null_bit_pos);

  // Set null flag(s)

  bzero(buf, table->s->null_bytes);

  for ( ; field;

       p_field++, value++, field= *p_field)

  {

    field->set_notnull(row_offset);       

    if ((*value).ptr)

    {

      if (!(field->flags & BLOB_FLAG))