From 0839f2871a501f4a4fbb1307153531497be2d04b Mon Sep 17 00:00:00 2001
From: Ichinose Shogo <shogo82148@gmail.com>
Date: Wed, 18 Aug 2021 21:21:41 +0900
Subject: [PATCH 1/2] Go 1.17 and MariaDB 10.6 are released

---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fce4cf670..6bf3524d4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,8 +22,9 @@ jobs:
           import json
           go = [
               # Keep the most recent production release at the top
-              '1.16',
+              '1.17',
               # Older production releases
+              '1.16',
               '1.15',
               '1.14',
               '1.13',
@@ -32,6 +33,7 @@ jobs:
               '8.0',
               '5.7',
               '5.6',
+              'mariadb-10.6',
               'mariadb-10.5',
               'mariadb-10.4',
               'mariadb-10.3',

From 6afb014dbaef75cdc47ec825416742cfb895801e Mon Sep 17 00:00:00 2001
From: Ichinose Shogo <shogo82148@gmail.com>
Date: Wed, 18 Aug 2021 22:09:54 +0900
Subject: [PATCH 2/2] use `utf8mb4_unicode_ci` instead of `utf8_unicode_ci`

https://mariadb.com/kb/en/changes-improvements-in-mariadb-106/#character-sets

> The utf8 character set (and related collations) is now by default an alias for utf8mb3 rather than the other way around.
---
 driver_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/driver_test.go b/driver_test.go
index 7b4ab84f3..4850498d0 100644
--- a/driver_test.go
+++ b/driver_test.go
@@ -1479,7 +1479,7 @@ func TestCollation(t *testing.T) {
 		defaultCollation, // driver default
 		"latin1_general_ci",
 		"binary",
-		"utf8_unicode_ci",
+		"utf8mb4_unicode_ci",
 		"cp1257_bin",
 	}