diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-28 10:43:29 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-28 10:43:29 +0200 |
| commit | f14d9fa09a33b6989c211dc4792b7d895142236c (patch) | |
| tree | 8de900ac6b55902a188d7266f98f0ea0f3a9a680 /storage/innobase/include/lock0lock.h | |
| parent | 3b9e8dfa84e8de75cb6d4a06ae174abb543b58aa (diff) | |
| parent | c3246e4bf0b578276d776b378d24b805d85dff24 (diff) | |
| download | mariadb-git-f14d9fa09a33b6989c211dc4792b7d895142236c.tar.gz | |
Merge 10.9 into 10.10
Diffstat (limited to 'storage/innobase/include/lock0lock.h')
| -rw-r--r-- | storage/innobase/include/lock0lock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h index b67a1011f6b..16acd031177 100644 --- a/storage/innobase/include/lock0lock.h +++ b/storage/innobase/include/lock0lock.h @@ -891,8 +891,8 @@ public: /** Cancel a waiting lock request. @tparam check_victim whether to check for DB_DEADLOCK - @param lock waiting lock request @param trx active transaction + @param lock waiting lock request @retval DB_SUCCESS if no lock existed @retval DB_DEADLOCK if trx->lock.was_chosen_as_deadlock_victim was set @retval DB_LOCK_WAIT if the lock was canceled */ |