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

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

Browse Source 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
This commit is contained in:
mskold/marty@linux.site 2007-04-03 16:27:23 +02:00
commit 3a70c41512
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/ha_ndbcluster.cc
View File

@ -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); my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
DBUG_ENTER("ndb_unpack_record"); 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) // Set null flag(s)
bzero(buf, table->s->null_bytes);
for ( ; field; for ( ; field;
p_field++, value++, field= *p_field) p_field++, value++, field= *p_field)
{ {
field->set_notnull(row_offset);
if ((*value).ptr) if ((*value).ptr)
{ {
if (!(field->flags & BLOB_FLAG)) if (!(field->flags & BLOB_FLAG))
@ -3135,7 +3139,7 @@ void ndb_unpack_record(TABLE *table, NdbValue *value,
{ {
if (is_null > 0) if (is_null > 0)
{ {
DBUG_PRINT("info",("[%u] NULL", DBUG_PRINT("info",("[%u] NULL",
(*value).rec->getColumn()->getColumnNo())); (*value).rec->getColumn()->getColumnNo()));
field->set_null(row_offset); field->set_null(row_offset);
} }