diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-03-29 21:11:17 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-03-29 21:11:17 +0300 |
| commit | e57c8007a4e2c7d1f8bda44b0af6599126673ef4 (patch) | |
| tree | b931193692f1cf128130b65c64be0083c17e62b0 /sql/set_var.cc | |
| parent | 0fdd64ba6391e556c3438733cb4f479f2c3395cf (diff) | |
| download | mariadb-git-e57c8007a4e2c7d1f8bda44b0af6599126673ef4.tar.gz | |
Manual merge from 5.0
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index b8459c33bc2..de214164c0a 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -3083,9 +3083,7 @@ static bool set_option_autocommit(THD *thd, set_var *var) if ((org_options & OPTION_NOT_AUTOCOMMIT)) { /* We changed to auto_commit mode */ - thd->options&= ~(ulonglong) (OPTION_BEGIN | - OPTION_STATUS_NO_TRANS_UPDATE | - OPTION_KEEP_LOG); + thd->options&= ~(ulonglong) (OPTION_BEGIN | OPTION_KEEP_LOG); thd->no_trans_update.all= FALSE; thd->server_status|= SERVER_STATUS_AUTOCOMMIT; if (ha_commit(thd)) @@ -3094,7 +3092,6 @@ static bool set_option_autocommit(THD *thd, set_var *var) else { thd->no_trans_update.all= FALSE; - thd->options&= ~(ulonglong) (OPTION_STATUS_NO_TRANS_UPDATE); thd->server_status&= ~SERVER_STATUS_AUTOCOMMIT; } } |