diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-08-03 02:15:21 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-08-03 02:15:21 +0500 |
| commit | bba712a6c8ccab1faa8c6deaf62117c5d6a69495 (patch) | |
| tree | c3533e82d947e58c3e943074ef1781a098306c50 /sql/sql_parse.cc | |
| parent | cb3df6f2e9f286fceca4a4a0e125642e52baf342 (diff) | |
| parent | cf145f8f425d8cf1fe86ceae7cb049ef5d01b2ea (diff) | |
| download | mariadb-git-bba712a6c8ccab1faa8c6deaf62117c5d6a69495.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/share/errmsg.txt:
Merge with 5.0-opt.
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 da3a634ffd4..a9cac18564d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5230,6 +5230,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 |