From 9c5997856cb06e6107ef42110d50837c05a62663 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Wed, 9 Dec 2020 08:43:51 +1100
Subject: [PATCH 1/3] fix testSocketAuth for MariaDB-10.4+

MariaDB-10.4+ has unix_socket plugin compiled in.

Server version: 10.4.18-MariaDB Source distribution

Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others.

Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.

MariaDB [(none)]> show plugins;
+-------------------------------+----------+--------------------+---------+---------+
| Name                          | Status   | Type               | Library | License |
+-------------------------------+----------+--------------------+---------+---------+
...
| unix_socket                   | ACTIVE   | AUTHENTICATION     | NULL    | GPL     |
..
---
 pymysql/tests/test_connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pymysql/tests/test_connection.py b/pymysql/tests/test_connection.py
index e4d24c44..51b9f3a5 100644
--- a/pymysql/tests/test_connection.py
+++ b/pymysql/tests/test_connection.py
@@ -70,7 +70,7 @@ class TestAuthentication(base.PyMySQLTestCase):
     for r in cur:
         if (r[1], r[2]) !=  (u'ACTIVE', u'AUTHENTICATION'):
             continue
-        if r[3] ==  u'auth_socket.so':
+        if r[3] ==  u'auth_socket.so' or r[0] == u'unix_socket':
             socket_plugin_name = r[0]
             socket_found = True
         elif r[3] ==  u'dialog_examples.so':

From cee9c63a3daefb3877b79c649cbfa39526cc720d Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Wed, 9 Dec 2020 08:50:32 +1100
Subject: [PATCH 2/3] travis: supported mariadb versions

MariaDB 10.0 and 10.1 are out of support.
Replace these with current MariaDB GA versions.

Keep MariaDB 5.5 so minimium compatibility is maintained.
---
 .travis.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 553d9cd1..3ddb2b24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,16 +13,18 @@ matrix:
         - DB=mariadb:5.5
       python: "3.5"
     - env:
-        - DB=mariadb:10.0
+        - DB=mariadb:10.2
       python: "3.6"
     - env:
-        - DB=mariadb:10.1
+        - DB=mariadb:10.3
+        - TEST_MARIADB_AUTH=yes
       python: "pypy3"
     - env:
-        - DB=mariadb:10.2
+        - DB=mariadb:10.4
+        - TEST_MARIADB_AUTH=yes
       python: "2.7"
     - env:
-        - DB=mariadb:10.3
+        - DB=mariadb:10.5
         - TEST_MARIADB_AUTH=yes
       python: "3.7"
     - env:

From 5f11e4d6ca9e780af2f938c36d5738b5a131b81e Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Wed, 9 Dec 2020 19:49:15 +1100
Subject: [PATCH 3/3] travis: bump to bionic

crypography-3.3 fails to compile against openssl-1.0.2 in xenial.

Bump travis to bionic to avoid the compile failure.

Ref: https://github.com/pyca/cryptography/issues/5612
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3ddb2b24..e1398170 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 # vim: sw=2 ts=2 sts=2 expandtab
 
-dist: xenial
+dist: bionic
 language: python
 cache: pip