diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-20 14:02:40 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-20 14:02:40 +0200 |
| commit | 3c47ed48490f0bab1996beab5b22f386451f0d88 (patch) | |
| tree | c374857b2f5d22bd86354877a098a0cd7967fa9e /storage/innobase/row/row0ftsort.cc | |
| parent | ba4d0a1b351ad3b8ddeea4b137bca4befe32e8c1 (diff) | |
| parent | 13493078e9aea37f6714b3921921aa10864c8b30 (diff) | |
| download | mariadb-git-3c47ed48490f0bab1996beab5b22f386451f0d88.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/innobase/row/row0ftsort.cc')
| -rw-r--r-- | storage/innobase/row/row0ftsort.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index 83a6bd5a2e7..e8e02cdcc86 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -665,7 +665,6 @@ fts_parallel_tokenization( mem_heap_t* blob_heap = NULL; fts_doc_t doc; dict_table_t* table = psort_info->psort_common->new_table; - dict_field_t* idx_field; fts_tokenize_ctx_t t_ctx; ulint retried = 0; dberr_t error = DB_SUCCESS; @@ -688,9 +687,6 @@ fts_parallel_tokenization( doc.charset = fts_index_get_charset( psort_info->psort_common->dup->index); - idx_field = dict_index_get_nth_field( - psort_info->psort_common->dup->index, 0); - block = psort_info->merge_block; crypt_block = psort_info->crypt_block; crypt_data = psort_info->psort_common->crypt_data; |