Changes to make ALTER TABLE and DELETE FROM TABLE work properly

with BEGIN WORK.
This commit is contained in:
unknown 2000-11-07 01:52:43 -05:00
commit d3949f4c7d
2 changed files with 4 additions and 2 deletions

View file

@ -141,7 +141,8 @@ int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit,
use_generate_table= (!using_limit && !conds &&
!(specialflag &
(SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) &&
(thd->options & OPTION_AUTO_COMMIT));
(thd->options & OPTION_AUTO_COMMIT) &&
!(thd->options & OPTION_BEGIN));
if (use_generate_table && ! thd->open_tables)
{
error=generate_table(thd,table_list,(TABLE*) 0);