From f67ad12d24783ff04fee40f920aec2213b9b0c14 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 14 Dec 2023 16:05:34 +0900
Subject: [PATCH 01/32] chore(deps): update github/codeql-action action to v3
 (#680)

---
 .github/workflows/codeql.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index b496b5a9..075081b8 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         # with:
         #   languages: ${{ matrix.language }}
         #   queries: +security-and-quality
@@ -34,4 +34,4 @@ jobs:
           python setup.py build_ext -if
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

From a2212b33821f4a34f342a335fc7af0c16d18a8d6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 14:12:50 +0900
Subject: [PATCH 02/32] chore(deps): update actions/upload-artifact action to
 v4 (#681)

---
 .github/workflows/windows.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index afbfd4c8..01dfc283 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -75,7 +75,7 @@ jobs:
           python -m build -s -o dist
 
       - name: Upload Wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: win-wheels
           path: mysqlclient/dist/*.*

From e2a908bc28c5fb877ef4f7fefe9df85c94fba88f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jan 2024 21:57:52 +0900
Subject: [PATCH 03/32] update actions/cache action to v4 (#684)

---
 .github/workflows/windows.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index 01dfc283..ec79ca4c 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -15,7 +15,7 @@ jobs:
 
       - name: Cache Connector
         id: cache-connector
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: c:/mariadb-connector
           key: mariadb-connector-c-${{ env.CONNECTOR_VERSION }}-win

From 9e3b00fe1962b54f7082275ab79953d2745b9d9d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 1 Feb 2024 12:57:09 +0900
Subject: [PATCH 04/32] chore(deps): update codecov/codecov-action action to v4
 (#689)

---
 .github/workflows/tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index f6a13fd2..5545b885 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -59,7 +59,7 @@ jobs:
         run: |
           pytest --cov=MySQLdb tests
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
 
   django-test:
     name: "Run Django LTS test suite"

From 720b80497f0570333d67bc021692c1ec937b8d97 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sat, 3 Feb 2024 19:16:26 +0900
Subject: [PATCH 05/32] Support MySQL 8.3 (#690)

Fix #688
---
 src/MySQLdb/_mysql.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/MySQLdb/_mysql.c b/src/MySQLdb/_mysql.c
index 0612be26..6d09e416 100644
--- a/src/MySQLdb/_mysql.c
+++ b/src/MySQLdb/_mysql.c
@@ -524,8 +524,13 @@ _mysql_ConnectionObject_Initialize(
         mysql_options(&(self->connection), MYSQL_OPT_LOCAL_INFILE, (char *) &local_infile);
 
     if (ssl) {
-        mysql_ssl_set(&(self->connection), key, cert, ca, capath, cipher);
+        mysql_options(&(self->connection), MYSQL_OPT_SSL_KEY, key);
+        mysql_options(&(self->connection), MYSQL_OPT_SSL_CERT, cert);
+        mysql_options(&(self->connection), MYSQL_OPT_SSL_CA, ca);
+        mysql_options(&(self->connection), MYSQL_OPT_SSL_CAPATH, capath);
+        mysql_options(&(self->connection), MYSQL_OPT_SSL_CIPHER, cipher);
     }
+
     if (ssl_mode) {
 #ifdef HAVE_ENUM_MYSQL_OPT_SSL_MODE
         mysql_options(&(self->connection), MYSQL_OPT_SSL_MODE, &ssl_mode_num);
@@ -1789,10 +1794,11 @@ _mysql_ConnectionObject_kill(
 {
     unsigned long pid;
     int r;
+    char query[50];
     if (!PyArg_ParseTuple(args, "k:kill", &pid)) return NULL;
     check_connection(self);
     Py_BEGIN_ALLOW_THREADS
-    r = mysql_kill(&(self->connection), pid);
+    r = mysql_query(&(self->connection), snprintf(query, 50, "KILL %d", pid));
     Py_END_ALLOW_THREADS
     if (r) return _mysql_Exception(self);
     Py_RETURN_NONE;
@@ -2008,7 +2014,7 @@ _mysql_ConnectionObject_shutdown(
     int r;
     check_connection(self);
     Py_BEGIN_ALLOW_THREADS
-    r = mysql_shutdown(&(self->connection), SHUTDOWN_DEFAULT);
+    r = mysql_query(&(self->connection), "SHUTDOWN");
     Py_END_ALLOW_THREADS
     if (r) return _mysql_Exception(self);
     Py_RETURN_NONE;

From 2570ad48b8023ad79a5495c253abab494c30463e Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sun, 4 Feb 2024 12:31:52 +0900
Subject: [PATCH 06/32] use ruff for formatter (#691)

---
 .github/workflows/codeql.yml | 37 ------------------------------------
 .github/workflows/lint.yaml  |  5 +++--
 src/MySQLdb/connections.py   |  4 +++-
 3 files changed, 6 insertions(+), 40 deletions(-)
 delete mode 100644 .github/workflows/codeql.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
deleted file mode 100644
index 075081b8..00000000
--- a/.github/workflows/codeql.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-  schedule:
-    - cron: "29 15 * * 6"
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        # with:
-        #   languages: ${{ matrix.language }}
-        #   queries: +security-and-quality
-
-      # - name: Autobuild
-      #   uses: github/codeql-action/autobuild@v2
-
-      - name: Build
-        run: |
-          python setup.py build_ext -if
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 8e0e2947..95a95ac3 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -10,5 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: psf/black@stable
-      - uses: chartboost/ruff-action@v1
+      - run: pipx install ruff
+      - run: ruff check src/
+      - run: ruff format src/
diff --git a/src/MySQLdb/connections.py b/src/MySQLdb/connections.py
index 7456aeac..4fa762d4 100644
--- a/src/MySQLdb/connections.py
+++ b/src/MySQLdb/connections.py
@@ -193,7 +193,9 @@ class object, used to create cursors (keyword only)
         super().__init__(*args, **kwargs2)
         self.cursorclass = cursorclass
         self.encoders = {
-            k: v for k, v in conv.items() if type(k) is not int  # noqa: E721
+            k: v
+            for k, v in conv.items()
+            if type(k) is not int  # noqa: E721
         }
 
         self._server_version = tuple(

From 8b032d134e4a0fe05b1d0a08b6fd5c7275c18011 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sun, 4 Feb 2024 13:40:02 +0900
Subject: [PATCH 07/32] doc: add link to README (#692)

Fix #650
---
 doc/user_guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/user_guide.rst b/doc/user_guide.rst
index 5c9577bc..8b057e08 100644
--- a/doc/user_guide.rst
+++ b/doc/user_guide.rst
@@ -14,7 +14,7 @@ database server that provides the Python database API.
 Installation
 ------------
 
-The ``README`` file has complete installation instructions.
+The `README <https://github.com/PyMySQL/mysqlclient/blob/main/README.md>`_ file has complete installation instructions.
 
 
 MySQLdb._mysql

From ace8b256493f848ae57c5fa8a82504c5d7b24657 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sun, 4 Feb 2024 13:41:50 +0900
Subject: [PATCH 08/32] deprecate APIs deprecated in MySQL 8

---
 src/MySQLdb/_mysql.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MySQLdb/_mysql.c b/src/MySQLdb/_mysql.c
index 6d09e416..8ea32e08 100644
--- a/src/MySQLdb/_mysql.c
+++ b/src/MySQLdb/_mysql.c
@@ -1785,7 +1785,7 @@ _mysql_ConnectionObject_insert_id(
 
 static char _mysql_ConnectionObject_kill__doc__[] =
 "Asks the server to kill the thread specified by pid.\n\
-Non-standard.";
+Non-standard. Deprecated.";
 
 static PyObject *
 _mysql_ConnectionObject_kill(
@@ -2003,7 +2003,7 @@ _mysql_ConnectionObject_select_db(
 
 static char _mysql_ConnectionObject_shutdown__doc__[] =
 "Asks the database server to shut down. The connected user must\n\
-have shutdown privileges. Non-standard.\n\
+have shutdown privileges. Non-standard. Deprecated.\n\
 ";
 
 static PyObject *

From 7c199a90f8554727a66c035058f13211f6774836 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sun, 4 Feb 2024 14:22:58 +0900
Subject: [PATCH 09/32] release 2.2.2 (#693)

---
 HISTORY.rst            | 12 ++++++++++++
 src/MySQLdb/release.py |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 99ff66cd..87bb2790 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,3 +1,15 @@
+======================
+ What's new in 2.2.2
+======================
+
+Release: 2024-02-04
+
+* Support building with MySQL 8.3 (#688).
+* Deprecate ``db.shutdown()`` and ``db.kill()`` methods in docstring.
+  This is because ``mysql_shutdown()`` and ``mysql_kill()`` were removed in MySQL 8.3.
+  They will emit DeprecationWarning in the future but not for now.
+
+
 ======================
  What's new in 2.2.1
 ======================
diff --git a/src/MySQLdb/release.py b/src/MySQLdb/release.py
index c5281a5a..614020dc 100644
--- a/src/MySQLdb/release.py
+++ b/src/MySQLdb/release.py
@@ -1,3 +1,3 @@
 __author__ = "Inada Naoki <songofacandy@gmail.com>"
-__version__ = "2.2.1"
-version_info = (2, 2, 1, "final", 0)
+__version__ = "2.2.2"
+version_info = (2, 2, 2, "final", 0)

From b34f8ef174e55eb51e3f5e43aeb78cea36e9e34a Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sun, 4 Feb 2024 21:43:11 +0900
Subject: [PATCH 10/32] fix build issue introduced in 2.2.2 (#696)

---
 src/MySQLdb/_mysql.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/MySQLdb/_mysql.c b/src/MySQLdb/_mysql.c
index 8ea32e08..c334db66 100644
--- a/src/MySQLdb/_mysql.c
+++ b/src/MySQLdb/_mysql.c
@@ -1797,8 +1797,9 @@ _mysql_ConnectionObject_kill(
     char query[50];
     if (!PyArg_ParseTuple(args, "k:kill", &pid)) return NULL;
     check_connection(self);
+    snprintf(query, 50, "KILL %lu", pid);
     Py_BEGIN_ALLOW_THREADS
-    r = mysql_query(&(self->connection), snprintf(query, 50, "KILL %d", pid));
+    r = mysql_query(&(self->connection), query);
     Py_END_ALLOW_THREADS
     if (r) return _mysql_Exception(self);
     Py_RETURN_NONE;

From 1fa31fd17d20cb582fc58469a86b071cb84cee7f Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sun, 4 Feb 2024 21:49:02 +0900
Subject: [PATCH 11/32] release 2.2.3 (#697)

---
 HISTORY.rst            | 9 +++++++++
 src/MySQLdb/release.py | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 87bb2790..b57251c7 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,3 +1,12 @@
+======================
+ What's new in 2.2.3
+======================
+
+Release: 2024-02-04
+
+* Fix ``Connection.kill()`` method that broken in 2.2.2. (#689)
+
+
 ======================
  What's new in 2.2.2
 ======================
diff --git a/src/MySQLdb/release.py b/src/MySQLdb/release.py
index 614020dc..6bc1089f 100644
--- a/src/MySQLdb/release.py
+++ b/src/MySQLdb/release.py
@@ -1,3 +1,3 @@
 __author__ = "Inada Naoki <songofacandy@gmail.com>"
-__version__ = "2.2.2"
-version_info = (2, 2, 2, "final", 0)
+__version__ = "2.2.3"
+version_info = (2, 2, 3, "final", 0)

From a7e3887c8ac8d1b2a34b13f19da3cc164c4aa74c Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Fri, 9 Feb 2024 00:21:36 +0900
Subject: [PATCH 12/32] Support `ssl=True` (#700)

MySQL use ssl by default but MariaDB don't.

Until mysqlclient<=2.2.1, `ssl=True` unintentionally allowed and it
called `mysql_ssl_set(mysql, NULL, NULL, NULL, NULL, NULL)`. Although it
is no-op in MySQL Connector, MariaDB Connector silently set
MYSQL_OPT_SSL_ENFORCE when the API is called. (See #698)

In case of PyMySQL, ssl is not used by default but `ssl=True` behave
like `sslmode="PREFERRED"`.

For better backward compatibility and compatibility with PyMySQL and
security, I decided to allow ssl=True and it means sslmode="REQUIRED" on
MySQL Connector and
set MYSQL_OPT_SSL_ENFORCE on MariaDB Connector.

Fix #699
---
 src/MySQLdb/_mysql.c       | 36 ++++++++++++++++++++++++------------
 src/MySQLdb/connections.py |  2 ++
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/MySQLdb/_mysql.c b/src/MySQLdb/_mysql.c
index c334db66..b9ec1c12 100644
--- a/src/MySQLdb/_mysql.c
+++ b/src/MySQLdb/_mysql.c
@@ -391,10 +391,10 @@ enum {
 };
 
 static int
-_get_ssl_mode_num(char *ssl_mode)
+_get_ssl_mode_num(const char *ssl_mode)
 {
-    static char *ssl_mode_list[] = { "DISABLED", "PREFERRED",
-                  "REQUIRED", "VERIFY_CA", "VERIFY_IDENTITY" };
+    static const char *ssl_mode_list[] = {
+        "DISABLED", "PREFERRED", "REQUIRED", "VERIFY_CA", "VERIFY_IDENTITY" };
     unsigned int i;
     for (i=0; i < sizeof(ssl_mode_list)/sizeof(ssl_mode_list[0]); i++) {
         if (strcmp(ssl_mode, ssl_mode_list[i]) == 0) {
@@ -414,7 +414,7 @@ _mysql_ConnectionObject_Initialize(
     MYSQL *conn = NULL;
     PyObject *conv = NULL;
     PyObject *ssl = NULL;
-    char *ssl_mode = NULL;
+    const char *ssl_mode = NULL;
     const char *key = NULL, *cert = NULL, *ca = NULL,
          *capath = NULL, *cipher = NULL;
     PyObject *ssl_keepref[5] = {NULL};
@@ -437,7 +437,7 @@ _mysql_ConnectionObject_Initialize(
     int read_timeout = 0;
     int write_timeout = 0;
     int compress = -1, named_pipe = -1, local_infile = -1;
-    int ssl_mode_num = SSLMODE_DISABLED;
+    int ssl_mode_num = SSLMODE_PREFERRED;
     char *init_command=NULL,
          *read_default_file=NULL,
          *read_default_group=NULL,
@@ -470,19 +470,31 @@ _mysql_ConnectionObject_Initialize(
         if(t){d=PyUnicode_AsUTF8(t);ssl_keepref[n_ssl_keepref++]=t;}\
         PyErr_Clear();}
 
+    char ssl_mode_set = 0;
     if (ssl) {
-        PyObject *value = NULL;
-        _stringsuck(ca, value, ssl);
-        _stringsuck(capath, value, ssl);
-        _stringsuck(cert, value, ssl);
-        _stringsuck(key, value, ssl);
-        _stringsuck(cipher, value, ssl);
+        if (PyMapping_Check(ssl)) {
+            PyObject *value = NULL;
+            _stringsuck(ca, value, ssl);
+            _stringsuck(capath, value, ssl);
+            _stringsuck(cert, value, ssl);
+            _stringsuck(key, value, ssl);
+            _stringsuck(cipher, value, ssl);
+        } else if (PyObject_IsTrue(ssl)) {
+            // Support ssl=True from mysqlclient 2.2.4.
+            // for compatibility with PyMySQL and mysqlclient==2.2.1&libmariadb.
+            ssl_mode_num = SSLMODE_REQUIRED;
+            ssl_mode_set = 1;
+        } else {
+            ssl_mode_num = SSLMODE_DISABLED;
+            ssl_mode_set = 1;
+        }
     }
     if (ssl_mode) {
         if ((ssl_mode_num = _get_ssl_mode_num(ssl_mode)) <= 0) {
             PyErr_SetString(_mysql_NotSupportedError, "Unknown ssl_mode specification");
             return -1;
         }
+        ssl_mode_set = 1;
     }
 
     conn = mysql_init(&(self->connection));
@@ -531,7 +543,7 @@ _mysql_ConnectionObject_Initialize(
         mysql_options(&(self->connection), MYSQL_OPT_SSL_CIPHER, cipher);
     }
 
-    if (ssl_mode) {
+    if (ssl_mode_set) {
 #ifdef HAVE_ENUM_MYSQL_OPT_SSL_MODE
         mysql_options(&(self->connection), MYSQL_OPT_SSL_MODE, &ssl_mode_num);
 #else
diff --git a/src/MySQLdb/connections.py b/src/MySQLdb/connections.py
index 4fa762d4..c7132293 100644
--- a/src/MySQLdb/connections.py
+++ b/src/MySQLdb/connections.py
@@ -134,6 +134,8 @@ class object, used to create cursors (keyword only)
             see the MySQL documentation for more details
             (mysql_ssl_set()).  If this is set, and the client does not
             support SSL, NotSupportedError will be raised.
+            Since mysqlclient 2.2.4, ssl=True is alias of ssl_mode=REQUIRED
+            for better compatibility with PyMySQL and MariaDB.
 
         :param bool local_infile:
             enables LOAD LOCAL INFILE; zero disables

From 9fd238b9e3105dcbed2b009a916828a38d1f0904 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Fri, 9 Feb 2024 00:35:16 +0900
Subject: [PATCH 13/32] release 2.2.4 (#701)

---
 HISTORY.rst            | 11 +++++++++++
 src/MySQLdb/release.py |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index b57251c7..3dca31cc 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,3 +1,14 @@
+======================
+ What's new in 2.2.4
+======================
+
+Release: 2024-02-09
+
+* Support ``ssl=True`` in ``connect()``. (#700)
+  This makes better compatibility with PyMySQL and mysqlclient==2.2.1
+  with libmariadb. See #698 for detail.
+
+
 ======================
  What's new in 2.2.3
 ======================
diff --git a/src/MySQLdb/release.py b/src/MySQLdb/release.py
index 6bc1089f..35d53e20 100644
--- a/src/MySQLdb/release.py
+++ b/src/MySQLdb/release.py
@@ -1,3 +1,3 @@
 __author__ = "Inada Naoki <songofacandy@gmail.com>"
-__version__ = "2.2.3"
-version_info = (2, 2, 3, "final", 0)
+__version__ = "2.2.4"
+version_info = (2, 2, 4, "final", 0)

From 423e45e2c5854b65e55fb0c6d9046ada93e97920 Mon Sep 17 00:00:00 2001
From: nattofriends <nattofriends@users.noreply.github.com>
Date: Wed, 7 Aug 2024 10:16:14 -0700
Subject: [PATCH 14/32] Support building against Percona Server builds of MySQL
 client library `libperconaserverclient` (#718)

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f7f3d924..771b39b4 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@
 def find_package_name():
     """Get available pkg-config package name"""
     # Ubuntu uses mariadb.pc, but CentOS uses libmariadb.pc
-    packages = ["mysqlclient", "mariadb", "libmariadb"]
+    packages = ["mysqlclient", "mariadb", "libmariadb", "perconaserverclient"]
     for pkg in packages:
         try:
             cmd = f"pkg-config --exists {pkg}"

From a958c5fa45d3833e9fbf31ce0c4a461782929067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sil=C3=A9n?= <robert.silen@iki.fi>
Date: Wed, 21 Aug 2024 13:10:56 +0300
Subject: [PATCH 15/32] add MariaDB to README and doc (#720)

---
 README.md          | 7 ++++---
 doc/user_guide.rst | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 451ce799..e679b533 100644
--- a/README.md
+++ b/README.md
@@ -11,14 +11,15 @@ This project adds Python 3 support and fixed many bugs.
 
 **Do Not use Github Issue Tracker to ask help.  OSS Maintainer is not free tech support**
 
-When your question looks relating to Python rather than MySQL:
+When your question looks relating to Python rather than MySQL/MariaDB:
 
 * Python mailing list [python-list](https://mail.python.org/mailman/listinfo/python-list)
 * Slack [pythondev.slack.com](https://pyslackers.com/web/slack)
 
-Or when you have question about MySQL:
+Or when you have question about MySQL/MariaDB:
 
-* [MySQL Community on Slack](https://lefred.be/mysql-community-on-slack/)
+* [MySQL Support](https://dev.mysql.com/support/)
+* [Getting Help With MariaDB](https://mariadb.com/kb/en/getting-help-with-mariadb/)
 
 
 ## Install
diff --git a/doc/user_guide.rst b/doc/user_guide.rst
index 8b057e08..ab33615c 100644
--- a/doc/user_guide.rst
+++ b/doc/user_guide.rst
@@ -8,8 +8,8 @@ MySQLdb User's Guide
 Introduction
 ------------
 
-MySQLdb is an interface to the popular MySQL
-database server that provides the Python database API.
+MySQLdb is an interface to the popular MySQL or MariaDB
+database servers that provides the Python database API.
 
 Installation
 ------------

From 94cae1413d16ef437f38460ac5c96cf7e9b84725 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sun, 8 Sep 2024 17:11:36 +0900
Subject: [PATCH 16/32] Update license metadata (#722)

Use GPLv2 or later
---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0ad7ae58..25cdb5ff 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,12 +7,12 @@ requires-python = ">=3.8"
 authors = [
     {name = "Inada Naoki", email = "songofacandy@gmail.com"}
 ]
-license = {text = "GNU General Public License v2 (GPLv2)"}
+license = {text = "GNU General Public License v2 or later (GPLv2+)"}
 keywords = ["MySQL"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Other Environment",
-    "License :: OSI Approved :: GNU General Public License (GPL)",
+    "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
     "Operating System :: MacOS :: MacOS X",
     "Operating System :: Microsoft :: Windows :: Windows NT/2000",
     "Operating System :: OS Independent",

From 3599f77524a20ae78ffd2a62d19dff2b7c2616e0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 16:40:24 +0900
Subject: [PATCH 17/32] chore(deps): update dependency sphinx-rtd-theme to v3
 (#724)

---
 doc/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 01406623..d2f5c5a5 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,2 +1,2 @@
 sphinx~=7.2
-sphinx-rtd-theme~=2.0.0
+sphinx-rtd-theme~=3.0.0

From 4bcf3e634d7c23a4cca6b5be85db127307fd861a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2024 02:51:43 +0900
Subject: [PATCH 18/32] chore(deps): update dependency sphinx to v8 (#716)

---
 doc/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index d2f5c5a5..48319f03 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,2 +1,2 @@
-sphinx~=7.2
+sphinx~=8.0
 sphinx-rtd-theme~=3.0.0

From b5c6cdc9ee7bdb03ee25f0723879afa871847982 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sun, 20 Oct 2024 16:57:14 +0900
Subject: [PATCH 19/32] ci: update test (#727)

---
 .github/workflows/tests.yaml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 5545b885..8156fccc 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -13,9 +13,9 @@ jobs:
       PIP_DISABLE_PIP_VERSION_CHECK: 1
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
         include:
-          - python-version: "3.11"
+          - python-version: "3.12"
             mariadb: 1
     steps:
       - if: ${{ matrix.mariadb }}
@@ -68,7 +68,7 @@ jobs:
     env:
       PIP_NO_PYTHON_VERSION_WARNING: 1
       PIP_DISABLE_PIP_VERSION_CHECK: 1
-      DJANGO_VERSION: "3.2.19"
+      DJANGO_VERSION: "4.2.16"
     steps:
       - name: Start MySQL
         run: |
@@ -83,9 +83,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          # Django 3.2.9+ supports Python 3.10
-          # https://docs.djangoproject.com/ja/3.2/releases/3.2/
-          python-version: "3.10"
+          python-version: "3.12"
           cache: "pip"
           cache-dependency-path: "ci/django-requirements.txt"
 

From 95db801658e2821ba0f6bfc1a7479704095e8446 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sun, 20 Oct 2024 16:57:31 +0900
Subject: [PATCH 20/32] ci: update MariaDB Connector/C (#726)

---
 .github/workflows/windows.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index ec79ca4c..e8844932 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -10,9 +10,8 @@ jobs:
   build:
     runs-on: windows-latest
     env:
-      CONNECTOR_VERSION: "3.3.8"
+      CONNECTOR_VERSION: "3.4.1"
     steps:
-
       - name: Cache Connector
         id: cache-connector
         uses: actions/cache@v4
@@ -63,9 +62,9 @@ jobs:
       - name: Build wheels
         working-directory: mysqlclient
         env:
-          CIBW_PROJECT_REQUIRES_PYTHON: ">=3.8"
+          CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9"
           CIBW_ARCHS: "AMD64"
-          CIBW_TEST_COMMAND: "python -c \"import MySQLdb; print(MySQLdb.version_info)\" "
+          CIBW_TEST_COMMAND: 'python -c "import MySQLdb; print(MySQLdb.version_info)" '
         run: "python -m cibuildwheel --prerelease-pythons --output-dir dist"
 
       - name: Build sdist

From 6eb6c2f8796fdf16c5356beb4cb888da4e46be09 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sun, 20 Oct 2024 17:17:02 +0900
Subject: [PATCH 21/32] release 2.2.5 (#728)

---
 HISTORY.rst            | 10 +++++++++-
 pyproject.toml         |  1 +
 src/MySQLdb/release.py |  4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 3dca31cc..1c795bfe 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,3 +1,12 @@
+======================
+ What's new in 2.2.5
+======================
+
+Release: 2024-10-20
+
+* (Windows wheel) Update MariaDB Connector/C to 3.4.1. #726
+* (Windows wheel) Build wheels for Python 3.13. #726
+
 ======================
  What's new in 2.2.4
 ======================
@@ -633,4 +642,3 @@ ursor.fetchXXXDict() methods raise DeprecationWarning
 cursor.begin() is making a brief reappearence.
 
 cursor.callproc() now works, with some limitations.
-
diff --git a/pyproject.toml b/pyproject.toml
index 25cdb5ff..19762485 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,6 +27,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Database",
     "Topic :: Database :: Database Engines/Servers",
 ]
diff --git a/src/MySQLdb/release.py b/src/MySQLdb/release.py
index 35d53e20..a1b63f6b 100644
--- a/src/MySQLdb/release.py
+++ b/src/MySQLdb/release.py
@@ -1,3 +1,3 @@
 __author__ = "Inada Naoki <songofacandy@gmail.com>"
-__version__ = "2.2.4"
-version_info = (2, 2, 4, "final", 0)
+__version__ = "2.2.5"
+version_info = (2, 2, 5, "final", 0)

From 89511eef44a9a1ba1d02358c97997ef9073572a8 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Tue, 12 Nov 2024 19:06:52 +0900
Subject: [PATCH 22/32] windows: use DEFAULT_SSL_VERIFY_SERVER_CERT=0 option
 (#731)

---
 .github/workflows/windows.yaml | 25 ++++++++++++++++----
 src/MySQLdb/_mysql.c           | 42 +++++++++++++++++++---------------
 2 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index e8844932..f8dbf87a 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: c:/mariadb-connector
-          key: mariadb-connector-c-${{ env.CONNECTOR_VERSION }}-win
+          key: mariadb-connector-c-${{ env.CONNECTOR_VERSION }}-win-2
 
       - name: Download and Unzip Connector
         if: steps.cache-connector.outputs.cache-hit != 'true'
@@ -27,15 +27,32 @@ jobs:
           unzip "mariadb-connector-c-${CONNECTOR_VERSION}-src.zip" -d c:/
           mv "c:/mariadb-connector-c-${CONNECTOR_VERSION}-src" c:/mariadb-connector-src
 
-      - name: Build Connector
+      - name: make build directory
         if: steps.cache-connector.outputs.cache-hit != 'true'
         shell: cmd
         working-directory: c:/mariadb-connector-src
         run: |
           mkdir build
-          cd build
-          cmake -A x64 .. -DCMAKE_BUILD_TYPE=Release -DCLIENT_PLUGIN_DIALOG=static -DCLIENT_PLUGIN_SHA256_PASSWORD=static -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=static
+
+      - name: cmake
+        if: steps.cache-connector.outputs.cache-hit != 'true'
+        shell: cmd
+        working-directory: c:/mariadb-connector-src/build
+        run: |
+          cmake -A x64 .. -DCMAKE_BUILD_TYPE=Release -DCLIENT_PLUGIN_DIALOG=static -DCLIENT_PLUGIN_SHA256_PASSWORD=static -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=static -DDEFAULT_SSL_VERIFY_SERVER_CERT=0
+
+      - name: cmake build
+        if: steps.cache-connector.outputs.cache-hit != 'true'
+        shell: cmd
+        working-directory: c:/mariadb-connector-src/build
+        run: |
           cmake --build . -j 8 --config Release
+
+      - name: cmake install
+        if: steps.cache-connector.outputs.cache-hit != 'true'
+        shell: cmd
+        working-directory: c:/mariadb-connector-src/build
+        run: |
           cmake -DCMAKE_INSTALL_PREFIX=c:/mariadb-connector -DCMAKE_INSTALL_COMPONENT=Development -DCMAKE_BUILD_TYPE=Release -P cmake_install.cmake
 
       - name: Checkout mysqlclient
diff --git a/src/MySQLdb/_mysql.c b/src/MySQLdb/_mysql.c
index b9ec1c12..1468f3e8 100644
--- a/src/MySQLdb/_mysql.c
+++ b/src/MySQLdb/_mysql.c
@@ -543,23 +543,30 @@ _mysql_ConnectionObject_Initialize(
         mysql_options(&(self->connection), MYSQL_OPT_SSL_CIPHER, cipher);
     }
 
-    if (ssl_mode_set) {
 #ifdef HAVE_ENUM_MYSQL_OPT_SSL_MODE
+    if (ssl_mode_set) {
         mysql_options(&(self->connection), MYSQL_OPT_SSL_MODE, &ssl_mode_num);
+    }
 #else
-        // MariaDB doesn't support MYSQL_OPT_SSL_MODE.
-        // See https://github.com/PyMySQL/mysqlclient/issues/474
-        // TODO: Does MariaDB supports PREFERRED and VERIFY_CA?
-        // We support only two levels for now.
-        my_bool enforce_tls = 1;
-        if (ssl_mode_num >= SSLMODE_REQUIRED) {
-            mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_ENFORCE, (void *)&enforce_tls);
-        }
-        if (ssl_mode_num >= SSLMODE_VERIFY_CA) {
-            mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *)&enforce_tls);
-        }
-#endif
+    // MariaDB doesn't support MYSQL_OPT_SSL_MODE.
+    // See https://github.com/PyMySQL/mysqlclient/issues/474
+    // And MariDB 11.4 changed the default value of MYSQL_OPT_SSL_ENFORCE and
+    // MYSQL_OPT_SSL_VERIFY_SERVER_CERT to 1.
+    // https://github.com/mariadb-corporation/mariadb-connector-c/commit/8dffd56936df3d03eeccf47904773860a0cdeb57
+    // We emulate the ssl_mode and old behavior.
+    my_bool my_true = 1;
+    my_bool my_false = 0;
+    if (ssl_mode_num >= SSLMODE_REQUIRED) {
+        mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_ENFORCE, (void *)&my_true);
+    } else {
+        mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_ENFORCE, (void *)&my_false);
+    }
+    if (ssl_mode_num >= SSLMODE_VERIFY_CA) {
+        mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *)&my_true);
+    } else {
+        mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *)&my_false);
     }
+#endif
 
     if (charset) {
         mysql_options(&(self->connection), MYSQL_SET_CHARSET_NAME, charset);
@@ -573,12 +580,9 @@ _mysql_ConnectionObject_Initialize(
                   port, unix_socket, client_flag);
     Py_END_ALLOW_THREADS
 
-    if (ssl) {
-        int i;
-        for (i=0; i<n_ssl_keepref; i++) {
-            Py_DECREF(ssl_keepref[i]);
-            ssl_keepref[i] = NULL;
-        }
+    for (int i=0; i<n_ssl_keepref; i++) {
+        Py_DECREF(ssl_keepref[i]);
+        ssl_keepref[i] = NULL;
     }
 
     if (!conn) {

From feea60c00ed23356bd49f85b17a5ec5e5161b687 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Tue, 12 Nov 2024 20:52:23 +0900
Subject: [PATCH 23/32] support server_public_key_path option. (#744)

fix #682
---
 doc/user_guide.rst         |  4 +++
 src/MySQLdb/_mysql.c       | 53 ++++++++++++++++++++++++++------------
 src/MySQLdb/connections.py |  4 +++
 3 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/doc/user_guide.rst b/doc/user_guide.rst
index ab33615c..8c76417b 100644
--- a/doc/user_guide.rst
+++ b/doc/user_guide.rst
@@ -393,6 +393,10 @@ connect(parameters...)
             an exception is raised. *This must be a keyword
             parameter.*
 
+        server_public_key_path
+            specifies path to a RSA public key used by caching sha2 password authentication.
+            See https://dev.mysql.com/doc/refman/9.0/en/caching-sha2-pluggable-authentication.html
+
 .. _mysql_ssl_set: http://dev.mysql.com/doc/refman/en/mysql-ssl-set.html
 
 
diff --git a/src/MySQLdb/_mysql.c b/src/MySQLdb/_mysql.c
index 1468f3e8..d6df4df8 100644
--- a/src/MySQLdb/_mysql.c
+++ b/src/MySQLdb/_mysql.c
@@ -36,13 +36,18 @@ PERFORMANCE OF THIS SOFTWARE.
 #endif
 
 #if ((MYSQL_VERSION_ID >= 50555 && MYSQL_VERSION_ID <= 50599) || \
-(MYSQL_VERSION_ID >= 50636 && MYSQL_VERSION_ID <= 50699) || \
-(MYSQL_VERSION_ID >= 50711 && MYSQL_VERSION_ID <= 50799) || \
-(MYSQL_VERSION_ID >= 80000)) && \
-!defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
+     (MYSQL_VERSION_ID >= 50636 && MYSQL_VERSION_ID <= 50699) || \
+     (MYSQL_VERSION_ID >= 50711 && MYSQL_VERSION_ID <= 50799) || \
+     (MYSQL_VERSION_ID >= 80000)) && \
+     !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
 #define HAVE_ENUM_MYSQL_OPT_SSL_MODE
 #endif
 
+#if defined(MARIADB_VERSION_ID) && MARIADB_VERSION_ID >= 100403 || \
+    !defined(MARIADB_VERSION_ID) && MYSQL_VERSION_ID >= 50723
+#define HAVE_MYSQL_SERVER_PUBLIC_KEY
+#endif
+
 #define PY_SSIZE_T_CLEAN 1
 #include "Python.h"
 
@@ -431,7 +436,7 @@ _mysql_ConnectionObject_Initialize(
                   "client_flag", "ssl", "ssl_mode",
                   "local_infile",
                   "read_timeout", "write_timeout", "charset",
-                  "auth_plugin",
+                  "auth_plugin", "server_public_key_path",
                   NULL } ;
     int connect_timeout = 0;
     int read_timeout = 0;
@@ -442,14 +447,15 @@ _mysql_ConnectionObject_Initialize(
          *read_default_file=NULL,
          *read_default_group=NULL,
          *charset=NULL,
-         *auth_plugin=NULL;
+         *auth_plugin=NULL,
+         *server_public_key_path=NULL;
 
     self->converter = NULL;
     self->open = false;
     self->reconnect = false;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                "|ssssisOiiisssiOsiiiss:connect",
+                "|ssssisOiiisssiOsiiisss:connect",
                 kwlist,
                 &host, &user, &passwd, &db,
                 &port, &unix_socket, &conv,
@@ -462,10 +468,19 @@ _mysql_ConnectionObject_Initialize(
                 &read_timeout,
                 &write_timeout,
                 &charset,
-                &auth_plugin
+                &auth_plugin,
+                &server_public_key_path
     ))
         return -1;
 
+#ifndef HAVE_MYSQL_SERVER_PUBLIC_KEY
+    if (server_public_key_path) {
+        PyErr_SetString(_mysql_NotSupportedError, "server_public_key_path is not supported");
+        return -1;
+    }
+#endif
+    // For compatibility with PyPy, we need to keep strong reference
+    // to unicode objects until we use UTF8.
 #define _stringsuck(d,t,s) {t=PyMapping_GetItemString(s,#d);\
         if(t){d=PyUnicode_AsUTF8(t);ssl_keepref[n_ssl_keepref++]=t;}\
         PyErr_Clear();}
@@ -542,6 +557,10 @@ _mysql_ConnectionObject_Initialize(
         mysql_options(&(self->connection), MYSQL_OPT_SSL_CAPATH, capath);
         mysql_options(&(self->connection), MYSQL_OPT_SSL_CIPHER, cipher);
     }
+    for (int i=0 ; i<n_ssl_keepref; i++) {
+        Py_DECREF(ssl_keepref[i]);
+        ssl_keepref[i] = NULL;
+    }
 
 #ifdef HAVE_ENUM_MYSQL_OPT_SSL_MODE
     if (ssl_mode_set) {
@@ -557,14 +576,14 @@ _mysql_ConnectionObject_Initialize(
     my_bool my_true = 1;
     my_bool my_false = 0;
     if (ssl_mode_num >= SSLMODE_REQUIRED) {
-        mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_ENFORCE, (void *)&my_true);
+        mysql_options(&(self->connection), MYSQL_OPT_SSL_ENFORCE, (void *)&my_true);
     } else {
-        mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_ENFORCE, (void *)&my_false);
+        mysql_options(&(self->connection), MYSQL_OPT_SSL_ENFORCE, (void *)&my_false);
     }
     if (ssl_mode_num >= SSLMODE_VERIFY_CA) {
-        mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *)&my_true);
+        mysql_options(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *)&my_true);
     } else {
-        mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *)&my_false);
+        mysql_options(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *)&my_false);
     }
 #endif
 
@@ -574,17 +593,17 @@ _mysql_ConnectionObject_Initialize(
     if (auth_plugin) {
         mysql_options(&(self->connection), MYSQL_DEFAULT_AUTH, auth_plugin);
     }
+#ifdef HAVE_MYSQL_SERVER_PUBLIC_KEY
+    if (server_public_key_path) {
+        mysql_options(&(self->connection), MYSQL_SERVER_PUBLIC_KEY, server_public_key_path);
+    }
+#endif
 
     Py_BEGIN_ALLOW_THREADS
     conn = mysql_real_connect(&(self->connection), host, user, passwd, db,
                   port, unix_socket, client_flag);
     Py_END_ALLOW_THREADS
 
-    for (int i=0; i<n_ssl_keepref; i++) {
-        Py_DECREF(ssl_keepref[i]);
-        ssl_keepref[i] = NULL;
-    }
-
     if (!conn) {
         _mysql_Exception(self);
         return -1;
diff --git a/src/MySQLdb/connections.py b/src/MySQLdb/connections.py
index c7132293..73c95e0f 100644
--- a/src/MySQLdb/connections.py
+++ b/src/MySQLdb/connections.py
@@ -137,6 +137,10 @@ class object, used to create cursors (keyword only)
             Since mysqlclient 2.2.4, ssl=True is alias of ssl_mode=REQUIRED
             for better compatibility with PyMySQL and MariaDB.
 
+        :param str server_public_key_path:
+            specify the path to a file RSA public key file for caching_sha2_password.
+            See https://dev.mysql.com/doc/refman/9.0/en/caching-sha2-pluggable-authentication.html
+
         :param bool local_infile:
             enables LOAD LOCAL INFILE; zero disables
 

From 5e85107b9217f4cc0a254c6454ad628565ba4c56 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Wed, 13 Nov 2024 13:22:52 +0900
Subject: [PATCH 24/32] release v2.2.6 (#745)

---
 HISTORY.rst            | 13 +++++++++++++
 pyproject.toml         |  1 -
 src/MySQLdb/release.py |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 1c795bfe..bc95c774 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,3 +1,16 @@
+======================
+ What's new in 2.2.6
+======================
+
+Release: 2024-11-12
+
+* MariaDB Connector/C 3.4 and MairaDB 11.4 enabled SSL and CA verification by default.
+  It affected 2.2.5 windows wheel. This release disables SSL and CA verification by default. (#731)
+
+* Add ``server_public_key_path`` option. It is needed to connect MySQL server with
+  ``sha256_password`` or ``caching_sha2_password`` authentication plugin without
+  secure connection. (#744)
+
 ======================
  What's new in 2.2.5
 ======================
diff --git a/pyproject.toml b/pyproject.toml
index 19762485..d786f336 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,5 @@
 [project]
 name = "mysqlclient"
-# version = "2.2.0dev0"
 description = "Python interface to MySQL"
 readme = "README.md"
 requires-python = ">=3.8"
diff --git a/src/MySQLdb/release.py b/src/MySQLdb/release.py
index a1b63f6b..0b168441 100644
--- a/src/MySQLdb/release.py
+++ b/src/MySQLdb/release.py
@@ -1,3 +1,3 @@
 __author__ = "Inada Naoki <songofacandy@gmail.com>"
-__version__ = "2.2.5"
-version_info = (2, 2, 5, "final", 0)
+__version__ = "2.2.6"
+version_info = (2, 2, 6, "final", 0)

From afdd93a1c5c0c40d10951adc26bb3ceae63502be Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Wed, 13 Nov 2024 14:07:00 +0900
Subject: [PATCH 25/32] ci: fix django test (#746)

---
 ci/test_mysql.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/test_mysql.py b/ci/test_mysql.py
index 9417fc9f..498be7cf 100644
--- a/ci/test_mysql.py
+++ b/ci/test_mysql.py
@@ -39,3 +39,5 @@
 ]
 
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
+USE_TZ = False

From 49e44c5b469a5abf81731b45ad0eb257376a718e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 15 Nov 2024 17:04:55 +0900
Subject: [PATCH 26/32] chore(deps): update codecov/codecov-action action to v5
 (#747)

---
 .github/workflows/tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 8156fccc..cf784c78 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -59,7 +59,7 @@ jobs:
         run: |
           pytest --cov=MySQLdb tests
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
 
   django-test:
     name: "Run Django LTS test suite"

From 207ac1a948a3e4ae31ceadb78d08bf83bd2f2520 Mon Sep 17 00:00:00 2001
From: Cristi Fati <fati_utcluj@yahoo.com>
Date: Sat, 14 Dec 2024 04:06:06 +0200
Subject: [PATCH 27/32] windows: add MariaDB include paths (#749)

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 771b39b4..9a1d26b8 100644
--- a/setup.py
+++ b/setup.py
@@ -109,6 +109,7 @@ def get_config_win32(options):
     ]
     include_dirs = [
         os.path.join(connector, "include", "mariadb"),
+        os.path.join(connector, "include", "mysql"),
         os.path.join(connector, "include"),
     ]
 

From 8103651bffbf0ee890d2731d4e1fae1f80a50661 Mon Sep 17 00:00:00 2001
From: Mikhail Chinkov <mikhail.chinkov@coralogix.com>
Date: Sun, 5 Jan 2025 05:17:09 +0100
Subject: [PATCH 28/32] add database name as the Connection attribute (#752)

This change adds `self.database` as the Connection attribute
displaying the database name from connection parameters.

This is very useful for otel dbapi tracer.
---
 src/MySQLdb/connections.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/MySQLdb/connections.py b/src/MySQLdb/connections.py
index 73c95e0f..c3575454 100644
--- a/src/MySQLdb/connections.py
+++ b/src/MySQLdb/connections.py
@@ -204,6 +204,8 @@ class object, used to create cursors (keyword only)
             if type(k) is not int  # noqa: E721
         }
 
+        self.database = kwargs2.get("database", "")
+
         self._server_version = tuple(
             [numeric_part(n) for n in self.get_server_info().split(".")[:2]]
         )

From 2226fc471930a73f59985ab48b6f54e76c865eac Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Fri, 10 Jan 2025 20:18:31 +0900
Subject: [PATCH 29/32] support opentelemetry-instrumentation (#753)

---
 src/MySQLdb/connections.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/MySQLdb/connections.py b/src/MySQLdb/connections.py
index c3575454..5bcfc937 100644
--- a/src/MySQLdb/connections.py
+++ b/src/MySQLdb/connections.py
@@ -196,20 +196,18 @@ class object, used to create cursors (keyword only)
         # PEP-249 requires autocommit to be initially off
         autocommit = kwargs2.pop("autocommit", False)
 
+        self._set_attributes(*args, **kwargs2)
         super().__init__(*args, **kwargs2)
+
         self.cursorclass = cursorclass
         self.encoders = {
             k: v
             for k, v in conv.items()
             if type(k) is not int  # noqa: E721
         }
-
-        self.database = kwargs2.get("database", "")
-
         self._server_version = tuple(
             [numeric_part(n) for n in self.get_server_info().split(".")[:2]]
         )
-
         self.encoding = "ascii"  # overridden in set_character_set()
 
         if not charset:
@@ -240,6 +238,21 @@ class object, used to create cursors (keyword only)
                 self.autocommit(autocommit)
         self.messages = []
 
+    def _set_attributes(self, host=None, user=None, password=None, database="", port=3306,
+                        unix_socket=None, **kwargs):
+        """set some attributes for otel"""
+        if unix_socket and not host:
+            host = "localhost"
+        # support opentelemetry-instrumentation-dbapi
+        self.host = host
+        # _mysql.Connection provides self.port
+        self.user = user
+        self.database = database
+        # otel-inst-mysqlclient uses db instead of database.
+        self.db = database
+        # NOTE: We have not supported semantic conventions yet.
+        # https://opentelemetry.io/docs/specs/semconv/database/sql/
+
     def __enter__(self):
         return self
 

From 2076d161e2f09f3fb99e00134c9f415063924ad9 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Fri, 10 Jan 2025 20:45:32 +0900
Subject: [PATCH 30/32] release v2.2.7 (#754)

---
 HISTORY.rst            | 9 +++++++++
 src/MySQLdb/release.py | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index bc95c774..66470541 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,3 +1,12 @@
+======================
+ What's new in 2.2.7
+======================
+
+Release: 2025-01-10
+
+* Add ``user``, ``host``, ``database``, and ``db`` attributes to ``Connection``.
+  opentelemetry-instrumentation-(dbapi|mysqlclient) use them. (#753)
+
 ======================
  What's new in 2.2.6
 ======================
diff --git a/src/MySQLdb/release.py b/src/MySQLdb/release.py
index 0b168441..234d9958 100644
--- a/src/MySQLdb/release.py
+++ b/src/MySQLdb/release.py
@@ -1,3 +1,3 @@
 __author__ = "Inada Naoki <songofacandy@gmail.com>"
-__version__ = "2.2.6"
-version_info = (2, 2, 6, "final", 0)
+__version__ = "2.2.7"
+version_info = (2, 2, 7, "final", 0)

From 5b358664e5581571b7a21ee85829ca51869b23e0 Mon Sep 17 00:00:00 2001
From: RasmusKard <rasmuskard@gmail.com>
Date: Sun, 23 Feb 2025 12:37:40 +0200
Subject: [PATCH 31/32] support local_infile_dir option (#755)

Adds support for `MYSQL_OPT_LOAD_DATA_LOCAL_DIR` in `mysql_options()` as
the kwarg `local_infile_dir`. A bit safer alternative than `local_infile` for MySQL versions >= 8.0.21.
---
 doc/user_guide.rst         | 11 +++++++++++
 src/MySQLdb/_mysql.c       | 27 +++++++++++++++++++++++----
 src/MySQLdb/connections.py |  8 +++++++-
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/doc/user_guide.rst b/doc/user_guide.rst
index 8c76417b..391b162f 100644
--- a/doc/user_guide.rst
+++ b/doc/user_guide.rst
@@ -396,6 +396,17 @@ connect(parameters...)
         server_public_key_path
             specifies path to a RSA public key used by caching sha2 password authentication.
             See https://dev.mysql.com/doc/refman/9.0/en/caching-sha2-pluggable-authentication.html
+        
+        local_infile
+            sets ``MYSQL_OPT_LOCAL_INFILE`` in ``mysql_options()`` enabling LOAD LOCAL INFILE from any path; zero disables;
+
+            *This must be a keyword parameter.*
+        
+        local_infile_dir
+            sets ``MYSQL_OPT_LOAD_DATA_LOCAL_DIR`` in ``mysql_options()`` enabling LOAD LOCAL INFILE from any path; 
+            if ``local_infile`` is set to ``True`` then this is ignored;
+
+            *This must be a keyword parameter.*
 
 .. _mysql_ssl_set: http://dev.mysql.com/doc/refman/en/mysql-ssl-set.html
 
diff --git a/src/MySQLdb/_mysql.c b/src/MySQLdb/_mysql.c
index d6df4df8..cd95b641 100644
--- a/src/MySQLdb/_mysql.c
+++ b/src/MySQLdb/_mysql.c
@@ -48,6 +48,10 @@ PERFORMANCE OF THIS SOFTWARE.
 #define HAVE_MYSQL_SERVER_PUBLIC_KEY
 #endif
 
+#if !defined(MARIADB_VERSION_ID) && MYSQL_VERSION_ID >= 80021
+#define HAVE_MYSQL_OPT_LOCAL_INFILE_DIR
+#endif
+
 #define PY_SSIZE_T_CLEAN 1
 #include "Python.h"
 
@@ -436,7 +440,7 @@ _mysql_ConnectionObject_Initialize(
                   "client_flag", "ssl", "ssl_mode",
                   "local_infile",
                   "read_timeout", "write_timeout", "charset",
-                  "auth_plugin", "server_public_key_path",
+                  "auth_plugin", "server_public_key_path", "local_infile_dir",
                   NULL } ;
     int connect_timeout = 0;
     int read_timeout = 0;
@@ -448,14 +452,15 @@ _mysql_ConnectionObject_Initialize(
          *read_default_group=NULL,
          *charset=NULL,
          *auth_plugin=NULL,
-         *server_public_key_path=NULL;
+         *server_public_key_path=NULL,
+         *local_infile_dir=NULL;
 
     self->converter = NULL;
     self->open = false;
     self->reconnect = false;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                "|ssssisOiiisssiOsiiisss:connect",
+                "|ssssisOiiisssiOsiiissss:connect",
                 kwlist,
                 &host, &user, &passwd, &db,
                 &port, &unix_socket, &conv,
@@ -469,7 +474,8 @@ _mysql_ConnectionObject_Initialize(
                 &write_timeout,
                 &charset,
                 &auth_plugin,
-                &server_public_key_path
+                &server_public_key_path,
+                &local_infile_dir
     ))
         return -1;
 
@@ -479,6 +485,13 @@ _mysql_ConnectionObject_Initialize(
         return -1;
     }
 #endif
+
+#ifndef HAVE_MYSQL_OPT_LOCAL_INFILE_DIR
+    if (local_infile_dir) {
+        PyErr_SetString(_mysql_NotSupportedError, "local_infile_dir is not supported");
+        return -1;
+    }
+#endif
     // For compatibility with PyPy, we need to keep strong reference
     // to unicode objects until we use UTF8.
 #define _stringsuck(d,t,s) {t=PyMapping_GetItemString(s,#d);\
@@ -599,6 +612,12 @@ _mysql_ConnectionObject_Initialize(
     }
 #endif
 
+#ifdef HAVE_MYSQL_OPT_LOCAL_INFILE_DIR
+    if (local_infile_dir) {
+        mysql_options(&(self->connection), MYSQL_OPT_LOAD_DATA_LOCAL_DIR, local_infile_dir);
+    }
+#endif
+
     Py_BEGIN_ALLOW_THREADS
     conn = mysql_real_connect(&(self->connection), host, user, passwd, db,
                   port, unix_socket, client_flag);
diff --git a/src/MySQLdb/connections.py b/src/MySQLdb/connections.py
index 5bcfc937..a61aaaed 100644
--- a/src/MySQLdb/connections.py
+++ b/src/MySQLdb/connections.py
@@ -142,7 +142,13 @@ class object, used to create cursors (keyword only)
             See https://dev.mysql.com/doc/refman/9.0/en/caching-sha2-pluggable-authentication.html
 
         :param bool local_infile:
-            enables LOAD LOCAL INFILE; zero disables
+            sets ``MYSQL_OPT_LOCAL_INFILE`` in ``mysql_options()`` enabling LOAD LOCAL INFILE from any path; zero disables;
+            
+        :param str local_infile_dir:
+            sets ``MYSQL_OPT_LOAD_DATA_LOCAL_DIR`` in ``mysql_options()`` enabling LOAD LOCAL INFILE from any path; 
+            if ``local_infile`` is set to ``True`` then this is ignored;
+            
+            supported for mysql version >= 8.0.21
 
         :param bool autocommit:
             If False (default), autocommit is disabled.

From e54e8612957e0d74dafe5d186ba1247a612c81bd Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sun, 23 Feb 2025 19:58:05 +0900
Subject: [PATCH 32/32] update readthedocs conf (#759)

---
 .readthedocs.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 0b288620..75d7a389 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -1,9 +1,12 @@
 version: 2
 
+sphinx:
+  configuration: doc/conf.py
+
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: "3.13"
 
   apt_packages:
     - default-libmysqlclient-dev