diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-08-03 02:03:01 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-08-03 02:03:01 +0500 |
| commit | 30f63c14d1ad10286d47d60322a4db1b5decfad1 (patch) | |
| tree | ef3296fff50bbf14e89b391ae78afd6020e4da81 /sql/sql_parse.cc | |
| parent | ed4836857e6326f248a0530c3a21c3e3d4e94e24 (diff) | |
| parent | a53510f0be0bfdbaff6e60366d5e8cfc1d2d197f (diff) | |
| download | mariadb-git-30f63c14d1ad10286d47d60322a4db1b5decfad1.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-27352
into gleb.loc:/home/uchum/work/bk/5.0-opt
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7d723d3cd5b..a0f834afe60 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5891,6 +5891,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 |