Skip to content

Commit b823b17

Browse files
committed
update mysql8 version to support macos aarch64
1 parent 0b2715b commit b823b17

File tree

3 files changed

+35
-8
lines changed

3 files changed

+35
-8
lines changed

testing-mysql-server-8/repack-mysql-8.sh

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
set -eu
44

5-
VERSION=8.0.15
5+
VERSION=8.0.26
66
BASEURL="https://dev.mysql.com/get/Downloads/MySQL-8.0"
77

88
LINUX_BASE=mysql-$VERSION-linux-glibc2.12-x86_64
9-
OSX_BASE=mysql-$VERSION-macos10.14-x86_64
9+
OSX_BASE=mysql-$VERSION-macos11-x86_64
10+
OSX_AARCH64_BASE=mysql-$VERSION-macos11-arm64
1011

1112
TAR=tar
1213
command -v gtar >/dev/null && TAR=gtar
@@ -43,12 +44,17 @@ LINUX_DIST=dist/$LINUX_NAME
4344
OSX_NAME=$OSX_BASE.tar.gz
4445
OSX_DIST=dist/$OSX_NAME
4546

47+
OSX_AARCH64_NAME=$OSX_AARCH64_BASE.tar.gz
48+
OSX_AARCH64_DIST=dist/$OSX_AARCH64_NAME
49+
4650
test -e $LINUX_DIST || curl -L -o $LINUX_DIST "$BASEURL/$LINUX_NAME" --fail
4751
test -e $OSX_DIST || curl -L -o $OSX_DIST "$BASEURL/$OSX_NAME" --fail
52+
test -e $OSX_AARCH64_DIST || curl -L -o $OSX_AARCH64_DIST "$BASEURL/$OSX_AARCH64_DIST" --fail
4853

4954
PACKDIR=$(mktemp -d "${TMPDIR:-/tmp}/mysql.XXXXXXXXXX")
5055
$TAR -xf $LINUX_DIST -C $PACKDIR
5156
pushd $PACKDIR/$LINUX_BASE
57+
tree .
5258
$STRIP bin/mysqld
5359
$TAR -czf $OLDPWD/$RESOURCES/mysql-Linux-amd64.tar.gz \
5460
LICENSE \
@@ -58,17 +64,17 @@ $TAR -czf $OLDPWD/$RESOURCES/mysql-Linux-amd64.tar.gz \
5864
share/*.txt \
5965
share/charsets \
6066
share/english \
61-
lib/libcrypto.* \
62-
lib/libssl.* \
63-
bin/libcrypto.* \
64-
bin/libssl.* \
67+
lib/private/libcrypto.* \
68+
lib/private/libprotobuf-lite.* \
69+
lib/private/libssl.* \
6570
bin/mysqld
6671
popd
6772
rm -rf $PACKDIR
6873

6974
PACKDIR=$(mktemp -d "${TMPDIR:-/tmp}/mysql.XXXXXXXXXX")
7075
$TAR -xf $OSX_DIST -C $PACKDIR
7176
pushd $PACKDIR/$OSX_BASE
77+
tree .
7278
$TAR -czf $OLDPWD/$RESOURCES/mysql-Mac_OS_X-x86_64.tar.gz \
7379
LICENSE \
7480
README \
@@ -78,7 +84,28 @@ $TAR -czf $OLDPWD/$RESOURCES/mysql-Mac_OS_X-x86_64.tar.gz \
7884
share/charsets \
7985
share/english \
8086
lib/libcrypto.* \
87+
lib/libprotobuf-lite.* \
88+
lib/libssl.* \
89+
bin/mysqld
90+
popd
91+
rm -rf $PACKDIR
92+
93+
PACKDIR=$(mktemp -d "${TMPDIR:-/tmp}/mysql.XXXXXXXXXX")
94+
$TAR -xf $OSX_AARCH64_DIST -C $PACKDIR
95+
pushd $PACKDIR/$OSX_AARCH64_BASE
96+
tree .
97+
$TAR -czf $OLDPWD/$RESOURCES/mysql-Mac_OS_X-aarch64.tar.gz \
98+
LICENSE \
99+
README \
100+
docs/INFO* \
101+
share/*.sql \
102+
share/*.txt \
103+
share/charsets \
104+
share/english \
105+
lib/libcrypto.* \
106+
lib/libprotobuf-lite.* \
81107
lib/libssl.* \
108+
bin/libprotobuf-lite.* \
82109
bin/mysqld
83110
popd
84111
rm -rf $PACKDIR

testing-mysql-server-8/src/main/java/com/facebook/presto/testing/mysql/EmbeddedMySql8.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public List<String> getInitializationArguments()
4141
public List<String> getStartArguments()
4242
{
4343
return ImmutableList.of(
44-
"--no-defaults",
44+
"--user=root",
4545
"--skip-ssl",
4646
"--skip-mysqlx",
4747
"--default-time-zone=+00:00",

testing-mysql-server-8/src/test/java/com/facebook/presto/testing/mysql/TestTestingMySqlServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class TestTestingMySqlServer
2121
@Override
2222
public String getMySqlVersion()
2323
{
24-
return "8.0.15";
24+
return "8.0.26";
2525
}
2626

2727
@Override

0 commit comments

Comments
 (0)