Merge branch 'master' into DBA-1275_newjdk

zendesk · Dec 21, 2024 · fdb56a9 · fdb56a9
2 parents a91792b + d0fde39
commit fdb56a9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Maxwell changelog
 
+### [v1.42.1](https://github.com/zendesk/maxwell/releases/tag/v1.42.1)
+
+- bugfix for 1.42.0, mysql 8.0.x and "SHOW BINARY LOG STATUS"
+
+
+
+_Released 2024-12-21_
+
 ### [v1.42.0](https://github.com/zendesk/maxwell/releases/tag/v1.42.0)
 
 - initial support for mysql 8.4

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
 FROM maven:3.9.9-eclipse-temurin-23 AS builder
 ENV MAXWELL_VERSION=1.42.0 KAFKA_VERSION=1.0.0
 
+
 RUN apt-get update \
     && apt-get -y upgrade \
     && apt-get install -y make

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ that reads MySQL binlogs and writes data changes as JSON to Kafka, Kinesis, and
 
 
 
-[↓ Download](https://github.com/zendesk/maxwell/releases/download/v1.42.0/maxwell-1.42.0.tar.gz) \|
+[↓ Download](https://github.com/zendesk/maxwell/releases/download/v1.42.1/maxwell-1.42.1.tar.gz) \|
 [⚝ Source / Community](https://github.com/zendesk/maxwell) \|
 [☝ Getting Started](/quickstart) \|
 [☷ Reference](/config)

diff --git a/docs/docs/quickstart.md b/docs/docs/quickstart.md
@@ -1,13 +1,13 @@
 # Download
 ***
-- Download binary distro: [https://github.com/zendesk/maxwell/releases/download/v1.42.0/maxwell-1.42.0.tar.gz](https://github.com/zendesk/maxwell/releases/download/v1.42.0/maxwell-1.42.0.tar.gz)
+- Download binary distro: [https://github.com/zendesk/maxwell/releases/download/v1.42.1/maxwell-1.42.1.tar.gz](https://github.com/zendesk/maxwell/releases/download/v1.42.1/maxwell-1.42.1.tar.gz)
 - Sources and bug tracking is available on github: [https://github.com/zendesk/maxwell](https://github.com/zendesk/maxwell)
 
 **curl**:
 ```
-curl -sLo - https://github.com/zendesk/maxwell/releases/download/v1.42.0/maxwell-1.42.0.tar.gz \
+curl -sLo - https://github.com/zendesk/maxwell/releases/download/v1.42.1/maxwell-1.42.1.tar.gz \
        | tar zxvf -
-cd maxwell-1.42.0
+cd maxwell-1.42.1
 ```
 
 **docker**:

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.zendesk</groupId>
   <artifactId>maxwell</artifactId>
-  <version>1.42.0</version>
+  <version>1.42.1</version>
   <packaging>jar</packaging>
 
   <name>maxwell</name>

diff --git a/src/main/java/com/zendesk/maxwell/MaxwellMysqlStatus.java b/src/main/java/com/zendesk/maxwell/MaxwellMysqlStatus.java
@@ -37,10 +37,11 @@ public boolean isMaria() {
 	public String getShowBinlogSQL() {
 		try {
 			DatabaseMetaData md = connection.getMetaData();
-			if ( md.getDatabaseMajorVersion() >= 8 ) {
+			if ( md.getDatabaseMajorVersion() >= 8 && md.getDatabaseMinorVersion() >= 4 ) {
 				return "SHOW BINARY LOG STATUS";
 			}
 		} catch ( SQLException e ) {
+			return "SHOW MASTER STATUS";
 		}
 
 		return "SHOW MASTER STATUS";