diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2000-11-07 01:52:43 -0500 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2000-11-07 01:52:43 -0500 |
| commit | d3949f4c7dcc6cfbc53db3c35412b8aac449ce16 (patch) | |
| tree | d509b08589a44f70e0e195525d348ca7e5964128 /sql/sql_delete.cc | |
| parent | 29375b48a3c2b9480c96812f3bb513baef2e300d (diff) | |
| download | mariadb-git-d3949f4c7dcc6cfbc53db3c35412b8aac449ce16.tar.gz | |
Changes to make ALTER TABLE and DELETE FROM TABLE work properly
with BEGIN WORK.
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 2e6bea7239e..29526b4d7d5 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -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); |