diff options
Diffstat (limited to 'storage/innobase/include/sync0policy.h')
| -rw-r--r-- | storage/innobase/include/sync0policy.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/innobase/include/sync0policy.h b/storage/innobase/include/sync0policy.h index 1b86d2633bf..6d485c30aed 100644 --- a/storage/innobase/include/sync0policy.h +++ b/storage/innobase/include/sync0policy.h @@ -76,7 +76,7 @@ public: { m_mutex = mutex; - m_thread_id = os_thread_get_curr_id(); + my_atomic_storelint(&m_thread_id, os_thread_get_curr_id()); m_filename = filename; @@ -89,7 +89,7 @@ public: { m_mutex = NULL; - m_thread_id = os_thread_id_t(ULINT_UNDEFINED); + my_atomic_storelint(&m_thread_id, ULINT_UNDEFINED); m_filename = NULL; @@ -138,7 +138,7 @@ public: unsigned m_line; /** Thread ID of the thread that own(ed) the mutex */ - os_thread_id_t m_thread_id; + ulint m_thread_id; }; /** Constructor. */ @@ -157,7 +157,7 @@ public: /** Mutex is being destroyed. */ void destroy() UNIV_NOTHROW { - ut_ad(m_context.m_thread_id == os_thread_id_t(ULINT_UNDEFINED)); + ut_ad((ulint)my_atomic_loadlint(&m_context.m_thread_id) == ULINT_UNDEFINED); m_magic_n = 0; @@ -199,7 +199,7 @@ public: bool is_owned() const UNIV_NOTHROW { return(os_thread_eq( - m_context.m_thread_id, + my_atomic_loadlint(&m_context.m_thread_id), os_thread_get_curr_id())); } @@ -221,7 +221,7 @@ public: os_thread_id_t get_thread_id() const UNIV_NOTHROW { - return(m_context.m_thread_id); + return(my_atomic_loadlint(&m_context.m_thread_id)); } /** Magic number to check for memory corruption. */ |