diff options
| author | Karen Langford <karen.langford@oracle.com> | 2011-05-06 10:03:02 +0200 |
|---|---|---|
| committer | Karen Langford <karen.langford@oracle.com> | 2011-05-06 10:03:02 +0200 |
| commit | 74afcca8f23938f0a9fbea78581fd446059f59f9 (patch) | |
| tree | 21e9deed4059dba183ba20b099bf8e355bdca43e /storage | |
| parent | 8cc75b2d1ed70bf794f62f73397b098c47fff01b (diff) | |
| parent | b4a59e016b0a1987d9e488ad81a4bad9b8f32d88 (diff) | |
| download | mariadb-git-74afcca8f23938f0a9fbea78581fd446059f59f9.tar.gz | |
Merge from mysql-5.1.57-release
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 764ed16e931..e5c483daac5 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1113,7 +1113,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); } |