summaryrefslogtreecommitdiff
path: root/sql/mdl.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-11-25 08:08:42 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-11-25 08:08:42 +0200
commit3cfbfa58de20057c07ddcc066b6eb4956f77c9e1 (patch)
tree9778934aaed011c97a5baa1548a10732475f6389 /sql/mdl.cc
parentde7db5517de11a58d57d2a41d0bc6f38b6f92dd8 (diff)
parentca2695392411adc7f1d19f85d464213128e4f285 (diff)
downloadmariadb-git-3cfbfa58de20057c07ddcc066b6eb4956f77c9e1.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'sql/mdl.cc')
-rw-r--r--sql/mdl.cc2
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();
}