Merge branch 'mysql57-workaround'

Author: sodabrew

.travis.yml

@@ -7,7 +7,7 @@ before_install:
   - |
     bash -c " # Install MySQL 5.7 if DB=mysql57
     if [[ x$DB =~ mysql57 ]]; then
-      bash .travis_mysql57.sh
+      sudo bash .travis_mysql57.sh
     fi
     "
   - |
@@ -29,6 +29,7 @@ before_install:
     "
   - mysqld --version
   - mysql -u root -e "CREATE DATABASE IF NOT EXISTS test"
+  - mysql -u root -e "CREATE USER '$USER'@'localhost'" || true
 os:
   - linux
 rvm:

.travis_mariadb.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 service mysql stop
 apt-get purge '^mysql*' 'libmysql*'

.travis_mysql57.sh

@@ -1,10 +1,16 @@
-sudo apt-get remove --purge "^mysql.*"
-sudo apt-get autoremove
-sudo apt-get autoclean
-sudo rm -rf /var/lib/mysql
-sudo rm -rf /var/log/mysql
-echo mysql-apt-config mysql-apt-config/enable-repo select mysql-5.7-dmr | sudo debconf-set-selections
-wget http://dev.mysql.com/get/mysql-apt-config_0.2.1-1ubuntu12.04_all.deb
-sudo dpkg --install mysql-apt-config_0.2.1-1ubuntu12.04_all.deb
-sudo apt-get update -q
-sudo apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" mysql-server ruby libmysqlclient-dev
+#!/bin/sh
+
+service mysql stop
+
+apt-get purge '^mysql*' 'libmysql*'
+apt-get autoclean
+
+rm -rf /var/lib/mysql
+rm -rf /var/log/mysql
+
+apt-get install python-software-properties
+apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x8C718D3B5072E1F5
+add-apt-repository 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.7-dmr'
+
+apt-get update
+apt-get -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold -y install mysql-server libmysqlclient-dev

.travis_ssl.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Halt the tests on error
 set -e

ext/mysql2/client.c

@@ -1378,6 +1378,10 @@ void init_mysql2_client() {
 #ifdef CLIENT_SECURE_CONNECTION
   rb_const_set(cMysql2Client, rb_intern("SECURE_CONNECTION"),
       LONG2NUM(CLIENT_SECURE_CONNECTION));
+#else
+  /* HACK because MySQL5.7 no longer defines this constant,
+   * but we're using it in our default connection flags. */
+  rb_const_set(cMysql2Client, rb_intern("SECURE_CONNECTION"), LONG2NUM(0));
 #endif
 
 #ifdef CLIENT_MULTI_STATEMENTS