diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2000-11-07 00:53:02 -0500 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2000-11-07 00:53:02 -0500 |
| commit | c7fa60e5422b10ad26259ea96074157ff75ab77d (patch) | |
| tree | 63af37c7840376ec59419ca3360baa16dae2ca91 /sql/ha_berkeley.cc | |
| parent | a948b3d66b8cc70dc3a163e10d46fb87300cb914 (diff) | |
| download | mariadb-git-c7fa60e5422b10ad26259ea96074157ff75ab77d.tar.gz | |
sql_parse.cc test for changing to auto_commit mode was backwards
ha_berkeley.cc bug fixes to make OPT_BEGIN work properly
handler.cc bug fixes to make OPT_BEGIN work properly
sql/handler.cc:
bug fixes to make OPT_BEGIN work properly
sql/ha_berkeley.cc:
bug fixes to make OPT_BEGIN work properly
sql/sql_parse.cc:
test for changing to auto_commit mode was backwards
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 1239c7db7d3..6cf97f16bb8 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -1370,8 +1370,8 @@ int ha_berkeley::external_lock(THD *thd, int lock_type) current_row.data=0; if (!--thd->transaction.bdb_lock_count) { - if (thd->transaction.bdb_tid && (thd->options & - (OPTION_AUTO_COMMIT | OPTION_BEGIN))) + if (thd->transaction.bdb_tid && (thd->options & OPTION_AUTO_COMMIT) + && !(thd->options & OPTION_BEGIN)) { /* F_UNLOCK is done without a transaction commit / rollback. This |