1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changes to make ALTER TABLE and DELETE FROM TABLE work properly

Browse Source 
with BEGIN WORK.
This commit is contained in:
unknown 2000-11-07 01:52:43 -05:00
parent 29375b48a3
commit d3949f4c7d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_delete.cc
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);

3
sql/sql_parse.cc
View File

@ -1150,7 +1150,8 @@ mysql_execute_command(void)
}
}
/* ALTER TABLE ends previous transaction */
if (!(thd->options & OPTION_AUTO_COMMIT) && ha_commit(thd))
if ((!(thd->options & OPTION_AUTO_COMMIT) ||
(thd->options & OPTION_BEGIN)) && ha_commit(thd))
res= -1;
else
res= mysql_alter_table(thd, lex->db, lex->name,