Commit 63afbba4 authored by Igor Babaev's avatar Igor Babaev

Corrected the fix for bug mdev-3938.

parent f8f90aa7
...@@ -2141,7 +2141,6 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd) ...@@ -2141,7 +2141,6 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
/* We don't need to change the file handler here */ /* We don't need to change the file handler here */
/* Assign the pointers for the field pointers array and the record. */ /* Assign the pointers for the field pointers array and the record. */
field= copy->field= (Field**) (copy + 1); field= copy->field= (Field**) (copy + 1);
copy->vfield= vfield;
bitmap= (uchar*) (field + share->fields + 1); bitmap= (uchar*) (field + share->fields + 1);
copy->record[0]= (bitmap + share->column_bitmap_size*3); copy->record[0]= (bitmap + share->column_bitmap_size*3);
memcpy((char*) copy->record[0], (char*) table->record[0], share->reclength); memcpy((char*) copy->record[0], (char*) table->record[0], share->reclength);
...@@ -2165,8 +2164,9 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd) ...@@ -2165,8 +2164,9 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
} }
*field=0; *field=0;
if (table->vfield) if (share->vfields)
{ {
copy->vfield= vfield;
for (field= copy->field; *field; field++) for (field= copy->field; *field; field++)
{ {
if ((*field)->vcol_info) if ((*field)->vcol_info)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment