summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-08-04 08:30:03 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-08-04 08:30:03 +0200
commit1e71ea806b3b34c53babaea1965d8a67f6c631e2 (patch)
treec1afd54bec1a1ed12d243430af71d2f6a1aa8025 /sql/item_func.cc
parentcd51854d7a69f6518a84403fa428af5035e946a8 (diff)
parente509065247b1a0cda0bc7863ac1d43d0fab9acc8 (diff)
downloadmariadb-git-1e71ea806b3b34c53babaea1965d8a67f6c631e2.tar.gz
Merge branch '10.4' into 10.5
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 659df67adaf..1da220d7276 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -6209,6 +6209,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;