diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-27 17:36:54 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-27 17:36:54 -0500 |
| commit | af651c80f7d7b49a141958a68e81f2de90e62f25 (patch) | |
| tree | fe6beb28814b0e5a149dde1597463c8fe9faa177 /storage/innobase/include/trx0trx.h | |
| parent | f02fdb6b55a2b29595cb7e4eed48a51755e967fb (diff) | |
| parent | 5c66abf0b0de6d632f85a57c841f80d28a7e0337 (diff) | |
| download | mariadb-git-af651c80f7d7b49a141958a68e81f2de90e62f25.tar.gz | |
Merge tag 'mariadb-10.0.17' into 10.0-galera
Conflicts:
storage/innobase/include/trx0trx.h
Diffstat (limited to 'storage/innobase/include/trx0trx.h')
| -rw-r--r-- | storage/innobase/include/trx0trx.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index 7c92445b796..dd26e420aa2 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -1009,6 +1009,19 @@ struct trx_t{ /*------------------------------*/ char detailed_error[256]; /*!< detailed error message for last error, or empty. */ + /* Lock wait statistics */ + ulint n_rec_lock_waits; + /*!< Number of record lock waits, + might not be exactly correct. */ + ulint n_table_lock_waits; + /*!< Number of table lock waits, + might not be exactly correct. */ + ulint total_rec_lock_wait_time; + /*!< Total rec lock wait time up + to this moment. */ + ulint total_table_lock_wait_time; + /*!< Total table lock wait time + up to this moment. */ #ifdef WITH_WSREP os_event_t wsrep_event; /* event waited for in srv_conc_slot */ #endif /* WITH_WSREP */ |