Merge branch '3.3' into 3.4

Author: rusher

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
         name: build matrix
         uses: mariadb-corporation/connector-ci-build-matrix@main
         with:
-          additional-matrix: '[{"name": "MariaDB 11.4 (local) - windows 2025", "os": "windows-2025", "db-type": "community", "db-tag": "11.4"}]'
+          additional-matrix: '[{"name": "MariaDB 11.4 (local) - windows 2025", "os": "windows-2025", "db-type": "community", "db-tag": "11.4"},{"name": "MariaDB 11.4 32bits (local) - windows 2025", "os": "windows-2025", "db-type": "community", "db-tag": "11.4", "arch": "32"}]'
 
   ci-server:
     name: server ${{ matrix.server.version }} test suite ${{ matrix.server.env && format(' {0}', matrix.server.env) || '' }}
@@ -98,7 +98,7 @@ jobs:
           TEST_OPTION: ${{ matrix.server.env.TEST_OPTION }}
           MYSQL_TEST_HOST: 127.0.0.1
 
-      - name: Archive production artifacts
+      - name: Archive error logs
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4
         with:
@@ -147,12 +147,18 @@ jobs:
           cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_EXTERNAL_ZLIB=On
           make
 
-      - name: make windows
-        if: ${{ startsWith(matrix.os, 'windows') }}
+      - name: make windows 64bits
+        if: ${{ startsWith(matrix.os, 'windows') && (matrix.arch != '32' || !matrix.arch) }}
         run: |
           cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_CURL=ON
           cmake --build . --config RelWithDebInfo
 
+      - name: make windows 32bits
+        if: ${{ startsWith(matrix.os, 'windows') && startsWith(matrix.arch, '32') }}
+        run: |
+          cmake -A Win32 . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_CURL=ON
+          cmake --build . --config RelWithDebInfo
+
       - name: Run test suite
         shell: bash
         run: |