From 225669d3c7dc23060769bd1927d8bc078bd06f4b Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 29 Aug 2015 23:18:40 +0000
Subject: [PATCH] Merged r14525 from trunk to 3.1-stable

travis: allow test failures on MySQL 5.7

<pre>
ActiveRecord::StatementInvalid: Mysql2::Error:
  Table 'performance_schema.session_variables' doesn't exist:
  SHOW VARIABLES LIKE 'character_set_database'
</pre>

Refer:

* https://github.com/rails/rails/issues/21108
* https://github.com/rails/rails/pull/21318

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14526 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index ab505ce68..4cd31a909 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,9 @@ matrix:
     - env: "SUITE=ui          DB=mariadb-5.5"
     - env: "SUITE=ui          DB=mariadb-10.0"
     - env: "SUITE=ui          DB=sqlite3"
+    - env: "SUITE=units       DB=mysql-5.7-dmr"
+    - env: "SUITE=functionals DB=mysql-5.7-dmr"
+    - env: "SUITE=integration DB=mysql-5.7-dmr"
     # SCM tests fail randomly due to IO.popen().
     # http://www.redmine.org/issues/19091
     # https://github.com/jruby/jruby/issues/779
-- 
2.39.5