diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-17 08:49:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-17 08:55:56 +0300 |
| commit | 4fa9eaf454c41953c80747800c53b36ed6c63881 (patch) | |
| tree | 78c3d13c5f984083e6fa5b366a0b6a1588b7dbf1 /storage/innobase/handler/ha_innodb.h | |
| parent | bd7c31621ff8f490866a5a5dfb1d99de35d062a4 (diff) | |
| download | mariadb-git-4fa9eaf454c41953c80747800c53b36ed6c63881.tar.gz | |
Remove unused ha_innobase::lock
In MySQL 5.7, a follow-up to WL#6671 removed the unused
fields ha_innobase::lock and INNOBASE_SHARE::lock, but
MariaDB did not remove them, even though a counterpart of
WL#6671 itself was implemented as MDEV-7660 in
commit d665e79c5b8582f44dc280e5e6df4a8ff4945623.
INNOBASE_SHARE was removed in MDEV-16557. Thus, all that
needs to be removed is the unused member ha_innobase::lock
and related code.
Thanks to Monty (and Valgrind) for noticing that
ha_innobase::lock was uninitialized.
Diffstat (limited to 'storage/innobase/handler/ha_innodb.h')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index ab1d3bbeac3..5fd700412ef 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -461,8 +461,6 @@ protected: this is set in external_lock function */ THD* m_user_thd; - THR_LOCK_DATA lock; - /** buffer used in updates */ uchar* m_upd_buf; |