Attachment 225122 Details for Bug 255748 – possible working patch

[patch] possible working patch

mysql57-server-5.7.34.diff (text/plain), 2.08 KB, created by Christos Chatzaras on 2021-05-20 13:39:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christos Chatzaras

Created: 2021-05-20 13:39:33 UTC

Size: 2.08 KB

patch

obsolete

>diff -ruN mysql57-server.orig/Makefile mysql57-server/Makefile
>--- mysql57-server.orig/Makefile	2021-05-20 14:16:53.308261000 +0300
>+++ mysql57-server/Makefile	2021-05-20 14:40:58.583535000 +0300
>@@ -1,7 +1,7 @@
> # Created by: Mahdi Mokhtari <mokhi64@gmail.com>
> 
> PORTNAME?=	mysql
>-PORTVERSION=	5.7.33
>+PORTVERSION=	5.7.34
> PORTREVISION?=	0
> CATEGORIES=	databases
> MASTER_SITES=	MYSQL/MySQL-5.7
>@@ -60,7 +60,7 @@
> 		-DWITH_PROTOBUF=system \
> 		-DWITH_CURL=system \
> 		-DINSTALL_MYSQLTESTDIR=0 \
>-		-DWITH_DEBUG=0
>+		-DWITH_DEBUG=1
> 
> SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
> 
>diff -ruN mysql57-server.orig/distinfo mysql57-server/distinfo
>--- mysql57-server.orig/distinfo	2021-05-20 14:16:53.308333000 +0300
>+++ mysql57-server/distinfo	2021-05-20 14:20:17.257429000 +0300
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1612332815
>-SHA256 (mysql-boost-5.7.33.tar.gz) = cfcaf6f37a055d808fe1472eb0359864e2227aa0206c55c4e1961bab2ecc304b
>-SIZE (mysql-boost-5.7.33.tar.gz) = 52912380
>+TIMESTAMP = 1621509617
>+SHA256 (mysql-boost-5.7.34.tar.gz) = 5bc2c7c0bb944b5bb219480dde3c1caeb049e7351b5bba94c3b00ac207929c7b
>+SIZE (mysql-boost-5.7.34.tar.gz) = 52891142
>diff -ruN mysql57-server.orig/files/patch-sql_locks_shared__spin__lock.cc mysql57-server/files/patch-sql_locks_shared__spin__lock.cc
>--- mysql57-server.orig/files/patch-sql_locks_shared__spin__lock.cc	2021-05-20 14:16:53.310084000 +0300
>+++ mysql57-server/files/patch-sql_locks_shared__spin__lock.cc	2021-05-20 14:23:15.250508000 +0300
>@@ -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);
>  }
>-

Actions: View | Diff

Attachments on bug 255748: 224862 | 225122 | 225217 | 225218