Attachment #225122 for bug #255748

Lines 1-7 Link Here

(-)mysql57-server/Makefile (-2 / +2 lines)
1	# Created by: Mahdi Mokhtari <mokhi64@gmail.com>	1	# Created by: Mahdi Mokhtari <mokhi64@gmail.com>
2		2
3	PORTNAME?= mysql	3	PORTNAME?= mysql
4	PORTVERSION= 5.7.33	4	PORTVERSION= 5.7.34
5	PORTREVISION?= 0	5	PORTREVISION?= 0
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= MYSQL/MySQL-5.7	7	MASTER_SITES= MYSQL/MySQL-5.7
Lines 60-66 Link Here
60	-DWITH_PROTOBUF=system \	60	-DWITH_PROTOBUF=system \
61	-DWITH_CURL=system \	61	-DWITH_CURL=system \
62	-DINSTALL_MYSQLTESTDIR=0 \	62	-DINSTALL_MYSQLTESTDIR=0 \
63	-DWITH_DEBUG=0	63	-DWITH_DEBUG=1
64		64
65	SHEBANG_FILES= scripts/.pl scripts/*.sh	65	SHEBANG_FILES= scripts/.pl scripts/*.sh
66		66

Lines 1-3 Link Here

(-)mysql57-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1612332815	1	TIMESTAMP = 1621509617
2	SHA256 (mysql-boost-5.7.33.tar.gz) = cfcaf6f37a055d808fe1472eb0359864e2227aa0206c55c4e1961bab2ecc304b	2	SHA256 (mysql-boost-5.7.34.tar.gz) = 5bc2c7c0bb944b5bb219480dde3c1caeb049e7351b5bba94c3b00ac207929c7b
3	SIZE (mysql-boost-5.7.33.tar.gz) = 52912380	3	SIZE (mysql-boost-5.7.34.tar.gz) = 52891142




--- sql/locks/shared_spin_lock.cc.orig	2021-05-20 11:22:55 UTC
+++ sql/locks/shared_spin_lock.cc
@@ -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);
 }
 

Return to bug 255748

Lines 1-11 Link Here

(-)mysql57-server/files/patch-sql_locks_shared__spin__lock.cc (-6 / +6 lines)
1	--- sql/locks/shared_spin_lock.cc.orig 2020-12-10 03:01:55 UTC	1	--- sql/locks/shared_spin_lock.cc.orig 2021-05-20 11:22:55 UTC
2	+++ sql/locks/shared_spin_lock.cc	2	+++ sql/locks/shared_spin_lock.cc
3	@@ -239,7 +239,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or	3	@@ -242,7 +242,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or
4	{	4	#if defined(__APPLE__)
5	this->spin_exclusive_lock();	5	my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
6	}	6	#else
7	- my_atomic_store64(&this->m_exclusive_owner, self);	7	- my_atomic_store64(&this->m_exclusive_owner, self);
8	+ my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));	8	+ my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
		9	#endif
9	return (*this);	10	return (*this);
10	}	11	}
11