diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2010-06-02 14:37:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2010-06-02 14:37:33 +0300 |
| commit | a2b95321882072cfd0725d4b5f261586d3483400 (patch) | |
| tree | 5f0948b1fa327bad05d1d187e939614b83d91bca /storage/innobase/include/db0err.h | |
| parent | 8f5d78c28b901ad118b2540d3394787e141365ba (diff) | |
| download | mariadb-git-a2b95321882072cfd0725d4b5f261586d3483400.tar.gz | |
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
Diffstat (limited to 'storage/innobase/include/db0err.h')
| -rw-r--r-- | storage/innobase/include/db0err.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/include/db0err.h b/storage/innobase/include/db0err.h index d339eb73fb9..f84ce2d15aa 100644 --- a/storage/innobase/include/db0err.h +++ b/storage/innobase/include/db0err.h @@ -28,6 +28,8 @@ Created 5/24/1996 Heikki Tuuri enum db_err { + DB_SUCCESS_LOCKED_REC = 9, /*!< like DB_SUCCESS, but a new + explicit record lock was created */ DB_SUCCESS = 10, /* The following are error codes */ |