Index: mysql-5.7.5-m15/sql/mdl.cc
===================================================================
--- mysql-5.7.5-m15.orig/sql/mdl.cc
+++ mysql-5.7.5-m15/sql/mdl.cc
@@ -243,7 +243,7 @@ private:
     for some short period of time. Code which uses its value needs to take
     this into account.
   */
-  volatile int32 m_unused_lock_objects;
+  int32 m_unused_lock_objects;
 };
 
 
@@ -1149,7 +1149,7 @@ void MDL_map::init()
   m_global_lock= MDL_lock::create(&global_lock_key);
   m_commit_lock= MDL_lock::create(&commit_lock_key);
 
-  m_unused_lock_objects= 0;
+  my_atomic_store32(&m_unused_lock_objects, 0);
 
   lf_hash_init2(&m_locks, sizeof(MDL_lock), LF_HASH_UNIQUE,
                 0, 0, mdl_locks_key, &my_charset_bin, &murmur3_adapter,