diff options
author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-08-03 10:47:41 +0300 |
---|---|---|
committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-08-03 10:47:41 +0300 |
commit | 3ba7d3d11f11c2e422501909da7ba7cec8e0447c (patch) | |
tree | 8cf964b68d022c9934b88d56bbbf3ad5b137fd55 /sql/sql_parse.cc | |
parent | 92eb49d56b63794df0e14273001a350244908fbf (diff) | |
parent | e66a6d0a812509da394b62b178fa614a136ba988 (diff) | |
download | mariadb-git-3ba7d3d11f11c2e422501909da7ba7cec8e0447c.tar.gz |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B30193-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 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 |