Changed decode41 and reset ci-mariadb-integration

svats0001 · Jan 11, 2025 · 72aa2a0 · 72aa2a0
1 parent 9aaa2b7
commit 72aa2a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/ci-mariadb-intergration-tests.yml b/.github/workflows/ci-mariadb-intergration-tests.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        mariadb-version: [ 11.5.2 ]
+        mariadb-version: [ 10.0, 10.1, 10.2.15, 10.2, 10.3.7, 10.3, 10.5.1, 10.5, 10.6, 10.11 ]
     name: Integration test with MariaDB ${{ matrix.mariadb-version }}
     steps:
       - uses: actions/checkout@v3

diff --git a/...-mysql/src/main/java/io/asyncer/r2dbc/mysql/message/server/DefinitionMetadataMessage.java b/...-mysql/src/main/java/io/asyncer/r2dbc/mysql/message/server/DefinitionMetadataMessage.java
@@ -183,8 +183,13 @@ private static DefinitionMetadataMessage decode41(ByteBuf buf, ConnectionContext
 
         String extendTypeInfo = null;
         if (context.getCapability().isMariaDb() &&  context.getCapability().isExtendedTypeInfo()) {
-            buf.readUnsignedByte();
-            extendTypeInfo = readVarIntSizedString(buf, charset);
+            buf.markReaderIndex();
+            short extendedTypeInfoDataType = buf.readUnsignedByte();
+            if (extendedTypeInfoDataType == 0 || extendedTypeInfoDataType == 1) {
+                extendTypeInfo = readVarIntSizedString(buf, charset);
+            } else {
+                buf.resetReaderIndex();
+            }
         }
 
         // Skip constant 0x0c encoded by var integer