diff options
| author | unknown <pem@mysql.com> | 2005-05-30 11:06:31 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2005-05-30 11:06:31 +0200 |
| commit | 4701bd908ba760fe28b476a0ac7bfea7db67c55d (patch) | |
| tree | a145f81cb2f14d8988bae58a9bcbabb2ec0d103d /sql/item_subselect.cc | |
| parent | 1c7b61e3aef5227165a9957ead000e67935708b2 (diff) | |
| parent | 166accffda5d2019804c842a91b33e7d1a65f6ac (diff) | |
| download | mariadb-git-4701bd908ba760fe28b476a0ac7bfea7db67c55d.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 29c52e73159..328bc75757b 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -138,7 +138,7 @@ bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref) DBUG_ASSERT(fixed == 0); engine->set_thd((thd= thd_param)); - if (check_stack_overrun(thd, (gptr)&res)) + if (check_stack_overrun(thd, STACK_MIN_SIZE)) return TRUE; res= engine->prepare(); |