From 9f8836732dffcbfcb81256f12a8d4118abb680b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?=
 <ammartinez@suse.de>
Date: Tue, 12 Sep 2017 11:54:06 +0200
Subject: [PATCH] Update mariadb to 10.2 to solve Travis failures

Our test suite is failing in Travis as it complains about not finding
`libmysqlclient-dev` which is needed for mysql2. But installing
`libmysqlclient-dev` conflicts with MariaDB 10.1. So I updated MariaDB
to 10.2 and mysql to the last version as the old one is not compatible
with MariaDB 10.2. The missed `libmysqlclient-dev` is not needed any
more.
---
 .travis.yml  | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9191bbd7..6650fbf9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_install:
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
   - "echo `phantomjs -v`"
 addons:
-  mariadb: '10.1'
+  mariadb: '10.2'
 notifications:
   email:
     on_success: change
diff --git a/Gemfile.lock b/Gemfile.lock
index d6d8eb3b..c6b4faa8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -287,7 +287,7 @@ GEM
     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.4.2)
+    mysql2 (0.4.9)
     nenv (0.3.0)
     netrc (0.11.0)
     nokogiri (1.8.0)