Merge branch 'master' into gavinfrazar/update-teleport

Author: GavinFrazar

.github/workflows/ci.yml

@@ -1,12 +1,17 @@
 name: runTestsAndLinters
 on: [push, pull_request]
 
+permissions:
+  contents: read
+  # Write is needed for golangci-lint annotations
+  checks: write
+
 jobs:
   test:
     strategy:
       matrix:
-        go: [ "1.22", "1.21" ]
-        os: [ ubuntu-22.04, ubuntu-20.04 ]
+        go: [ "1.24", "1.23" ]
+        os: [ ubuntu-latest, ubuntu-24.04, ubuntu-22.04 ]
     name: Tests Go ${{ matrix.go }} on ${{ matrix.os }} # This name is used in main branch protection rules
     runs-on: ${{ matrix.os }}
 
@@ -17,6 +22,11 @@ jobs:
           echo -n "mysqldump -V: " ; mysqldump -V
 
           echo -e '[mysqld]\nserver-id=1\nlog-bin=mysql\nbinlog-format=row\ngtid-mode=ON\nenforce_gtid_consistency=ON\n' | sudo tee /etc/mysql/conf.d/replication.cnf
+
+          # bind to :: for dual-stack listening
+          sudo sed -i 's/bind-address.*= 127.0.0.1/bind-address = ::/' /etc/mysql/mysql.conf.d/mysqld.cnf
+          sudo sed -i 's/mysqlx-bind-address.*= 127.0.0.1/mysqlx-bind-address = ::/' /etc/mysql/mysql.conf.d/mysqld.cnf
+
           sudo service mysql start
 
           # apply this for mysql5 & mysql8 compatibility
@@ -46,8 +56,9 @@ jobs:
     strategy:
       matrix:
         mysql_version:
-          - 8.0.37
-          - 8.4.0
+          - 8.0.42
+          - 8.4.5
+          - 9.3.0
     name: Tests with MySQL ${{ matrix.mysql_version }}
     runs-on: ubuntu-latest
     services:
@@ -73,7 +84,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: stable
       - name: Run tests
         run: |
           # separate test to avoid RESET MASTER conflict
@@ -86,17 +97,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: stable
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           version: latest
           args: --timeout=3m
 
   platforms:
     strategy:
       matrix:
-        arch: [ "amd64", "arm64" ]
+        arch: [ "amd64", "arm64", "arm" ]
         os: [ "linux", "freebsd", "darwin" ]
+        exclude:
+          - arch: "arm"
+            os: "darwin"
     name: platforms
     runs-on: ubuntu-latest
     steps:
@@ -108,6 +125,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: stable
+
       - name: Build on ${{ matrix.os }}/${{ matrix.arch }}
         run: GOARCH=${{ matrix.arch }} GOOS=${{ matrix.os }} go build ./...

.golangci.yml

@@ -1,32 +1,47 @@
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
-    # All code is ready for:
     - errcheck
-    - staticcheck
-    - typecheck
-    - unused
+    - govet
+    - ineffassign
     - misspell
-    - nolintlint
-    - goimports
     - nakedret
+    - nolintlint
+    - staticcheck
     - unconvert
+    - unused
     - whitespace
-    - govet
-    - gosimple
-    - ineffassign
-    # ToDo:
-    #- gocritic
-    #- golint
-linters-settings:
-  nolintlint:
-    allow-unused: false
-    allow-leading-space: false
-    require-specific: true
-
-  govet:
-    enable-all: true
-    disable:
-      - fieldalignment
-      - lostcancel
-      - shadow
+  settings:
+    govet:
+      disable:
+        - fieldalignment
+        - lostcancel
+        - shadow
+      enable-all: true
+    nolintlint:
+      require-specific: true
+      allow-unused: false
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - client/examples_test.go
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - client/examples_test.go
+      - third_party$
+      - builtin$
+      - examples$

CHANGELOG.md

@@ -1,4 +1,81 @@
-### Tag v1.9.0 (2024-09-12)
+### Tag v1.12.0 (2025-04-01)
+
+> **Note:**
+> This version changes the logging framework to [`log/slog`](https://go.dev/blog/slog). If you use a custom logger then check the [Logging section](https://github.com/go-mysql-org/go-mysql?tab=readme-ov-file#logging) of the README.
+
+* Server: Rework NewConn/defaultServer. [#1021](https://github.com/go-mysql-org/go-mysql/pull/1021) ([dveeden](https://github.com/dveeden))
+* Replication: add IsEmpty method to GTIDSet interface & implementations. [#1019](https://github.com/go-mysql-org/go-mysql/pull/1019) ([wesleywright](https://github.com/wesleywright))
+* Give `RowsEvent` a method to inspect the underlying event type.. [#1016](https://github.com/go-mysql-org/go-mysql/pull/1016) ([proton-lisandro-pin](https://github.com/proton-lisandro-pin))
+* Test: add test for TransactionPayloadEvent. [#1018](https://github.com/go-mysql-org/go-mysql/pull/1018) ([lance6716](https://github.com/lance6716))
+* CONTRIBUTING: Add note about testing locally. [#1014](https://github.com/go-mysql-org/go-mysql/pull/1014) ([dveeden](https://github.com/dveeden))
+* Replication: check hostname length. [#1013](https://github.com/go-mysql-org/go-mysql/pull/1013) ([dveeden](https://github.com/dveeden))
+* Initial contributor guide. [#1010](https://github.com/go-mysql-org/go-mysql/pull/1010) ([dveeden](https://github.com/dveeden))
+* Dump: Fix Unlick typo. [#1011](https://github.com/go-mysql-org/go-mysql/pull/1011) ([dveeden](https://github.com/dveeden))
+* Improve unit tests around `Hasresultset` and `WriteValue`. [#1006](https://github.com/go-mysql-org/go-mysql/pull/1006) ([stgarrity](https://github.com/stgarrity))
+* Replace github.com/siddontang/go-log with log/slog. [#993](https://github.com/go-mysql-org/go-mysql/pull/993) ([serprex](https://github.com/serprex))
+* Support MySQL vector type. [#1004](https://github.com/go-mysql-org/go-mysql/pull/1004) ([serprex](https://github.com/serprex))
+* Test: remove time-based checking. [#1002](https://github.com/go-mysql-org/go-mysql/pull/1002) ([lance6716](https://github.com/lance6716))
+* Replication: Add mysql::serialization based Gtid Log Event. [#990](https://github.com/go-mysql-org/go-mysql/pull/990) ([dveeden](https://github.com/dveeden))
+* Replication: Set `source_binlog_checksum` as well. [#1003](https://github.com/go-mysql-org/go-mysql/pull/1003) ([dveeden](https://github.com/dveeden))
+* Add support for MariaDB ED25519 plugin. [#998](https://github.com/go-mysql-org/go-mysql/pull/998) ([heavycrystal](https://github.com/heavycrystal))
+* Driver: context support. [#997](https://github.com/go-mysql-org/go-mysql/pull/997) ([serprex](https://github.com/serprex))
+* Use math/bits OnesCount to preallocate slices. [#995](https://github.com/go-mysql-org/go-mysql/pull/995) ([serprex](https://github.com/serprex))
+* Fix bug: context timeout inside for loop, it will case memory leak. [#999](https://github.com/go-mysql-org/go-mysql/pull/999) ([maaars](https://github.com/maaars))
+* Lint: gofumpt. [#996](https://github.com/go-mysql-org/go-mysql/pull/996) ([serprex](https://github.com/serprex))
+* Avoid utils.Now failing sometime around the year 2262. [#994](https://github.com/go-mysql-org/go-mysql/pull/994) ([serprex](https://github.com/serprex))
+* Client: Make example testable. [#987](https://github.com/go-mysql-org/go-mysql/pull/987) ([dveeden](https://github.com/dveeden))
+* CI: Update nolintlint config. [#991](https://github.com/go-mysql-org/go-mysql/pull/991) ([dveeden](https://github.com/dveeden))
+* CI: Remove Ubuntu 20.04. [#989](https://github.com/go-mysql-org/go-mysql/pull/989) ([dveeden](https://github.com/dveeden))
+* Server: Correctly handle `COM_STMT_EXECUTE` without rebind. [#984](https://github.com/go-mysql-org/go-mysql/pull/984) ([dveeden](https://github.com/dveeden))
+* README: add Platform Support section. [#981](https://github.com/go-mysql-org/go-mysql/pull/981) ([lance6716](https://github.com/lance6716))
+* Change how we import the mysql package. [#982](https://github.com/go-mysql-org/go-mysql/pull/982) ([dveeden](https://github.com/dveeden))
+* Server: Correct the check for Resultset. [#983](https://github.com/go-mysql-org/go-mysql/pull/983) ([dveeden](https://github.com/dveeden))
+* Client,mysql: Add support for Query Attributes. [#976](https://github.com/go-mysql-org/go-mysql/pull/976) ([dveeden](https://github.com/dveeden))
+* Use 4-byte UTF-8 by default. [#979](https://github.com/go-mysql-org/go-mysql/pull/979) ([dveeden](https://github.com/dveeden))
+* Client: Set `_client_version` connection attribute. [#978](https://github.com/go-mysql-org/go-mysql/pull/978) ([dveeden](https://github.com/dveeden))
+* Cleanup init functions. [#977](https://github.com/go-mysql-org/go-mysql/pull/977) ([serprex](https://github.com/serprex))
+* Server: set `CLIENT_CONNECT_ATTRS`. [#975](https://github.com/go-mysql-org/go-mysql/pull/975) ([dveeden](https://github.com/dveeden))
+* Mysql,client,driver: Add more docs/comments and update constants. [#974](https://github.com/go-mysql-org/go-mysql/pull/974) ([dveeden](https://github.com/dveeden))
+
+## Tag v1.11.0 (2025-01-23)
+* Mysql: Fix GetInt() with negative NEWDECIMAL result. [#972](https://github.com/go-mysql-org/go-mysql/pull/972) ([dveeden](https://github.com/dveeden))
+* Client: Update docs. [#970](https://github.com/go-mysql-org/go-mysql/pull/970) ([dveeden](https://github.com/dveeden))
+* Cleanup: remove clear_vendor.sh. [#971](https://github.com/go-mysql-org/go-mysql/pull/971) ([dveeden](https://github.com/dveeden))
+* `*`: don't use zero value of mysql.Result. [#969](https://github.com/go-mysql-org/go-mysql/pull/969) ([lance6716](https://github.com/lance6716))
+* Mysql: Fix ColumnNumber() panic with nil Resultset. [#968](https://github.com/go-mysql-org/go-mysql/pull/968) ([dveeden](https://github.com/dveeden))
+* Replication: Improve COM_REGISTER_SLAVE. [#967](https://github.com/go-mysql-org/go-mysql/pull/967) ([dveeden](https://github.com/dveeden))
+* Use syscall.Gettimeofday to get current time. [#961](https://github.com/go-mysql-org/go-mysql/pull/961) ([hjweddie](https://github.com/hjweddie))
+* Remove duplicate SIGINT in signal handling. [#962](https://github.com/go-mysql-org/go-mysql/pull/962) ([soya111](https://github.com/soya111))
+* Feat: Added `time.Time` support for datetime format. [#957](https://github.com/go-mysql-org/go-mysql/pull/957) ([inoth](https://github.com/inoth))
+* Mysql field: expose API to modify field value. [#960](https://github.com/go-mysql-org/go-mysql/pull/960) ([walkline](https://github.com/walkline))
+* Replication: Support GTID tag in PreviousGTIDsEvent. [#952](https://github.com/go-mysql-org/go-mysql/pull/952) ([dveeden](https://github.com/dveeden))
+* Zeroalloc: don't use unsafe.Pointer. [#959](https://github.com/go-mysql-org/go-mysql/pull/959) ([serprex](https://github.com/serprex))
+* Driver: allow configuration of the driver name. [#958](https://github.com/go-mysql-org/go-mysql/pull/958) ([dveeden](https://github.com/dveeden))
+* Update README. [#950](https://github.com/go-mysql-org/go-mysql/pull/950) ([dveeden](https://github.com/dveeden))
+* README: fix example for database/sql. [#955](https://github.com/go-mysql-org/go-mysql/pull/955) ([dveeden](https://github.com/dveeden))
+* CI: Update Go, MySQL and Ubuntu versions. [#954](https://github.com/go-mysql-org/go-mysql/pull/954) ([dveeden](https://github.com/dveeden))
+* Canal,dump: Improve logging. [#953](https://github.com/go-mysql-org/go-mysql/pull/953) ([dveeden](https://github.com/dveeden))
+
+## Tag v1.10.0 (2024-11-20)
+* replication,cmd: improve flavor handling [#946](https://github.com/go-mysql-org/go-mysql/pull/946) ([dveeden](https://github.com/dveeden))
+* Upgrade github.com/pingcap/tidb/pkg/parser. [#948](https://github.com/go-mysql-org/go-mysql/pull/948) ([Tang8330](https://github.com/Tang8330))
+* replication: Add GTID_TAGGED_LOG_EVENT [#947](https://github.com/go-mysql-org/go-mysql/pull/947) ([dveeden](https://github.com/dveeden))
+* canal: support ipv6 address [#943](https://github.com/go-mysql-org/go-mysql/pull/943) ([sinomoe](https://github.com/sinomoe))
+* Remove failover [#931](https://github.com/go-mysql-org/go-mysql/pull/931) ([dveeden](https://github.com/dveeden))
+* dump: use mariadb-dump when available [#942](https://github.com/go-mysql-org/go-mysql/pull/942) ([dveeden](https://github.com/dveeden))
+* go-mysqlbinlog: set to retry only 10 times [#945](https://github.com/go-mysql-org/go-mysql/pull/945) ([dveeden](https://github.com/dveeden))
+* go-mysqldump: Add option to skip binlog position [#941](https://github.com/go-mysql-org/go-mysql/pull/941) ([dveeden](https://github.com/dveeden))
+* server: Improve example [#936](https://github.com/go-mysql-org/go-mysql/pull/936) ([dveeden](https://github.com/dveeden))
+* dump: use --source-data based on version [#933](https://github.com/go-mysql-org/go-mysql/pull/933) ([dveeden](https://github.com/dveeden))
+* replication: Log info about server [#935](https://github.com/go-mysql-org/go-mysql/pull/935) ([dveeden](https://github.com/dveeden))
+* replication: fix uuid typo [#934](https://github.com/go-mysql-org/go-mysql/pull/934) ([dveeden](https://github.com/dveeden))
+* dump: Support newer mysqldump versions [#932](https://github.com/go-mysql-org/go-mysql/pull/932) ([dveeden](https://github.com/dveeden))
+* replication: Make ServerVersion a proper string [#930](https://github.com/go-mysql-org/go-mysql/pull/930) ([dveeden](https://github.com/dveeden))
+* Makefile: allow for gotip [#928](https://github.com/go-mysql-org/go-mysql/pull/928) ([dveeden](https://github.com/dveeden))
+* client: Fix timeout reset during TLS handshake [#925](https://github.com/go-mysql-org/go-mysql/pull/925) ([willdonnelly](https://github.com/willdonnelly))
+* Ensure ACKs are sent after backup [#921](https://github.com/go-mysql-org/go-mysql/pull/921) ([dt8269](https://github.com/dt8269))
+
+### Tag v1.9.1 (2024-09-12)
 * Fix can't connect to MySQL 8.0 with long password. [#914](https://github.com/go-mysql-org/go-mysql/pull/914) ([lance6716](https://github.com/lance6716))
 * Fix actual master and add -race in CI. [#907](https://github.com/go-mysql-org/go-mysql/pull/907) ([atercattus](https://github.com/atercattus))
 * export EventCacheCount on Canal Config. [#913](https://github.com/go-mysql-org/go-mysql/pull/913) ([tomwei7](https://github.com/tomwei7))

CONTRIBUTING.md

@@ -0,0 +1,52 @@
+# How to contribute
+
+## Your first contribution
+
+- Best to first create an issue and discuss the problem and possible solution.
+  - This isn't needed for small/obvious fixes.
+  - What is the context? e.g. what versions of go-mysql, MySQL, etc does this apply to?
+  - Do you have a simple test case? This can just be example code, it doesn't have to be a full test case.
+  - Why do you need this change?
+- Format your code with [gofumpt](https://github.com/mvdan/gofumpt) if possible. (`make fmt` does this for you)
+- Reference an issue in the PR if you have one.
+- Update the `README.md` if applicable.
+- Add tests where applicable.
+
+## Asking for help
+
+- Don't be afraid to ask for help in an issue or PR.
+
+## Testing
+
+Testing is done with GitHub actions.
+
+If you want to run test locally you can use the following flags:
+
+```
+  -db string
+  -host string
+  -pass string
+  -port string
+  -user string
+```
+
+Example:
+```
+$ cd client
+$ go test -args -db test2 -port 3307
+```
+
+Testing locally with Docker or Podman can be done like this:
+```
+podman run \
+--rm \
+--env MYSQL_ALLOW_EMPTY_PASSWORD=1 \
+--env MYSQL_ROOT_HOST='%' \
+-p3307:3306 \
+-it \
+container-registry.oracle.com/mysql/community-server:8.0 \
+--gtid-mode=ON \
+--enforce-gtid-consistency=ON
+```
+
+Substitude `podman` with `docker` if you're using docker. This uses `--rm` to remove the container when it stops. It also enabled GTID by passing options to `mysqld`.

Makefile

@@ -1,30 +1,32 @@
 all: build
 
 GO111MODULE=on
+MYSQL_VERSION ?= 8.0
+GO ?= go
 
 build:
-	go build -o bin/go-mysqlbinlog cmd/go-mysqlbinlog/main.go
-	go build -o bin/go-mysqldump cmd/go-mysqldump/main.go
-	go build -o bin/go-canal cmd/go-canal/main.go
-	go build -o bin/go-binlogparser cmd/go-binlogparser/main.go
+	${GO} build -o bin/go-mysqlbinlog cmd/go-mysqlbinlog/main.go
+	${GO} build -o bin/go-mysqldump cmd/go-mysqldump/main.go
+	${GO} build -o bin/go-canal cmd/go-canal/main.go
+	${GO} build -o bin/go-binlogparser cmd/go-binlogparser/main.go
+	${GO} build -o bin/go-mysqlserver cmd/go-mysqlserver/main.go
 
 test:
-	go test --race -timeout 2m ./...
+	${GO} test --race -timeout 2m ./...
 
-MYSQL_VERSION ?= 8.0
 test-local:
 	docker run --rm -d --network=host --name go-mysql-server \
 		-e MYSQL_ALLOW_EMPTY_PASSWORD=true \
 		-e MYSQL_DATABASE=test \
 		-v $${PWD}/docker/resources/replication.cnf:/etc/mysql/conf.d/replication.cnf \
 		mysql:$(MYSQL_VERSION)
 	docker/resources/waitfor.sh 127.0.0.1 3306 \
-		&& go test -race -v -timeout 2m ./...
+		&& ${GO} test -race -v -timeout 2m ./...
 	docker stop go-mysql-server
 
 fmt:
 	golangci-lint run --fix
 
 clean:
-	go clean -i ./...
+	${GO} clean -i ./...
 	@rm -rf ./bin