summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2013-01-16 11:17:58 -0800
committerIgor Babaev <igor@askmonty.org>2013-01-16 11:17:58 -0800
commit63afbba419fcf9fe1fd2acb3355c112453c15a66 (patch)
tree4f64f3fc78799bd25aaffa13d50abe2efb690a22 /sql/sql_insert.cc
parentf8f90aa75fbe8ab5c543d788f2afe55926ae34cb (diff)
downloadmariadb-git-63afbba419fcf9fe1fd2acb3355c112453c15a66.tar.gz
Corrected the fix for bug mdev-3938.
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index f76c2252eb9..f9179843810 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -2141,7 +2141,6 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
/* We don't need to change the file handler here */
/* Assign the pointers for the field pointers array and the record. */
field= copy->field= (Field**) (copy + 1);
- copy->vfield= vfield;
bitmap= (uchar*) (field + share->fields + 1);
copy->record[0]= (bitmap + share->column_bitmap_size*3);
memcpy((char*) copy->record[0], (char*) table->record[0], share->reclength);
@@ -2165,8 +2164,9 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
}
*field=0;
- if (table->vfield)
+ if (share->vfields)
{
+ copy->vfield= vfield;
for (field= copy->field; *field; field++)
{
if ((*field)->vcol_info)