From b635889202b6201aa2ec126e44b565a0fc8f6942 Mon Sep 17 00:00:00 2001
From: Pali <pali@cpan.org>
Date: Sun, 10 Sep 2023 12:00:21 +0200
Subject: [PATCH 1/4] Fix Makefile.PL help for MySQL 8 GRANT SQL commands

MySQL 8 does not support GRANT ... IDENTIFIED BY syntax.
---
 Makefile.PL | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile.PL b/Makefile.PL
index 6a7a9f63..f8652748 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -834,6 +834,11 @@ as well as others.
 
 mysql> grant all privileges on test.* to '$user'\@'localhost' identified by 's3kr1t';
 
+For MySQL 8 it is needed to use different syntax:
+
+mysql> create user '$user'\@'localhost' identified by 's3kr1t';
+mysql> grant all privileges on test.* to '$user'\@'localhost';
+
 You can also optionally set the user to run 'make test' with:
 
 perl Makefile.PL --testuser=username

From d6b213b0eb688aa002afc477456975e883a4b4ef Mon Sep 17 00:00:00 2001
From: Pali <pali@cpan.org>
Date: Sun, 10 Sep 2023 12:01:45 +0200
Subject: [PATCH 2/4] Regenerate list of contributors and merge email aliases

---
 .mailmap    | 3 +++
 Makefile.PL | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 902ab1c8..3282b8ba 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,3 +17,6 @@ Daniël van Eeden <daniel.vaneeden@booking.com> <git@myname.nl>
 Pali <pali@cpan.org> <pali@users.noreply.github.com>
 Bernt M. Johnsen <bernt.johnsen@oracle.com> <berntm@gmail.com>
 H.Merijn Brand - Tux <h.m.brand@xs4all.nl>
+Matthew Horsfall (alh) <WolfSage@gmail.com> <wolfsage@gmail.com>
+Jan Holčapek <holcapek@gmail.com> <jan.holcapek@gooddata.com>
+E. Choroba <choroba@matfyz.cz> <choroba@users.noreply.github.com>
diff --git a/Makefile.PL b/Makefile.PL
index f8652748..078152f4 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -522,16 +522,18 @@ my %o =
         'David Farrell <davidnmfarrell@gmail.com>',
         'David Steinbrunner <dsteinbrunner@pobox.com>',
         'Dominik Sauer <dominik.sauer@gooddata.com>',
+        'E. Choroba <choroba@matfyz.cz>',
         'Giovanni Bechis <giovanni@bigio.snb.it>',
         'Graham Ollis <plicease@cpan.org>',
         'H.Merijn Brand - Tux <h.m.brand@xs4all.nl>',
         'Hanno <hanno@gentoo.org>',
         'James McCoy <jamessan@jamessan.com>',
-        'Jan Holcapek <jan.holcapek@gooddata.com>',
+        'Jan Holčapek <holcapek@gmail.com>',
         'Jim Winstead <jimw@trainedmonkey.com>',
         'Juergen Weigert <jw@suse.com>',
         'Kenny Gryp <kenny.gryp@percona.com>',
         'Lu Shengliang <lushl9301@gmail.com>',
+        'Martin Cermak <martin.cermak2@gooddata.com>',
         'Masahiro Chiba <chiba@everqueue.com>',
         'Matthew Horsfall (alh) <WolfSage@gmail.com>',
         'Michiel Beijen <michiel.beijen@gmail.com>',
@@ -557,6 +559,7 @@ my %o =
         'Tim Mullin <tim@cpanel.net>',
         'Ville Skyttä <ville.skytta@iki.fi>',
         'Vladimir Marek <vlmarek@volny.cz>',
+        'Walt Mankowski <waltman@pobox.com>',
         'katyavoid <katyavoid@gmail.com>',
         'kmx <kmx@cpan.org>',
         'tokuhirom <tokuhirom@gmail.com>',

From fc575dcc8631971fb296ffa99b437eac458a529b Mon Sep 17 00:00:00 2001
From: Pali <pali@cpan.org>
Date: Sun, 10 Sep 2023 12:03:33 +0200
Subject: [PATCH 3/4] Update Changes for version 1.23

---
 Changes | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Changes b/Changes
index 33179f84..48135e51 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,27 @@
+1.23 2023-09-10
+ - Add a missing break
+   (https://github.com/perl5-dbi/DBD-MariaDB/issues/163)
+ - Signal error if mariadb_db_async_result() fails
+   (https://github.com/perl5-dbi/DBD-MariaDB/issues/162)
+ - Update links to project website, issues and years
+ - Fix compilation with some MariaDB client library 10.2 and 10.3 versions
+ - Fix mariadb_use_result attribute
+   (https://github.com/perl5-dbi/DBD-MariaDB/issues/173)
+ - Fix statements with multiple result sets in asynchronous mode
+ - Fix mariadb_sockfd attribute for Windows
+ - Croaks when changing AutoCommit attribute fails
+   (https://github.com/perl5-dbi/dbi/issues/104)
+ - Various documentation and tests fixes
+ - Fix support for MariaDB Connector/C prior to 3.1.3 version
+ - Fix usage of Win32::GetShortPathName() in Makefile.PL
+ - Build release tarball in TAR format (instead of PAX)
+ - Allow to query and change mariadb_multi_statements attribute
+ - Add connect option mariadb_auth_plugin for specifying auth plugin
+ - Fix support for MySQL 8.0+ client library
+   (https://github.com/perl5-dbi/DBD-MariaDB/issues/191)
+   (https://github.com/perl5-dbi/DBD-mysql/issues/329)
+ - Add Github Actions CI and Cirrus CI (FreeBSD) for automated testing
+
 1.22 2022-04-22
  - Disable usage of libmysqld.a from MySQL 8.x series
  - Install README.pod into DBD/MariaDB/ subdirectory

From fadab2061b2d0b814f137de021c727c5a1294c2e Mon Sep 17 00:00:00 2001
From: Pali <pali@cpan.org>
Date: Sun, 10 Sep 2023 12:04:09 +0200
Subject: [PATCH 4/4] Set version to 1.23

---
 lib/DBD/MariaDB.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/DBD/MariaDB.pm b/lib/DBD/MariaDB.pm
index 6737de9d..bd5c6488 100644
--- a/lib/DBD/MariaDB.pm
+++ b/lib/DBD/MariaDB.pm
@@ -10,7 +10,7 @@ use DBI;
 use DynaLoader();
 our @ISA = qw(DynaLoader);
 
-our $VERSION = '1.22';
+our $VERSION = '1.23';
 
 bootstrap DBD::MariaDB $VERSION;