diff options
| author | unknown <igor@olga.mysql.com> | 2007-08-04 20:53:26 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-08-04 20:53:26 -0700 |
| commit | 983cda8d36be587827a3ddfdd86ddcf91630fb29 (patch) | |
| tree | 9646f1775f203eb139348458ee9c74ed588ea4b2 /sql/sql_parse.cc | |
| parent | a150ca337fc0fac1c071e28c228cd390288fdb56 (diff) | |
| parent | 71c3c0cfd57e1d37e4f04427388f8c473283540c (diff) | |
| download | mariadb-git-983cda8d36be587827a3ddfdd86ddcf91630fb29.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-merge
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.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 25ead88ac53..58f5ffc5235 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5892,6 +5892,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 |