diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-16 14:35:42 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-16 15:49:53 +0200 |
| commit | 84129fb1b52a0631f05ba193f464665c5b369e77 (patch) | |
| tree | 98d4cec4446a5d2ce541438402f5dbf1931b5a63 /storage/innobase/include/lock0lock.h | |
| parent | 98eb9518db1da854048b09d94244a982a1d32f9a (diff) | |
| download | mariadb-git-84129fb1b52a0631f05ba193f464665c5b369e77.tar.gz | |
After-merge fix for commit 98eb9518db1da854048b09d94244a982a1d32f9a
The merge only covered 10.1 up to
commit 4d248974e00eb915a2fc433cc6b2fb5146281594.
Actually merge the changes up to
commit 0a534348c75cf435d2017959855de2efa798fd0b.
Also, remove the unused InnoDB field trx_t::abort_type.
Diffstat (limited to 'storage/innobase/include/lock0lock.h')
| -rw-r--r-- | storage/innobase/include/lock0lock.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h index b1f27e7f456..026aac1b367 100644 --- a/storage/innobase/include/lock0lock.h +++ b/storage/innobase/include/lock0lock.h @@ -781,9 +781,7 @@ the wait lock. dberr_t lock_trx_handle_wait( /*=================*/ - trx_t* trx, /*!< in/out: trx lock state */ - bool lock_mutex_taken, - bool trx_mutex_taken); + trx_t* trx); /*!< in/out: trx lock state */ /*********************************************************************//** Get the number of locks on a table. @return number of locks */ |