summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/sql_select.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index fb705e9ba6a..80d4b87e916 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -8154,6 +8154,9 @@ static COND *build_equal_items_for_cond(THD *thd, COND *cond,
COND_EQUAL cond_equal;
cond_equal.upper_levels= inherited;
+ if (check_stack_overrun(thd, STACK_MIN_SIZE, NULL))
+ return cond; // Fatal error flag is set!
+
if (cond->type() == Item::COND_ITEM)
{
List<Item> eq_list;