diff options
| author | sgiehl <stefan@piwik.org> | 2014-08-21 01:25:06 +0400 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-08-21 01:25:06 +0400 |
| commit | a3b4798c4ea0d85cc05ff737d9254b5e92713912 (patch) | |
| tree | 8a09439e7ccf8dbc0e61b2b77bead9a1e35924f2 /.travis.yml | |
| parent | 4c7e446dedf7ca070cc70789ae629416f016baee (diff) | |
| parent | 9717f78bcd73aca1f58a7744307c6e34a188c044 (diff) | |
Merge branch 'master' into codecoverage
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 2b3e2a6ce7..f3a65a7f60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -117,7 +117,7 @@ before_script: - mysql -e "SELECT VERSION();" # configure mysql - - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION'" # Travis default + - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES'" # Travis default # Uncomment to enable sql_mode STRICT_TRANS_TABLES (new default in Mysql 5.6) #- mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'" |