diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-25 08:08:42 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-25 08:08:42 +0200 |
commit | 3cfbfa58de20057c07ddcc066b6eb4956f77c9e1 (patch) | |
tree | 9778934aaed011c97a5baa1548a10732475f6389 /sql/mdl.cc | |
parent | de7db5517de11a58d57d2a41d0bc6f38b6f92dd8 (diff) | |
parent | ca2695392411adc7f1d19f85d464213128e4f285 (diff) | |
download | mariadb-git-3cfbfa58de20057c07ddcc066b6eb4956f77c9e1.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/mdl.cc')
-rw-r--r-- | sql/mdl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index dc1d658b0b5..bd5d6aa7db3 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -784,7 +784,7 @@ int mdl_iterate(mdl_iterator_callback callback, void *arg) my_hash_value_type mdl_hash_function(CHARSET_INFO *cs, const uchar *key, size_t length) { - MDL_key *mdl_key= (MDL_key*) (key - my_offsetof(MDL_key, m_ptr)); + MDL_key *mdl_key= (MDL_key*) (key - offsetof(MDL_key, m_ptr)); return mdl_key->hash_value(); } |