diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-19 18:45:53 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-19 18:45:53 +0200 |
| commit | fd58bb71e22196c3c5e8d20b92bce6f343f1dea1 (patch) | |
| tree | 88b34c77a20d9e816edce51e9dcff47f6de526c8 /storage/innobase/row/row0ftsort.cc | |
| parent | 37d6d3b661315617953f1a8c5d53a2cb6558992e (diff) | |
| parent | e669e705a1a7d2bbdd42734cb9fc8349a5f2f118 (diff) | |
| download | mariadb-git-fd58bb71e22196c3c5e8d20b92bce6f343f1dea1.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/row/row0ftsort.cc')
| -rw-r--r-- | storage/innobase/row/row0ftsort.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index a351a1ae01b..893eeb56c18 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -24,16 +24,11 @@ Create Full Text Index with (parallel) merge sort Created 10/13/2010 Jimmy Yang *******************************************************/ -#include "ha_prototypes.h" - -#include "dict0dict.h" -#include "row0merge.h" -#include "pars0pars.h" #include "row0ftsort.h" +#include "dict0dict.h" #include "row0merge.h" #include "row0row.h" #include "btr0cur.h" -#include "btr0bulk.h" #include "fts0plugin.h" #include "log0crypt.h" |