database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge olga.mysql.com:/home/igor/mysql-5.1

Browse Source 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge
This commit is contained in:
igor@olga.mysql.com
2007-08-04 22:36:54 -07:00
parent 92d4958eb7 fd3be5034e
commit a5e4e70100
35 changed files with 487 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_parse.cc
View File

@ -5253,6 +5253,11 @@ mysql_new_select(LEX *lex, bool move_down)
select_lex->init_query();
select_lex->init_select();
lex->nest_level++;
if (lex->nest_level > (int) MAX_SELECT_NESTING)
{
my_error(ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT,MYF(0),MAX_SELECT_NESTING);
DBUG_RETURN(1);
}
select_lex->nest_level= lex->nest_level;
/*
Don't evaluate this subquery during statement prepare even if