diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-04 15:30:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-04 15:30:34 +0200 |
| commit | bd52f1a2dd1cb56c8bd9da9fc978f760b36ca701 (patch) | |
| tree | 4af4b69e8943ce7fd5431e39904712cc099602ba /storage/innobase/trx | |
| parent | 3dabe637ca972d9139819848449f76867dd0f7ef (diff) | |
| download | mariadb-git-bd52f1a2dd1cb56c8bd9da9fc978f760b36ca701.tar.gz | |
Cleanup: Remove lock_number_of_rows_locked()
Let us access trx->lock.n_rec_locks directly.
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0i_s.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/trx/trx0i_s.cc b/storage/innobase/trx/trx0i_s.cc index f589e4f4f54..a24562211b6 100644 --- a/storage/innobase/trx/trx0i_s.cc +++ b/storage/innobase/trx/trx0i_s.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2007, 2015, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2020, MariaDB Corporation. +Copyright (c) 2017, 2021, 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 @@ -487,7 +487,7 @@ thd_done: row->trx_lock_memory_bytes = mem_heap_get_size(trx->lock.lock_heap); - row->trx_rows_locked = lock_number_of_rows_locked(&trx->lock); + row->trx_rows_locked = trx->lock.n_rec_locks; row->trx_rows_modified = trx->undo_no; diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 7ece8a40540..fb535991210 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -1761,7 +1761,7 @@ trx_print_low( /*!< in: max query length to print, or 0 to use the default max length */ ulint n_rec_locks, - /*!< in: lock_number_of_rows_locked(&trx->lock) */ + /*!< in: trx->lock.n_rec_locks */ ulint n_trx_locks, /*!< in: length of trx->lock.trx_locks */ ulint heap_size) @@ -1872,7 +1872,7 @@ trx_print_latched( lock_sys.mutex_assert_locked(); trx_print_low(f, trx, max_query_len, - lock_number_of_rows_locked(&trx->lock), + trx->lock.n_rec_locks, UT_LIST_GET_LEN(trx->lock.trx_locks), mem_heap_get_size(trx->lock.lock_heap)); } @@ -1893,7 +1893,7 @@ trx_print( ulint heap_size; lock_sys.mutex_lock(); - n_rec_locks = lock_number_of_rows_locked(&trx->lock); + n_rec_locks = trx->lock.n_rec_locks; n_trx_locks = UT_LIST_GET_LEN(trx->lock.trx_locks); heap_size = mem_heap_get_size(trx->lock.lock_heap); lock_sys.mutex_unlock(); |