diff options
| author | bjorn.munch@oracle.com <> | 2011-05-06 10:27:04 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-05-06 10:27:04 +0200 |
| commit | f152d4cf05225efaffd3298e47ec540b763fb1b0 (patch) | |
| tree | 645e1ea2659598cac24bc1f7732c5d77ecccb7d6 /storage/archive | |
| parent | f8b2499efec098acbd8a8d39d24986d4fa045225 (diff) | |
| parent | d78354816f9be702f89be3251f5664cfa6e0ea7a (diff) | |
| download | mariadb-git-f152d4cf05225efaffd3298e47ec540b763fb1b0.tar.gz | |
Merge from mysql-5.5.12-release
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/ha_archive.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index d00bc6a7f25..df556a0721c 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1181,7 +1181,7 @@ int ha_archive::unpack_row(azio_stream *file_to_read, uchar *record) ptr+= table->s->null_bytes; for (Field **field=table->field ; *field ; field++) { - if (!((*field)->is_null())) + if (!((*field)->is_null_in_record(record))) { ptr= (*field)->unpack(record + (*field)->offset(table->record[0]), ptr); } |