From a29b96a9ea258a897ffafa95c214e780cc1cbb86 Mon Sep 17 00:00:00 2001
From: Julien Schmidt <git@julienschmidt.com>
Date: Wed, 13 Sep 2017 10:53:23 +0200
Subject: [PATCH 1/2] travis: test with Go 1.9

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0bfd17597..81395da32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ go:
   - 1.6
   - 1.7
   - 1.8
+  - 1.9
   - tip
 
 before_install:
@@ -16,7 +17,7 @@ matrix:
     - env: DB=MYSQL57
       sudo: required
       dist: trusty
-      go: 1.8
+      go: 1.9
       services:
         - docker
       before_install:
@@ -38,7 +39,7 @@ matrix:
     - env: DB=MARIA55
       sudo: required
       dist: trusty
-      go: 1.8
+      go: 1.9
       services:
         - docker
       before_install:
@@ -60,7 +61,7 @@ matrix:
     - env: DB=MARIA10_1
       sudo: required
       dist: trusty
-      go: 1.8
+      go: 1.9
       services:
         - docker
       before_install:

From 27f5fa4ec5a9333ccb214259b027091144c4b377 Mon Sep 17 00:00:00 2001
From: Julien Schmidt <git@julienschmidt.com>
Date: Wed, 13 Sep 2017 11:24:28 +0200
Subject: [PATCH 2/2] travis: adjust MySQL config

Fixes #660
---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 81395da32..fa0b2c933 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,12 @@ before_install:
   - go get golang.org/x/tools/cmd/cover
   - go get github.com/mattn/goveralls
 
+before_script:
+  - echo -e "[server]\ninnodb_log_file_size=256MB\ninnodb_buffer_pool_size=512MB\nmax_allowed_packet=16MB" | sudo tee -a /etc/mysql/my.cnf
+  - sudo service mysql restart
+  - .travis/wait_mysql.sh
+  - mysql -e 'create database gotest;'
+
 matrix:
   include:
     - env: DB=MYSQL57
@@ -80,9 +86,6 @@ matrix:
         - export MYSQL_TEST_ADDR=127.0.0.1:3307
         - export MYSQL_TEST_CONCURRENT=1
 
-
-before_script:
-  - mysql -e 'create database gotest;'
 script:
   - go test -v -covermode=count -coverprofile=coverage.out
   - go vet ./...