Maria merge

.circleci/config.yml

@@ -0,0 +1,61 @@
+version: 2.1
+
+executors:
+  jdk11:
+    docker:
+
+jobs:
+  build:
+    docker:
+      - image: cimg/openjdk:11.0
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "pom.xml" }}
+      - run:
+          name: Cache m2 artifacts
+          command: mvn dependency:go-offline
+      - save_cache:
+          key: dependency-cache-{{ checksum "pom.xml" }}
+          paths: [ "~/.m2" ]
+  test:
+    docker:
+      - image: cimg/openjdk:11.0
+    parameters:
+      mysql:
+        type: string
+    environment:
+      MYSQL_VERSION: "<< parameters.mysql >>"
+      JAVA_TOOL_OPTIONS: "-Xmx250m -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "pom.xml" }}
+      - run:
+          name: "testing under version << parameters.mysql >>"
+          command: mvn verify -Dgpg.skip
+      - store_artifacts:
+          path: test.log
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build
+      - test:
+          name: "test-5.5"
+          mysql: "5.5"
+          requires: [ "build" ]
+      - test:
+          name: "test-5.7"
+          mysql: "5.7"
+          requires: [ "build" ]
+      - test:
+          name: "test-8.0"
+          mysql: "8.0"
+          requires: [ "build" ]
+      - test:
+          name: "test-mariadb"
+          mysql: "mariadb"
+          requires: [ "build" ]
+

.github/workflows/mysql-57.yml

@@ -0,0 +1,45 @@
+#
+# Copyright Gunnar Morling
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build and run tests against MySQL 5.7
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+    - name: Cache Maven packages
+      uses: actions/cache@v1
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+    - name: Build with Maven
+      run: mvn -B install --file pom.xml

.github/workflows/mysql-80.yml

@@ -0,0 +1,45 @@
+#
+# Copyright Gunnar Morling
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build and run tests against MySQL 8.0
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+    - name: Cache Maven packages
+      uses: actions/cache@v1
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+    - name: Build with Maven
+      run: MYSQL_VERSION=8.0 mvn -B install --file pom.xml

.gitignore

@@ -1,8 +1,10 @@
-.idea
+*.idea
 *.iml
 .DS_Store
 target
 .classpath
 .project
 .settings
 .vagrant
+.*.sw*
+target/

CHANGELOG.md

@@ -1,6 +1,108 @@
 # Changelog
-All notable changes to this project will be documented in this file.  
-This project adheres to [Semantic Versioning](http://semver.org/).
+## [0.27.5](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.27.5...0.27.4) - 2022-11-01
+
+- add mariadb BINLOG_CHECKPOINT event 
+
+## [0.27.4](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.27.4...0.27.3) - 2022-11-01
+
+- move mariadb_slave_capability back to 4
+
+## [0.27.3](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.27.3...0.27.2) - 2022-09-25
+
+- pass use-annotate-rows through non-gtid mariadb connections
+
+# Changelog
+## [0.27.2](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.27.2...0.27.1) - 2022-09-16
+
+- Fix the maria gtid detection regex to avoid erroneously detecting mysql gtids as maria
+
+## [0.27.1](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.27.0...0.27.1) - 2022-08-28
+
+- fix a bug around the capability that we send maria
+
+## [0.27.0](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.26.1...0.27.0) - 2022-08-27
+
+- Add "official" MariaDB support.  @wingerx started this worked and @ivapiv bugged me until it was
+  done, thanks all.  This includes:
+- MariaDB GTID support
+- support for the ANNOTATE_ROWS_EVENTS
+- MariaDB detection in getMariaDB()
+
+## [0.26.1](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.26.0...0.26.1) - 2022-07-18
+
+- fix deadlock with disconnect and keepalive thread.
+
+## [0.26.0](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.6...0.26.0) - 2022-07-15
+
+- Compressed binlogs, thank you Somesh Malviya
+- fix crash on unknown field type
+
+# Changelog
+
+## [0.25.6](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.5...0.25.6) - 2022-04-14
+
+- stop crashing in an inopportune place
+
+## [0.25.5](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.4...0.25.5) - 2022-01-28
+
+- mysql 8 also puts JSON keys in any damn place it likes
+
+## [0.25.4](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.3...0.25.4) - 2021-10-13
+
+- add debugging info to eof exception
+
+## [0.25.3](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.2...0.25.3) - 2021-07-29
+
+- support mysql 8's invisible columns
+
+## [0.25.2](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.1...0.25.2) - 2021-06-25
+
+- allow `setupConnection()` to be overridden
+- upgrade to TLS v1.2
+
+## [0.25.1](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.0...0.25.1) - 2021-04-20
+
+- performance improves in ByteArrayInputStream#read
+
+## [0.25.0](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.24.1...0.25.0) - 2021-03-04
+
+- bring back jdk 8 support, this caused... ahem.  Issues.
+
+## [0.24.1](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.24.0...0.24.1) - 2021-03-03
+
+- Fix for performance issues read JSON columns
+
+## [0.24.0](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.23.3...0.24.0) - 2021-02-04
+
+- Move up to JDK 11, drop support for JDK 8
+
+## [0.23.4](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.23.3...0.23.4) - 2021-01-17
+
+- correct authentication error that was causing a problem with Azure
+
+## [0.23.3](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.23.2...0.23.3) - 2020-10-29
+
+- add EventDeserializer.CompatibilityMode.INTEGER_AS_BYTE_ARRAY if you want raw integer data
+- don't crash on AWS Aurora's unknown event types
+
+## [0.23.2](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.23.1...0.23.2) - 2020-07-25
+
+- `connect` now throws `IllegalStateException` when already connected
+
+## [0.23.1](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.22.2...0.23.1) - 2020-05-25
+
+- this releases adds support for mysql 8's `caching_sha2_password` authentication method
+
+## [0.22.2](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.22.0...0.22.2) - 2020-04-29
+
+- Fix bugs in 0.22.0 involving nested JSON objects.
+
+## [0.22.0](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.20.1...0.22.0) - 2020-04-24
+
+- *THIS RELEASE IS BUGGY.  DO NOT USE.*
+- master server id is exposed in the library https://github.com/shyiko/mysql-binlog-connector-java/pull/319
+- Fixes for JSON data in mysql 8.0.16+ https://github.com/shyiko/mysql-binlog-connector-java/pull/288
+- more fixes for the bizarre azure platform https://github.com/shyiko/mysql-binlog-connector-java/pull/275
 
 ## [0.20.1](https://github.com/shyiko/mysql-binlog-connector-java/compare/0.20.0...0.20.1) - 2019-05-12
 
@@ -97,7 +199,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [0.10.1](https://github.com/shyiko/mysql-binlog-connector-java/compare/0.10.0...0.10.1) - 2017-02-28
 
 ### Fixed
-- HEARTBEAT tracking ([118](https://github.com/shyiko/mysql-binlog-connector-java/issues/118#issuecomment-283138143)). 
+- HEARTBEAT tracking ([118](https://github.com/shyiko/mysql-binlog-connector-java/issues/118#issuecomment-283138143)).
 
 ## [0.10.0](https://github.com/shyiko/mysql-binlog-connector-java/compare/0.9.2...0.10.0) - 2017-02-28
 
@@ -119,13 +221,13 @@ isn't reached within `BinaryLogClient::connectTimeout` from `BinaryLogClient::co
 
 ### Fixed
 
- - NPE in case of EOF (BinaryLogClient) ([153](https://github.com/shyiko/mysql-binlog-connector-java/pull/153)).  
+ - NPE in case of EOF (BinaryLogClient) ([153](https://github.com/shyiko/mysql-binlog-connector-java/pull/153)).
 
 ## [0.9.0](https://github.com/shyiko/mysql-binlog-connector-java/compare/0.8.1...0.9.0) - 2017-02-07
 
 ### Added
 
- - `BinaryLogClient::connectTimeout` (3 seconds by default).  
+ - `BinaryLogClient::connectTimeout` (3 seconds by default).
    NOTE: `BinaryLogClient::keepAliveConnectTimeout` has been deprecated and is going to be removed in 1.0.0.
 
 ## [0.8.1](https://github.com/shyiko/mysql-binlog-connector-java/compare/0.8.0...0.8.1) - 2016-01-10
@@ -144,14 +246,14 @@ isn't reached within `BinaryLogClient::connectTimeout` from `BinaryLogClient::co
 
 ### Fixed
 
- - `SSLMode.PREFERRED` handling (verification against the CA is no longer enforced) ([#142](https://github.com/shyiko/mysql-binlog-connector-java/pull/142)).  
+ - `SSLMode.PREFERRED` handling (verification against the CA is no longer enforced) ([#142](https://github.com/shyiko/mysql-binlog-connector-java/pull/142)).
  NOTE: This change does NOT affect `SSLMode.VERIFY_CA` / `SSLMode.VERIFY_IDENTITY`.
 
 ## [0.7.3](https://github.com/shyiko/mysql-binlog-connector-java/compare/0.7.2...0.7.3) - 2016-12-26
 
 ### Fixed
 
- - Handling of DATE/DATETIME/TIMESTAMP "zero" value (e.g. '0000-00-00') when 
+ - Handling of DATE/DATETIME/TIMESTAMP "zero" value (e.g. '0000-00-00') when
  `CompatibilityMode.DATE_AND_TIME_AS_LONG_MICRO` is set (false by default).
 
 ## [0.7.2](https://github.com/shyiko/mysql-binlog-connector-java/compare/0.7.1...0.7.2) - 2016-12-26
@@ -173,7 +275,7 @@ isn't reached within `BinaryLogClient::connectTimeout` from `BinaryLogClient::co
 
 ## [0.6.0](https://github.com/shyiko/mysql-binlog-connector-java/compare/0.5.2...0.6.0) - 2016-11-27
 
-### Added 
+### Added
  - `EventDeserializer` compatibility modes to mimic upcoming 1.0.0 event deserialization behavior ([#131](https://github.com/shyiko/mysql-binlog-connector-java/pull/131)).
 
 ## [0.5.2](https://github.com/shyiko/mysql-binlog-connector-java/compare/0.5.1...0.5.2) - 2016-11-19
@@ -202,9 +304,9 @@ isn't reached within `BinaryLogClient::connectTimeout` from `BinaryLogClient::co
 
 ### Fixed
  - GTID "rollover".
- - binlog position tracking (`binaryLogClient.binlogPosition` is no longer updated on TABLE_MAP so that in case of 
- reconnect (using a different instance of client) table mapping (used by *RowsEventDataDeserializer|s) could be 
- reconstructed before hitting *RowsEvent. 
+ - binlog position tracking (`binaryLogClient.binlogPosition` is no longer updated on TABLE_MAP so that in case of
+ reconnect (using a different instance of client) table mapping (used by *RowsEventDataDeserializer|s) could be
+ reconstructed before hitting *RowsEvent.
 
 ## [0.4.0](https://github.com/shyiko/mysql-binlog-connector-java/compare/0.3.3...0.4.0) - 2016-08-15
 
@@ -242,7 +344,7 @@ isn't reached within `BinaryLogClient::connectTimeout` from `BinaryLogClient::co
 
 ### Fixed
  - Possible infinite loop in case of EOF in the middle of `ByteArrayInputStream::fill`.
- 
+
 ## [0.2.3](https://github.com/shyiko/mysql-binlog-connector-java/compare/0.2.2...0.2.3) - 2015-08-31
 
 ### Fixed
@@ -269,8 +371,8 @@ isn't reached within `BinaryLogClient::connectTimeout` from `BinaryLogClient::co
 - Support for authentication via empty password ([#39](https://github.com/shyiko/mysql-binlog-connector-java/issues/39)).
 
 ### Changed
-- Server error reporting ([#37](https://github.com/shyiko/mysql-binlog-connector-java/issues/37)).  
-  WARNING: If you are using exception message to identify specific server errors - you'll need to switch to 
+- Server error reporting ([#37](https://github.com/shyiko/mysql-binlog-connector-java/issues/37)).
+  WARNING: If you are using exception message to identify specific server errors - you'll need to switch to
   `ServerException`::[errorCode](https://github.com/shyiko/mysql-binlog-connector-java/commit/1817d0ff709c65c31af9236dcc4e50cc3ad1023b#diff-0dff747d57cb3f5f0548be89a81e29f8R37) (as message no longer includes error code).
 
 ### Fixed