diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 14:22:22 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 14:22:22 +0300 |
commit | a42c80bd480c2060eca30101dab20ea6f6418bc8 (patch) | |
tree | a0a7ab27e52c867637c51ac7126abea15cc4c049 /storage/innobase/row/row0ftsort.cc | |
parent | bcedb4200f26468d33f7064c1e6e126d81b21162 (diff) | |
parent | baf0ef9a18fa69e97deb750d9fa545dd4f162596 (diff) | |
download | mariadb-git-a42c80bd480c2060eca30101dab20ea6f6418bc8.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/row/row0ftsort.cc')
-rw-r--r-- | storage/innobase/row/row0ftsort.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index 562395e3e80..5ec73d9677c 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2010, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2015, 2020, MariaDB Corporation. +Copyright (c) 2015, 2021, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -755,7 +755,6 @@ void fts_parallel_tokenization( row_merge_block_t** crypt_block; pfs_os_file_t tmpfd[FTS_NUM_AUX_INDEX]; ulint mycount[FTS_NUM_AUX_INDEX]; - ib_uint64_t total_rec = 0; ulint num_doc_processed = 0; doc_id_t last_doc_id = 0; mem_heap_t* blob_heap = NULL; @@ -1023,7 +1022,6 @@ exit: goto func_exit; } - total_rec += merge_file[i]->n_rec; row_merge_file_destroy_low(tmpfd[i]); } |