diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 12:49:19 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 12:49:19 +0200 |
| commit | 09a1f0075a8d5752dd7b2940a20d86a040af1741 (patch) | |
| tree | 42c96cf95d5df2950b77329c76c0024f33088aff /storage/innobase/include/lock0lock.h | |
| parent | e6f95b23f425001a14a528256354e0faf4e272f6 (diff) | |
| parent | 440d4b282dd4992d64abdd6289859598db7e5f75 (diff) | |
| download | mariadb-git-09a1f0075a8d5752dd7b2940a20d86a040af1741.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase/include/lock0lock.h')
| -rw-r--r-- | storage/innobase/include/lock0lock.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h index 220e697d556..a9295ced6db 100644 --- a/storage/innobase/include/lock0lock.h +++ b/storage/innobase/include/lock0lock.h @@ -659,11 +659,6 @@ lock_trx_lock_list_init( /*====================*/ trx_lock_list_t* lock_list); /*!< List to initialise */ -/*******************************************************************//** -Set the lock system timeout event. */ -void -lock_set_timeout_event(); -/*====================*/ /*********************************************************************//** Checks that a transaction id is sensible, i.e., not in the future. @return true if ok */ |