@@ -104,6 +104,7 @@ jobs:
104104 - mysql-8.0.22
105105 - mysql-8.0.33
106106 - mysql-8.0.34
107+ - mysql-8.0.35
107108 - mariadb-5.5.40
108109 - mariadb-5.5.44
109110 - mariadb-5.5.47
@@ -255,6 +256,12 @@ jobs:
255256 client-version: mariadbconc-3.0.2
256257 - server-version: mysql-4.1.22
257258 client-version: mariadbconc-3.0.6
259+ # MySQL client versions 8.0.4 - 8.0.34 and 8.1.0 have bug which
260+ # prevents connection to MySQL server versions prior 5.5.7
261+ - server-version: mysql-4.1.22
262+ client-version: mysql-8.0.35
263+ - server-version: mysql-5.1.72
264+ client-version: mysql-8.0.3-rc
258265 - server-version: none
259266 client-version: system
260267 - perl-version: 5.12.0
@@ -330,8 +337,9 @@ jobs:
330337 *) DB=unknown ;;
331338 esac
332339 case "${{ matrix.client-version }}" in
333- mysql*) CLIENT_DB=MySQL ;;
334- mariadb*) CLIENT_DB=MariaDB ;;
340+ mysql-*) CLIENT_DB=MySQL-Server ;;
341+ mysqlconc-*) CLIENT_DB=MySQL-ConC ;;
342+ mariadbconc-*) CLIENT_DB=MariaDB-ConC ;;
335343 system) CLIENT_DB=""; ;;
336344 system-pic) CLIENT_DB=""; ;;
337345 same-as-server) CLIENT_DB=""; ;;
@@ -381,7 +389,7 @@ jobs:
381389 SANDBOX_OPTIONS="$SANDBOX_OPTIONS --init_options=--innodb_use_native_aio=0 --my_clause=innodb_use_native_aio=0 --my_clause=performance_schema=ON"
382390 fi
383391 fi
384- if [ "$CLIENT_DB" = "MySQL" ]; then
392+ if [ "$CLIENT_DB" = "MySQL-ConC " ]; then
385393 case "$CLIENT_VERSION" in
386394 *-labs) CLIENT_URL=https://downloads.mysql.com/snapshots/pb/mysql-connector-c-$CLIENT_VERSION/mysql-connector-c-$CLIENT_VERSION-linux-glibc2.5-x86_64.tar.gz ;;
387395 6.0.*) CLIENT_URL=https://dev.mysql.com/get/mysql-connector-c-$CLIENT_VERSION-linux-glibc2.3-x86-64bit.tar.gz ;;
@@ -390,14 +398,23 @@ jobs:
390398 *) echo "Unsupported MySQL Connector/C version '$CLIENT_VERSION'"; exit 1 ;;
391399 esac
392400 CLIENT_FILE="$HOME/cache/$(basename "$CLIENT_URL")"
393- elif [ "$CLIENT_DB" = "MariaDB" ]; then
401+ elif [ "$CLIENT_DB" = "MariaDB-ConC " ]; then
394402 case "$CLIENT_VERSION" in
395403 3.0.*) CLIENT_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CLIENT_VERSION/-*/}/mariadb-connector-c-$CLIENT_VERSION-linux-x86_64.tar.gz ;;
396404 3.1.[01234567]) CLIENT_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CLIENT_VERSION/-*/}/mariadb-connector-c-$CLIENT_VERSION-linux-x86_64.tar.gz ;;
397405 3.*) CLIENT_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CLIENT_VERSION/-*/}/mariadb-connector-c-$CLIENT_VERSION-ubuntu-focal-amd64.tar.gz ;;
398406 *) CLIENT_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CLIENT_VERSION/-*/}/mariadb-connector-c-$CLIENT_VERSION-linux-x86_64.tar.gz ;;
399407 esac
400408 CLIENT_FILE="$HOME/cache/$(basename "$CLIENT_URL")"
409+ elif [ "$CLIENT_DB" = "MySQL-Server" ]; then
410+ case "$CLIENT_VERSION" in
411+ # FIXME: Only MySQL 8.x server versions are defined here for usage as client library for now
412+ 8.0.?-*|8.0.11) CLIENT_URL=https://dev.mysql.com/get/mysql-$CLIENT_VERSION-linux-glibc2.12-x86_64.tar.gz ;;
413+ 8.0.*) CLIENT_URL=https://dev.mysql.com/get/mysql-$CLIENT_VERSION-linux-glibc2.12-x86_64.tar.xz ;;
414+ 8.1.*) CLIENT_URL=https://dev.mysql.com/get/mysql-$CLIENT_VERSION-linux-glibc2.28-x86_64.tar.xz ;;
415+ *) echo "Unsupported MySQL version '$CLIENT_VERSION'"; exit 1 ;;
416+ esac
417+ CLIENT_FILE="$HOME/cache/$(basename "$CLIENT_URL")"
401418 elif [ -n "$CLIENT_DB" ]; then
402419 echo "Unsupported Connector/C '$CLIENT_DB'"; exit 1
403420 fi
@@ -462,6 +479,9 @@ jobs:
462479 export DBD_MARIADB_TESTHOST=127.0.0.1
463480 export DBD_MARIADB_TESTPORT=3310
464481 fi
482+ if [[ ${{ matrix.client-version }} =~ mysql-8 ]]; then
483+ export DBD_MARIADB_TESTAUTHPLUGIN=mysql_native_password
484+ fi
465485 if [ "${{ matrix.client-version }}" != "system" ] && [ "${{ matrix.client-version }}" != "system-pic" ] && [ "${{ matrix.client-version }}" != "same-as-server" ]; then
466486 if [ -x $HOME/client/bin/mysql_config ]; then
467487 export DBD_MARIADB_CONFIG="$HOME/client/bin/mysql_config"
0 commit comments