diff options
| author | tim@work.mysql.com <> | 2000-11-19 22:27:46 +0100 |
|---|---|---|
| committer | tim@work.mysql.com <> | 2000-11-19 22:27:46 +0100 |
| commit | 6b4967e3e52ab70f4695550ac5ce57852ffdaf8f (patch) | |
| tree | 63979f3b3140516eb9b57d7b1738194c88c4cdc9 /sql | |
| parent | 5f5e3c2d180388dab1dba1b8e4ba9585ac59f8c4 (diff) | |
| parent | c89eee103ff866c1487db0e98d121f1f8f59f633 (diff) | |
| download | mariadb-git-6b4967e3e52ab70f4695550ac5ce57852ffdaf8f.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/d1/users/tim/src/mysql
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_berkeley.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index df54bef5d52..db5bff0c7b0 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -1375,8 +1375,9 @@ int ha_berkeley::external_lock(THD *thd, int lock_type) && !(thd->options & OPTION_BEGIN)) { /* - F_UNLOCK is done without a transaction commit / rollback. This - means that something went wrong. + F_UNLOCK is done without a transaction commit / rollback. + This happens if the thread didn't update any rows or if + something went wrong during an update. We can in this case silenty abort the transaction. */ DBUG_PRINT("trans",("aborting transaction")); |