diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2021-05-30 19:39:09 +1000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2021-05-30 19:39:09 +1000 |
| commit | ebbb2d513387c14bbb667f88e84ffbdb87a4dda3 (patch) | |
| tree | adca5ddacf25e44934c653128bfe665d9e6135e9 /databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc | |
| parent | benchmarks/ali: Update to version 0.6.1. (diff) | |
databases/mysql57-*: update to 5.7.32 GA release
Release Notes: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-34.html
PR: 255748 (based on)
MFH: 2021Q2
Approved by: joneum@ (implicit)
Diffstat (limited to 'databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc')
| -rw-r--r-- | databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc b/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc index 44325de6c602..ca63b9f31439 100644 --- a/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc +++ b/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc @@ -1,11 +1,11 @@ ---- sql/locks/shared_spin_lock.cc.orig 2020-12-10 03:01:55 UTC +--- sql/locks/shared_spin_lock.cc.orig 2021-05-20 11:22:55 UTC +++ sql/locks/shared_spin_lock.cc -@@ -239,7 +239,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or - { - this->spin_exclusive_lock(); - } +@@ -242,7 +242,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or + #if defined(__APPLE__) + my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self)); + #else - my_atomic_store64(&this->m_exclusive_owner, self); + my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self)); + #endif return (*this); } - |