diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-21 20:51:56 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-21 20:51:56 +0100 |
| commit | edab37cd680ebcca999d989c34251f6be1115c54 (patch) | |
| tree | 9a960e6324916997d8efa87ce8d48d099d78cab8 /storage/archive | |
| parent | 5bf311e1e853457c31dbadd3d130b2569a867d80 (diff) | |
| parent | 446554a15bd84f39ec4a8163e9f4456fa9be8fb2 (diff) | |
| download | mariadb-git-edab37cd680ebcca999d989c34251f6be1115c54.tar.gz | |
5.3 merge
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/ha_archive.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index b5ec94ba503..2c178fb7055 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1187,17 +1187,6 @@ int ha_archive::unpack_row(azio_stream *file_to_read, uchar *record) /* Copy null bits */ const uchar *ptr= record_buffer->buffer; - /* - Field::unpack() is not called when field is NULL. For VARCHAR - Field::unpack() only unpacks as much bytes as occupied by field - value. In these cases respective memory area on record buffer is - not initialized. - - These uninitialized areas may be accessed by CHECKSUM TABLE or - by optimizer using temporary table (BUG#12997905). We may remove - this memset() when they're fixed. - */ - memset(record, 0, table->s->reclength); memcpy(record, ptr, table->s->null_bytes); ptr+= table->s->null_bytes; for (Field **field=table->field ; *field ; field++) |