From c7319f7d10ebd586d9392ce7c7715478e6059f4d Mon Sep 17 00:00:00 2001
From: Jason Madden <jamadden@gmail.com>
Date: Fri, 2 Feb 2018 08:56:08 -0600
Subject: [PATCH] Bump the tested version of MySQL Connector.

When we updated PyPy on Travis to 5.8.0, it started producing errors
"Use multi-True when executing multiple statements", even when we are
demonstrably only executing one statement. E.g.,
https://travis-ci.org/zodb/relstorage/jobs/335720512#L923

If this doesn't fix it, then I plan to take PyPy+MySQL Connector out
of the test matrix.
---
 .travis/setup-cmysqlconnector.sh | 6 +++---
 .travis/setup-mysqlconnector.sh  | 2 +-
 CHANGES.rst                      | 2 ++
 doc/install.rst                  | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis/setup-cmysqlconnector.sh b/.travis/setup-cmysqlconnector.sh
index b4000e9..84c523b 100755
--- a/.travis/setup-cmysqlconnector.sh
+++ b/.travis/setup-cmysqlconnector.sh
@@ -1,6 +1,6 @@
-wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-2.1.5.tar.gz
-tar -xf mysql-connector-python-2.1.5.tar.gz
-cd ./mysql-connector-python-2.1.5
+wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.6.tar.gz
+tar -xf mysql-connector-python-8.0.6.tar.gz
+cd ./mysql-connector-python-8.0.6
 python ./setup.py install --with-mysql-capi=/usr
 cd ..
 python -c 'import relstorage.adapters.mysql.drivers as D; print(D.preferred_driver_name,D.driver_map)'
diff --git a/.travis/setup-mysqlconnector.sh b/.travis/setup-mysqlconnector.sh
index 3b0cd03..2933aea 100755
--- a/.travis/setup-mysqlconnector.sh
+++ b/.travis/setup-mysqlconnector.sh
@@ -1,3 +1,3 @@
-pip install https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-2.1.5.tar.gz
+pip install https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.6.tar.gz
 python -c 'import relstorage.adapters.mysql.drivers as D; print(D.preferred_driver_name,D.driver_map)'
 `dirname $0`/mysql.sh
diff --git a/CHANGES.rst b/CHANGES.rst
index c9d9b20..f476188 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,8 @@
   CFFI compilation environment. Fixes :issue:`187`, reported by
   Johannes Raggam.
 
+- Test with MySQL Connector/Python 8.0.6, up from 2.1.5.
+
 
 2.1a2 (2017-04-15)
 ==================
diff --git a/doc/install.rst b/doc/install.rst
index 1289b20..dbecc61 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -41,7 +41,7 @@ database.
 
 On CPython2, install psycopg2 2.6.1+, mysqlclient 1.3.7+, or cx_Oracle
 5.2+ (but use caution with 5.2.1+); PyMySQL 0.7, MySQL
-Connector/Python 2.1.5 and umysql are also known to work as is pg8000.
+Connector/Python 8.0.6 and umysql are also known to work as is pg8000.
 
 For CPython3, install psycopg2, mysqlclient or cx_Oracle;
 PyMySQL, MySQL Connector/Python  and pg8000 are also known to work.