revision-id: 7e704a2308e25953b5f8fb154eb325df3e25c2ec (mariadb-10.3.6-39-g7e704a2308e) parent(s): 9183f66f056e274906f7742ed8762f0205510778 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-07-05 14:19:54 +0200 message: Fixed 32bit version SELECT nesting depth. --- sql/sql_lex.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/sql_lex.h b/sql/sql_lex.h index f3e26e5b8ac..24788158d26 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -3052,7 +3052,7 @@ struct LEX: public Query_tables_list required a local context, the parser pops the top-most context. */ List<Name_resolution_context> context_stack; - SELECT_LEX *select_stack[MAX_SELECT_NESTING]; + SELECT_LEX *select_stack[MAX_SELECT_NESTING + 1]; uint select_stack_top; SQL_I_List<ORDER> proc_list; @@ -3444,7 +3444,7 @@ struct LEX: public Query_tables_list select_stack_head()->select_number : 0), select_lex, select_lex->select_number)); - if (unlikely(select_stack_top == MAX_SELECT_NESTING)) + if (unlikely(select_stack_top > MAX_SELECT_NESTING)) { my_error(ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT, MYF(0)); DBUG_RETURN(TRUE);