summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-08-04 16:58:42 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-08-04 16:58:42 +0200
commitee620a7416ac1719de322f16593fe403f5c43833 (patch)
treee8eb1e37d02d2b4aa29942b7732f3e3e9d5367da /sql/item_func.cc
parent558f1eff64e7708b594ef0315e23bdeb1d23ccf7 (diff)
parent3b071bad1981a12e76769cbfc31b62fbd7362372 (diff)
downloadmariadb-git-ee620a7416ac1719de322f16593fe403f5c43833.tar.gz
Merge branch '10.5' into 10.6
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 6aa9cce11dd..7811701bd11 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -6196,6 +6196,8 @@ bool Item_func_match::init_search(THD *thd, bool no_order)
ft_handler= table->file->ft_init_ext(match_flags, key, ft_tmp);
+ if (!ft_handler)
+ DBUG_RETURN(1);
if (join_key)
table->file->ft_handler=ft_handler;