diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-07-17 02:13:02 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-07-17 02:13:02 +0300 |
| commit | be922a58e91ec1df465ec2451787549d6aadbbcf (patch) | |
| tree | d2650859e3d8fe1fca3ba854b9ed268bd41c5259 /sql/item_subselect.cc | |
| parent | b13efa54a147056cabf0858b1839da95e16e6383 (diff) | |
| parent | 1fd2fdfa498c9421de6b57d5daeb91590575e211 (diff) | |
| download | mariadb-git-be922a58e91ec1df465ec2451787549d6aadbbcf.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1
sql/item_subselect.cc:
Auto merged
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index ccc72cea608..8c4dae92ddc 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -128,7 +128,12 @@ bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref) stmt= thd->current_statement; char const *save_where= thd->where; - int res= engine->prepare(); + int res; + + if (check_stack_overrun(thd, (gptr)&res)) + return 1; + + res= engine->prepare(); // all transformetion is done (used by prepared statements) changed= 1; |