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 | cb0e660da5d0ed6f70b242ca3a3e900293274e09 (patch) | |
| tree | cb58cd056c59c8a5799be1fee5d519a8510d7bac /storage | |
| parent | c4108ce3febcae397521f0643a8e0732f50eb3b6 (diff) | |
| parent | 54755c78cfd78ca081f20af2edbace8cd03891b0 (diff) | |
| download | mariadb-git-cb0e660da5d0ed6f70b242ca3a3e900293274e09.tar.gz | |
Merge.
Diffstat (limited to 'storage')
| -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); } |