diff options
| author | Chad MILLER <chad@mysql.com> | 2008-08-15 15:30:17 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-08-15 15:30:17 -0400 |
| commit | 572a35661788024fa161f7679e0f6c099cde8bed (patch) | |
| tree | 8aa07f52b88f30fbb6ded851c4160db663b8f377 /storage/federated | |
| parent | 6d6b9ffec891e0779e0a7bef6c58ca3679ab6cf1 (diff) | |
| parent | 18e93e8fd9ab23f0bac9d68b7af1840f8122e74e (diff) | |
| download | mariadb-git-572a35661788024fa161f7679e0f6c099cde8bed.tar.gz | |
Merge from 5.0-bugteam.
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 5702b2f3514..2f1c5e51caa 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -920,7 +920,10 @@ uint ha_federated::convert_row_to_internal_format(uchar *record, old_ptr= (my_ptrdiff_t) (record - table->record[0]); (*field)->move_field_offset(old_ptr); if (!*row) + { (*field)->set_null(); + (*field)->reset(); + } else { if (bitmap_is_set(table->read_set, (*field)->field_index)) |