diff options
| author | Monty <monty@mariadb.org> | 2017-09-26 00:56:10 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-12-03 13:58:35 +0200 |
| commit | 2f09b28e0f7f8e4291003a9b46c62b54f3bf4454 (patch) | |
| tree | 7c15276dbe9b584dabdc0d3a19a3672f2b5ca582 /sql/sql_select.cc | |
| parent | 5b409843b8c261dec58ccd93b2ae91d4278fc058 (diff) | |
| download | mariadb-git-2f09b28e0f7f8e4291003a9b46c62b54f3bf4454.tar.gz | |
Adding Full Text Search support to partitions
Contains Spiral patches:
007_mariadb-10.2.0.partition_fulltext.diff MDEV-7705
038_mariadb-10.2.0.partition_fulltext2.diff MDEV-7734
This commit has the following differences compared to the original
patches:
- Added necessary full text search cleanup at the storage engine layer
that was omitted in the original patch.
- Added test case.
- A lot of code cleanups to make the code notable smaller.
- Changed SQL code to use ha_ft_end() instead of ft_end()
Original author: Kentoku SHIBA
First reviewer: Jacob Mathew
Second reviewer: Michael Widenius
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index fb8698033e1..0681e20c3e3 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -22144,7 +22144,7 @@ create_sort_index(THD *thd, JOIN *join, JOIN_TAB *tab, Filesort *fsort) table->file->ha_end_keyread(); if (tab->type == JT_FT) - table->file->ft_end(); + table->file->ha_ft_end(); else table->file->ha_index_or_rnd_end(); |