diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 11:04:54 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 11:04:54 +0300 |
commit | 5c3ff5cb93f8363820d506cdad3daafbc944f03b (patch) | |
tree | f5671e95dabd8ced0c7925e54b351bd704e41bcf /storage/innobase/row/row0ftsort.cc | |
parent | f9ab7b473a935141f85d27994d0faf3433a73144 (diff) | |
parent | 7b42d892de6acc04490f5cb6b8355c72b8f1a406 (diff) | |
download | mariadb-git-5c3ff5cb93f8363820d506cdad3daafbc944f03b.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/row/row0ftsort.cc')
-rw-r--r-- | storage/innobase/row/row0ftsort.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index e94c9f82173..939f2b78369 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -1675,7 +1675,7 @@ row_fts_merge_insert( /* Create bulk load instance */ ins_ctx.btr_bulk = UT_NEW_NOKEY( BtrBulk(aux_index, trx, psort_info[0].psort_common->trx - ->flush_observer)); + ->get_flush_observer())); /* Create tuple for insert */ ins_ctx.tuple = dtuple_create(heap, dict_index_get_n_fields(aux_index)); |