diff options
| author | Sergey Vojtovich <sergey.vojtovich@oracle.com> | 2011-03-03 12:12:32 +0300 |
|---|---|---|
| committer | Sergey Vojtovich <sergey.vojtovich@oracle.com> | 2011-03-03 12:12:32 +0300 |
| commit | 923a72d3c67d8178aaab41bcaceb23f6b6f49f97 (patch) | |
| tree | cb58cd056c59c8a5799be1fee5d519a8510d7bac /storage/archive | |
| parent | fc03fff72d1ba62e3b2b03afd275fc85f715efbf (diff) | |
| parent | 929d13ca4977ed1fa3dcbe6628c393ffc148004f (diff) | |
| download | mariadb-git-923a72d3c67d8178aaab41bcaceb23f6b6f49f97.tar.gz | |
Merge.
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 fe167318743..eb9705ea5aa 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1179,7 +1179,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); } |