<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c88612f5619bf851334168dc89fbfabd29fd49e5">https://github.com/macports/macports-ports/commit/c88612f5619bf851334168dc89fbfabd29fd49e5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new c88612f5619 mysql57: update to 5.7.34
</span>c88612f5619 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c88612f5619bf851334168dc89fbfabd29fd49e5
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Apr 30 07:44:43 2021 -0500

<span style='display:block; white-space:pre;color:#404040;'>    mysql57: update to 5.7.34
</span>---
 databases/mysql57/Portfile                                | 11 +++++------
 .../files/patch-sql-locks-shared_spin_lock.cc.diff        | 15 ---------------
 2 files changed, 5 insertions(+), 21 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql57/Portfile b/databases/mysql57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fe007ac471b..daf20f5fcad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup           conflicts_build 1.0
</span> 
 name                mysql57
 set name_mysql      ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             5.7.33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             5.7.34
</span> set boost_version   1.59.0
 # Set revision_client and revision_server to 0 on version bump.
 set revision_client 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,9 +45,9 @@ if {$subport eq $name} {
</span>                         ${boost_distname}${extract.suffix}:boost
 
     checksums           ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        rmd160  b041f96c892083f03228eb2e4a24f05cce452f3f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  ad3b8d80d7b6e307cdf9eb061cbecccfe78bb5ecef24f2b17818d8e3ea2063ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    56179381 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        rmd160  f23902a074cb7bcd05dc7ef8c04186021c4d689c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  78d2aeb1320226590755a5734383c2f61284c337dad7f947bdff345f790686a6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    56150251 \
</span>                         ${boost_distname}${extract.suffix} \
                         rmd160  a7974be69a426e8a56b880a412d6c418e4cd751c \
                         sha256  47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,8 +72,7 @@ if {$subport eq $name} {
</span>                     patch-configure.cmake.diff \
                     patch-innodb_memcached-daemon_memcached-include-memcached-util.h.diff \
                     patch-lockpool.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-cmake-fix-test-env.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-sql-locks-shared_spin_lock.cc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-cmake-fix-test-env.diff
</span> 
     post-patch {
         reinplace "s|@NAME@|${name_mysql}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql57/files/patch-sql-locks-shared_spin_lock.cc.diff b/databases/mysql57/files/patch-sql-locks-shared_spin_lock.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 908f65af6df..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql57/files/patch-sql-locks-shared_spin_lock.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/sql/locks/shared_spin_lock.cc b/sql/locks/shared_spin_lock.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7cbb948e0ac..de8becb1a62 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sql/locks/shared_spin_lock.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sql/locks/shared_spin_lock.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,7 +239,11 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or_spin_exclusive_lock(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     this->spin_exclusive_lock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   my_atomic_store64(&this->m_exclusive_owner, self);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   return (*this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>

</pre>