From cfbb683d510d7a960fb04eb2db966f175496b66e Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Mon, 24 Aug 2015 21:20:11 +1000
Subject: [PATCH] tests: enable mariadb, go-1.5 and lower limit 1<<25 -> 1<<23

---
 .travis.yml    | 15 ++++++++++++++-
 driver_test.go |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2f4e3c2f0..2b963c881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,20 @@ go:
   - 1.2
   - 1.3
   - 1.4
+  - 1.5
   - tip
 
+matrix:
+  include:
+    - go: 1.5
+      addons:
+         mariadb: 5.5
+    - go: 1.5
+      addons:
+         mariadb: "10.0"
+    - go: 1.5
+      addons:
+         mariadb: 10.1
+
 before_script:
-  - mysql -e 'create database gotest;'
+  - mysql -e "create database /*M!50701 IF NOT EXISTS */ gotest;"
diff --git a/driver_test.go b/driver_test.go
index f9da416ec..efb139e5f 100644
--- a/driver_test.go
+++ b/driver_test.go
@@ -833,8 +833,8 @@ func TestLongData(t *testing.T) {
 		maxAllowedPacketSize--
 
 		// don't get too ambitious
-		if maxAllowedPacketSize > 1<<25 {
-			maxAllowedPacketSize = 1 << 25
+		if maxAllowedPacketSize > 1<<23 {
+			maxAllowedPacketSize = 1 << 23
 		}
 
 		dbt.mustExec("CREATE TABLE test (value LONGBLOB)")