diff options
| author | unknown <tim@work.mysql.com> | 2000-11-19 22:27:46 +0100 |
|---|---|---|
| committer | unknown <tim@work.mysql.com> | 2000-11-19 22:27:46 +0100 |
| commit | 22a61956da64790f713dd2089c099a7452dc0472 (patch) | |
| tree | 63979f3b3140516eb9b57d7b1738194c88c4cdc9 /sql/ha_berkeley.cc | |
| parent | c9b16b81048d04260dc8e3ba43f218aa9ef5f06f (diff) | |
| parent | 0ca890bd19b5e71bf5540d852793479c32506571 (diff) | |
| download | mariadb-git-22a61956da64790f713dd2089c099a7452dc0472.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/d1/users/tim/src/mysql
BitKeeper/etc/logging_ok:
auto-union
sql/ha_berkeley.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/ha_berkeley.cc')
| -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")); |