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 | 0156ccdc504e30884eeef72551c065af94e199f5 (patch) | |
| tree | 8aa07f52b88f30fbb6ded851c4160db663b8f377 /storage/federated | |
| parent | 2dcc449fab671a28897b70418124a7cd463aaa79 (diff) | |
| parent | 0546add33e294f3468226a7a20125c99f67103fe (diff) | |
| download | mariadb-git-0156ccdc504e30884eeef72551c065af94e199f5.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)) |