summaryrefslogtreecommitdiff
path: root/sql/sql_base.h
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2018-05-15 14:10:19 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2018-05-15 14:10:19 +0400
commite06c0298497c8dcc2e803435e13c59b7c3d65ab1 (patch)
tree787fb0b33e9029b4c4953059b202775f924b2e89 /sql/sql_base.h
parenta0048378f94973e6f45726efb64627d313782997 (diff)
downloadmariadb-git-e06c0298497c8dcc2e803435e13c59b7c3d65ab1.tar.gz
MDEV-15465 Server crash or ASAN heap-use-after-free in Item_func_match::cleanup upon using FT search with partitioning.
Partition engine FT keys are implemented in such a way that the FT function's cleanup() methods use table's internals. So calling them after close_thread_tables is unsafe.
Diffstat (limited to 'sql/sql_base.h')
-rw-r--r--sql/sql_base.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h
index 8f6d406cb73..645a4a83fcb 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -216,6 +216,7 @@ int setup_conds(THD *thd, TABLE_LIST *tables, List<TABLE_LIST> &leaves,
COND **conds);
void wrap_ident(THD *thd, Item **conds);
int setup_ftfuncs(SELECT_LEX* select);
+void cleanup_ftfuncs(SELECT_LEX *select_lex);
int init_ftfuncs(THD *thd, SELECT_LEX* select, bool no_order);
bool lock_table_names(THD *thd, const DDL_options_st &options,
TABLE_LIST *table_list,