From cac3b615e7cedb62133444c1b9d0a60d8727eb39 Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Wed, 3 Jun 2015 01:07:50 +0900
Subject: [PATCH 1/3] travis: mysql --print-defaults

---
 .travis.yml      | 5 ++++-
 tests/travis.cnf | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index da2f6b2..462f446 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,5 +3,8 @@ language: python
 install:
     - pip install tox six
 
-before_script: mysql -e 'create database mysqldb_test charset utf8;'
+before_script:
+    - "mysql --help"
+    - "mysql --print-defaults"
+    - "mysql -e 'create database mysqldb_test charset utf8mb4;'"
 script: TESTDB=travis.cnf tox
diff --git a/tests/travis.cnf b/tests/travis.cnf
index eb37c29..483b76f 100644
--- a/tests/travis.cnf
+++ b/tests/travis.cnf
@@ -4,6 +4,7 @@
 
 [MySQLdb-tests]
 host = 127.0.0.1
+port = 3306
 user = root
 database = mysqldb_test
 #password =

From 13ddae4153ef69ad5dff5ed51cda9402aa3a2ea3 Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Wed, 3 Jun 2015 01:37:26 +0900
Subject: [PATCH 2/3] tox: Pass TESTDB envvar to test

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index af33458..708221f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
 envlist = py26, py27, pypy, py33, py34
 
 [testenv]
+passenv = TESTDB
 commands =
     py.test --cov {envsitepackagesdir}/MySQLdb
 deps =

From be416d0c213a676733dbe3a8cb4953dfc6718ee7 Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Wed, 3 Jun 2015 01:42:18 +0900
Subject: [PATCH 3/3] travis: cache: pip

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 462f446..dab1f60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 sudo: false
 language: python
+cache: pip
 install:
-    - pip install tox six
+    - pip install tox
 
 before_script:
     - "mysql --help"