summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-08-03 19:51:44 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-08-03 19:51:44 +0200
commite509065247b1a0cda0bc7863ac1d43d0fab9acc8 (patch)
tree0a89b1350bbf06177b63c92111e769a71a4b84c0 /sql/item_func.cc
parent8fd8a81a9933e6a5b8afe2e7a2655652bd7c7190 (diff)
parent37a3d4467e3115f4d4dfcad0a6ee3c23e785f524 (diff)
downloadmariadb-git-e509065247b1a0cda0bc7863ac1d43d0fab9acc8.tar.gz
Merge branch '10.3' into 10.4
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 935208423a4..8d63a7af05c 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -6081,6 +6081,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;