diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 12:08:50 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 12:14:27 +0300 |
| commit | b6ac67389dfed3255004b82d29625577c3335a0a (patch) | |
| tree | ca6d71736e041ee0f8db949f2609a395b9e724c7 /storage/innobase/include/lock0lock.h | |
| parent | ee555f8fc5fed02503d45cc4ad0d08b07d5a6355 (diff) | |
| parent | 8d0dabc56b09c6b40db15aac7da0da43d988759d (diff) | |
| download | mariadb-git-b6ac67389dfed3255004b82d29625577c3335a0a.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/include/lock0lock.h')
| -rw-r--r-- | storage/innobase/include/lock0lock.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h index 934f68df082..18bc3abfaf1 100644 --- a/storage/innobase/include/lock0lock.h +++ b/storage/innobase/include/lock0lock.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2018, MariaDB Corporation. +Copyright (c) 2017, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -595,11 +595,10 @@ lock_print_info_summary( /** Prints transaction lock wait and MVCC state. @param[in,out] file file where to print -@param[in] trx transaction */ +@param[in] trx transaction +@param[in] now current time */ void -lock_trx_print_wait_and_mvcc_state( - FILE* file, - const trx_t* trx); +lock_trx_print_wait_and_mvcc_state(FILE* file, const trx_t* trx, time_t now); /*********************************************************************//** Prints info of locks for each transaction. This function assumes that the |