From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 2 Dec 2016 16:05:42 +0000 (+0100)
Subject: MySQL 5.6 is now installed by default in travis images
X-Git-Tag: dnsdist-1.1.0-beta2~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d004b14c73a77dcd4dcf1cd9dabb4e5ecb04d86d;p=thirdparty%2Fpdns.git

MySQL 5.6 is now installed by default in travis images

See https://github.com/travis-ci/travis-ci/issues/6961
---

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index 954126a605..3e0e40d739 100755
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -271,8 +271,10 @@ install_auth() {
     geoip-database"
 
   # gmysql-backend test requirements
-  run "sudo apt-get -qq --no-install-recommends install \
-    mysql-server"
+  # as of 2016/12/01, mysql-5.6 is now installed in the default travis image
+  # see https://github.com/travis-ci/travis-ci/issues/6961
+  #run "sudo apt-get -qq --no-install-recommends install \
+  #  mysql-server"
 
   # godbc-backend test setup
   run 'echo -e "[pdns-sqlite3-1]\nDriver = SQLite3\nDatabase = ${PWD}/regression-tests/pdns.sqlite3\n\n[pdns-sqlite3-2]\nDriver = SQLite3\nDatabase = ${PWD}/regression-tests/pdns.sqlite32\n" > ${HOME}/.odbc.ini'