Commit 0c3161cb authored by unknown's avatar unknown

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
parents f077762d 1af38c35
...@@ -128,7 +128,12 @@ bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref) ...@@ -128,7 +128,12 @@ bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref)
stmt= thd->current_statement; stmt= thd->current_statement;
char const *save_where= thd->where; 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) // all transformetion is done (used by prepared statements)
changed= 1; changed= 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment