summaryrefslogtreecommitdiff
path: root/storage/federated
diff options
context:
space:
mode:
Diffstat (limited to 'storage/federated')
-rw-r--r--storage/federated/ha_federated.cc3
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))