diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-20 19:08:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-20 19:08:47 +0200 |
| commit | 96f8793a7a6668cd061c62baef4121df4858405d (patch) | |
| tree | 95bd4ec87fb632f087ab8d9352fbc8ce158ec546 /storage | |
| parent | 514b305dfb2839c619a623bbdae5f21cf0077672 (diff) | |
| parent | f41166133ba942b46bbab450a90511cee95f2496 (diff) | |
| download | mariadb-git-96f8793a7a6668cd061c62baef4121df4858405d.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0ins.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index 682989ac701..a38fac9a481 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -954,7 +954,7 @@ row_ins_foreign_fill_virtual( upd_field_t* upd_field; dict_vcol_set* v_cols = foreign->v_cols; update->old_vrow = row_build( - ROW_COPY_POINTERS, index, rec, + ROW_COPY_DATA, index, rec, offsets, index->table, NULL, NULL, &ext, cascade->heap); n_diff = update->n_fields; @@ -1412,9 +1412,9 @@ row_ins_foreign_check_on_constraint( if (table->versioned() && cascade->is_delete != PLAIN_DELETE && cascade->update->affects_versioned()) { ut_ad(!cascade->historical_heap); - cascade->historical_heap = mem_heap_create(128); + cascade->historical_heap = mem_heap_create(srv_page_size); cascade->historical_row = row_build( - ROW_COPY_POINTERS, clust_index, clust_rec, NULL, table, + ROW_COPY_DATA, clust_index, clust_rec, NULL, table, NULL, NULL, NULL, cascade->historical_heap); } |