diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-12 22:06:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-12 22:06:47 +0300 |
| commit | 833637144178dcae60e7bb732dd373679f32d853 (patch) | |
| tree | e46a595a7a554e7064517d2caae5585f62339eac /sql | |
| parent | 6860d6f8be90994ea2956cecffb235754a5821a2 (diff) | |
| parent | 899c843f11bc40bf4734b61f18bd1d1e5c8d61e5 (diff) | |
| download | mariadb-git-833637144178dcae60e7bb732dd373679f32d853.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/xa.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/xa.cc b/sql/xa.cc index e30c3bfadba..3ead73fe1e1 100644 --- a/sql/xa.cc +++ b/sql/xa.cc @@ -142,8 +142,8 @@ public: } static void lf_alloc_destructor(uchar *ptr) { - XID_cache_element *element= (XID_cache_element*) (ptr + LF_HASH_OVERHEAD); - DBUG_ASSERT(!element->is_set(ACQUIRED)); + DBUG_ASSERT(!reinterpret_cast<XID_cache_element*>(ptr + LF_HASH_OVERHEAD) + ->is_set(ACQUIRED)); } static uchar *key(const XID_cache_element *element, size_t *length, my_bool not_used __attribute__((unused))) |