Commit d9910c5e authored by unknown's avatar unknown
Browse files

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0


sql/set_var.cc:
  Auto merged
parents 87b40f20 15b21750

sql/set_var.cc

+2 −0
Original line number Diff line number Diff line
@@ -1319,10 +1319,12 @@ static void fix_thd_mem_root(THD *thd, enum_var_type type) 


static void fix_trans_mem_root(THD *thd, enum_var_type type)

{

#ifdef USING_TRANSACTIONS

  if (type != OPT_GLOBAL)

    reset_root_defaults(&thd->transaction.mem_root,

                        thd->variables.trans_alloc_block_size,

                        thd->variables.trans_prealloc_size);

#endif

}