[misc] add maxscale testing

Author: rusher

.github/workflows/ci.yml

@@ -20,13 +20,13 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       github.event_name != 'schedule' ||
-      github.ref == 'refs/heads/3.4' ||
-      github.ref == 'refs/heads/3.1' ||
-      github.ref == 'refs/heads/3.2'
+      startsWith(github.ref, 'refs/heads/3.4')  ||
+      startsWith(github.ref, 'refs/heads/3.2')  ||
+      startsWith(github.ref, 'refs/heads/3.1')
     outputs:
       matrix: ${{ steps.set-matrix.outputs.final-matrix }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - id: set-matrix
         name: build matrix
         uses: mariadb-corporation/connector-ci-build-matrix@main
@@ -114,7 +114,7 @@ jobs:
     env:
       MYSQL_TEST_HOST: mariadb.example.com
       MYSQL_TEST_PORT: 3306
-      MYSQL_TEST_USER: root
+      MYSQL_TEST_USER: testuser
       MYSQL_TEST_PASSWD: "heyPassw-!*20oRd"
       MYSQL_TEST_DB: testc
 
@@ -124,13 +124,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.continue-on-error || matrix.os == 'macos-latest' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup Test Environment
         id: setup-env
         uses: mariadb-corporation/connector-ci-setup@master
         with:
-          node-version: ${{ matrix.node }}
           db-type: ${{ matrix.db-type }}
           db-tag: ${{ matrix.db-tag }}
           test-db-password: ${{ env.MYSQL_TEST_PASSWD }}
@@ -140,6 +139,7 @@ jobs:
           registry-user: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_USER || (secrets.DOCKER_TOKEN != '' && secrets.DOCKER_LOGIN || '') }}
           registry-password: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_TOKEN || secrets.DOCKER_TOKEN }}
           os: ${{ matrix.os }}
+          maxscale-tag: ${{ matrix.maxscale-tag || ''}}
 
       - name: make ubuntu/macos
         if: ${{ !startsWith(matrix.os, 'windows') }}

unittest/libmariadb/my_test.h

@@ -85,10 +85,9 @@ if (force_tls)\
 
 MYSQL *mysql_default = NULL;  /* default connection */
 
-#define IS_MAXSCALE()\
-   ((mysql_default && strstr(mysql_get_server_info(mysql_default), "maxScale")) ||\
-    (getenv("srv")!=NULL && (strcmp(getenv("srv"), "maxscale") == 0 ||\
-     strcmp(getenv("srv"), "skysql-ha") == 0)))
+#define IS_MAXSCALE() \
+   ((mysql_default && strstr(mysql_get_server_info(mysql_default), "maxScale")) || \
+    (getenv("maxscale-tag") != NULL && strlen(getenv("maxscale-tag")) > 0))
 
 #define SKIP_MAXSCALE \
 if (IS_MAXSCALE()) \