From 87933d52619c3f0df84922e23d5a8b03fa050133 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@mariadb.org>
Date: Tue, 14 Nov 2017 07:47:58 +0200
Subject: Handle failures from malloc

Most "new" failures fixed in the following files:
- sql_select.cc
- item.cc
- item_func.cc
- opt_subselect.cc

Other things:
- Allocate udf_handler strings in mem_root
  - Required changes in sql_string.h
- Add mem_root as argument to some new [] calls
- Mark udf_handler strings as thread specific
- Removed some comment blocks with code
---
 sql/sql_base.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sql/sql_base.cc')

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 7fd6599df51..0a84dc2b351 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -8481,7 +8481,8 @@ int init_ftfuncs(THD *thd, SELECT_LEX *select_lex, bool no_order)
     DBUG_PRINT("info",("Performing FULLTEXT search"));
 
     while ((ifm=li++))
-      ifm->init_search(thd, no_order);
+      if (ifm->init_search(thd, no_order))
+        return 1;
   }
   return 0;
 }
-- 
cgit v1.2.1