summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-07-24 09:59:38 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2020-07-28 08:23:57 +0200
commitc6eb21cd878f8762b3abb12813403ed8e04fee0c (patch)
treea2244289439f6ff98576a85d34259f4166b7c192 /sql/sql_lex.h
parentfd9ca2a742abe2e91b2b77e70915dec7bd3cd7e1 (diff)
downloadmariadb-git-c6eb21cd878f8762b3abb12813403ed8e04fee0c.tar.gz
MDEV-21998: Server crashes in st_select_lex::add_table_to_list upon mix of KILL and sequences
Continue support the hack of current select equal builtin select if selects stack is empty even after subselects.
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 3d8505e5942..d0a18d4c578 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -3632,8 +3632,9 @@ public:
if (unlikely(!select_stack_top))
{
- current_select= NULL;
- DBUG_PRINT("info", ("Top Select is empty"));
+ current_select= &builtin_select;
+ DBUG_PRINT("info", ("Top Select is empty -> sel builtin: %p",
+ current_select));
}
else
current_select= select_stack[select_stack_top - 1];