@@ -96,15 +96,15 @@ start_minio() {
9696 -v ~ /minio/data:/data \
9797 -e " MINIO_ROOT_USER=admin" \
9898 -e " MINIO_ROOT_PASSWORD=password" \
99- quay.io/ minio/minio server /data --console-address " :9001"
99+ minio/minio:latest server /data --console-address " :9001"
100100 fi
101101 fi
102102
103103 # Poll the health endpoint
104104 echo -n " Waiting for MinIO to become ready"
105105 for i in {1..20}; do
106106 if curl -s -o /dev/null -w " %{http_code}" http://localhost:9000/minio/health/ready | grep -q 200; then
107- echo -n " \n MinIO is ready!"
107+ echo -e " \n MinIO is ready!\n "
108108 return
109109 fi
110110 echo -n " ."
@@ -231,8 +231,33 @@ start_server() {
231231}
232232
233233sysbench_create_load () {
234+ # Get MySQL version
235+ MYSQL_VERSION_OUTPUT=$( $PS_DIR /bin/mysqld --version 2> /dev/null)
236+
237+ if [ $? -ne 0 ]; then
238+ echo " Error: Could not get MySQL version"
239+ exit 1
240+ fi
241+
242+ # Extract full version number
243+ MYSQL_VERSION=$( echo " $MYSQL_VERSION_OUTPUT " | grep -oE ' [0-9]+\.[0-9]+\.[0-9]+' | head -1)
244+
245+ if [ -z " $MYSQL_VERSION " ]; then
246+ echo " Error: Could not parse MySQL version"
247+ exit 1
248+ fi
249+
250+ echo " Detected MySQL version: $MYSQL_VERSION "
251+
252+ # Convert version to numeric for easy comparison (e.g., 8.0.35 becomes 80035, 5.7.44 becomes 50744)
253+ VERSION_NUMERIC=$( echo " $MYSQL_VERSION " | awk -F. ' {printf "%d%02d%02d", $1, $2, $3}' )
254+ TARGET_VERSION=80000 # 8.0.0
234255 # Create user
235- $PS_DIR /bin/mysql -A -uroot -S $SOCKET -e " CREATE USER sysbench@'%' IDENTIFIED WITH mysql_native_password BY 'test';"
256+ if [ " $VERSION_NUMERIC " -ge " $TARGET_VERSION " ]; then
257+ $PS_DIR /bin/mysql -A -uroot -S $SOCKET -e " CREATE USER sysbench@'%' IDENTIFIED BY 'test';"
258+ else
259+ $PS_DIR /bin/mysql -A -uroot -S $SOCKET -e " CREATE USER sysbench@'%' IDENTIFIED WITH mysql_native_password BY 'test';"
260+ fi
236261 $PS_DIR /bin/mysql -A -uroot -S $SOCKET -e " GRANT ALL ON *.* TO sysbench@'%';"
237262 $PS_DIR /bin/mysql -A -uroot -S $SOCKET -e " DROP DATABASE IF EXISTS sbtest;CREATE DATABASE sbtest;"
238263
0 commit comments