diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-10 08:02:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-10 08:02:21 +0300 |
| commit | b2f3755c8e174ec5385c9a56783f0a77f054c562 (patch) | |
| tree | bb00279f39334fb1a9afceca99da2c3179ec94df /storage/innobase/row/row0merge.cc | |
| parent | 136a27d9f16fd19f0196a798d752a3dcf0fe57c2 (diff) | |
| parent | 3e8cab51cb78f3e60e139af944eef8f25502fc81 (diff) | |
| download | mariadb-git-b2f3755c8e174ec5385c9a56783f0a77f054c562.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/row/row0merge.cc')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index e1ef6983073..10600468e5a 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -2736,9 +2736,7 @@ wait_again: false, true, false); if (err == DB_SUCCESS) { - fts_update_next_doc_id( - 0, new_table, - old_table->name.m_name, max_doc_id); + fts_update_next_doc_id(NULL, new_table, max_doc_id); } } |