<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/18e847431f0055159085833fbb4a56dfffaa55d1">https://github.com/macports/macports-ports/commit/18e847431f0055159085833fbb4a56dfffaa55d1</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 18e847431f0 mariadb-10.5: remove unused patch
</span>18e847431f0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 18e847431f0055159085833fbb4a56dfffaa55d1
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Nov 15 13:52:36 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.5: remove unused patch
</span>---
databases/mariadb-10.5/Portfile | 3 ---
.../files/patch-storage_innobase-fix-rw_lock_use.diff | 17 -----------------
2 files changed, 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/Portfile b/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0eaca4afeef..9a8394b6b98 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,9 +193,6 @@ if {$subport eq $name} {
</span> patch-cmake_mysql_version.cmake.diff \
patch-cmake_mysql_columnstore_version.cmake.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch to fix usage of rw_lock ; guessing this will be fixed in the next release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patchfiles-append patch-storage_innobase-fix-rw_lock_use.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|@NAME@|${name_mysql}|g" \
${worksrcpath}/cmake/install_layout.cmake
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-storage_innobase-fix-rw_lock_use.diff b/databases/mariadb-10.5/files/patch-storage_innobase-fix-rw_lock_use.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fa2b7cbb57a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/files/patch-storage_innobase-fix-rw_lock_use.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2cb92a5f..3a819e64 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/storage/innobase/include/buf0types.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/storage/innobase/include/buf0types.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,10 +191,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** Acquire an exclusive lock */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline void lock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef UNIV_DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//#ifdef UNIV_DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** @return whether an exclusive lock is being held by any thread */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool is_write_locked() const { return rw_lock::is_write_locked(); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** @return whether any lock is being held by any thread */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool is_locked() const { return rw_lock::is_locked(); }
</span></pre><pre style='margin:0'>
</pre>