summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorThirunarayanan Balathandayuthapani <thiru@mariadb.com>2022-07-20 14:14:43 +0530
committerThirunarayanan Balathandayuthapani <thiru@mariadb.com>2022-08-03 20:35:12 +0530
commitf9ec9b6abbce8c88b0cfd1888135b9701415162a (patch)
tree55dc490cb06a89e95f4fbfc140a2ed67ecb948fb /sql/item_func.cc
parentc2300d06f7845f51db6318c2fdcbadd6becc0e89 (diff)
downloadmariadb-git-f9ec9b6abbce8c88b0cfd1888135b9701415162a.tar.gz
MDEV-27282 InnoDB: Failing assertion: !query->intersection
- query->intersection fails to get freed if the query exceeds innodb_ft_result_cache_limit - errors from init_ftfuncs were not propogated by delete command This is taken from percona/percona-server@ef2c0bcb9a34aeb06de0058d7c2a2969416b35a7
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 3fd69405456..2c79ca531d3 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -6012,6 +6012,8 @@ bool Item_func_match::init_search(THD *thd, bool no_order)
ft_handler= table->file->ft_init_ext(flags, key, ft_tmp);
+ if (!ft_handler)
+ DBUG_RETURN(1);
if (join_key)
table->file->ft_handler=ft_handler;