Merge pull request #1018 from EamonZhang/main

Author: duanhongyi

stacks/mysql-shell/build.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Load stack utils
+. /usr/bin/stack-utils
+
+# Implement build function
+function build() {
+  generate-stack-path
+  VERSION=${STACK_VERSION}
+  OS_BIT=$(getconf LONG_BIT)
+  if [[ ${OS_ARCH} =~ "x86" ||  ${OS_ARCH} =~ "amd" ]]; then 
+    OS_ARCH="x86"
+  elif [[ ${OS_ARCH} =~ "arm" ]]; then
+    OS_ARCH="arm"
+  fi 
+
+  URL=https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${VERSION}-linux-glibc2.28-${OS_ARCH}-${OS_BIT}bit.tar.gz
+  # echo $URL
+  curl -fsSL -o tmp.tar.gz $URL
+  tar -xzf tmp.tar.gz
+  mv mysql-shell-${VERSION}-linux-glibc2.28-${OS_ARCH}-${OS_BIT}bit/* ${DATA_DIR}/
+  rm -rf  tmp.tar.gz 
+  rm -rf  mysql-shell-${VERSION}-linux-glibc2.28-${OS_ARCH}-${OS_BIT}bit/
+}
+
+# call build stack
+build-stack "${1}"

stacks/mysql/build.sh

@@ -76,8 +76,10 @@ function build() {
   strip  /opt/drycc/mysql/bin/perror
   strip  /opt/drycc/mysql/bin/zlib_decompress
 
-   # remove mysql test dir
-  rm -rf /opt/drycc/mysql/mysql-test 
+  # remove mysql test dir
+  rm -rf /opt/drycc/mysql/mysql-test
+  rm -rf /opt/drycc/mysql/mysql-8.0/mysql-test
+
   # copy mysql build files to data dir
   cp -r /opt/drycc/mysql/ ${DATA_DIR}/