Commit be922a58 authored by unknown's avatar unknown
Browse files

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 b13efa54 1fd2fdfa
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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;