Merge branch 'master' into cbini/398-add-support-latest-version-jsons…

…chema-library
airbytehq · Nov 15, 2024 · 46ae965 · 46ae965
2 parents 0ba8c82 + 712ea82
commit 46ae965
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/airbyte-integrations/connectors/source-mysql/metadata.yaml b/airbyte-integrations/connectors/source-mysql/metadata.yaml
@@ -9,7 +9,7 @@ data:
   connectorSubtype: database
   connectorType: source
   definitionId: 435bb9a5-7887-4809-aa58-28c27df0d7ad
-  dockerImageTag: 3.9.0-rc.11
+  dockerImageTag: 3.9.0-rc.12
   dockerRepository: airbyte/source-mysql
   documentationUrl: https://docs.airbyte.com/integrations/sources/mysql
   githubIssueLabel: source-mysql

diff --git a/...mysql/src/main/kotlin/io/airbyte/integrations/source/mysql/cdc/MySqlDebeziumOperations.kt b/...mysql/src/main/kotlin/io/airbyte/integrations/source/mysql/cdc/MySqlDebeziumOperations.kt
@@ -117,11 +117,14 @@ class MySqlDebeziumOperations(
      * Validate is not supposed to perform on synthetic state.
      */
     private fun validate(debeziumState: DebeziumState): CdcStateValidateResult {
+        val savedStateOffset: SavedOffset = parseSavedOffset(debeziumState)
         val (_: MySqlPosition, gtidSet: String?) = queryPositionAndGtids()
-        if (gtidSet.isNullOrEmpty()) {
+        if (gtidSet.isNullOrEmpty() && !savedStateOffset.gtidSet.isNullOrEmpty()) {
+            log.info {
+                "Connector used GTIDs previously, but MySQL server does not know of any GTIDs or they are not enabled"
+            }
             return abortCdcSync()
         }
-        val savedStateOffset: SavedOffset = parseSavedOffset(debeziumState)
 
         val savedGtidSet = MySqlGtidSet(savedStateOffset.gtidSet)
         val availableGtidSet = MySqlGtidSet(gtidSet)