Merge pull request #634 from tamird/travis-osx-5.5

Test MySQL 5.5 on OS X on Travis
Allow interrupt failures with MySQL 5.5 on OS X
Remove ancient libraries infinite loop from fallback libmysqlclient detection

Author: sodabrew

.travis.yml

@@ -3,8 +3,6 @@ bundler_args: --without benchmarks development
 before_install:
   - gem --version
   - bash .travis_setup.sh
-  - mysqld --version
-  - mysql -u $USER -e "CREATE DATABASE IF NOT EXISTS test"
 os:
   - linux
 rvm:
@@ -24,4 +22,8 @@ matrix:
     - rvm: 2.0.0
       env: DB=mysql57
     - rvm: 2.0.0
+      env: DB=mysql
+      os: osx
+    - rvm: 2.0.0
+      env: DB=mysql55
       os: osx

.travis_setup.sh

@@ -14,8 +14,9 @@ fi
 
 # Install MySQL if OS=darwin
 if [[ x$OSTYPE =~ ^xdarwin ]]; then
-  brew install mysql
-  mysql.server start
+  brew update
+  brew install "$DB"
+  $(brew --prefix "$DB")/bin/mysql.server start
 fi
 
 # TODO: get SSL working on OS X in Travis
@@ -25,3 +26,12 @@ if ! [[ x$OSTYPE =~ ^xdarwin ]]; then
 fi
 
 sudo mysql -e "CREATE USER '$USER'@'localhost'" || true
+
+# Print the MySQL version and create the test DB
+if [[ x$OSTYPE =~ ^xdarwin ]]; then
+  $(brew --prefix "$DB")/bin/mysqld --version
+  $(brew --prefix "$DB")/bin/mysql -u $USER -e "CREATE DATABASE IF NOT EXISTS test"
+else
+  mysqld --version
+  mysql -u $USER -e "CREATE DATABASE IF NOT EXISTS test"
+fi

ext/mysql2/extconf.rb

@@ -34,6 +34,7 @@ def asplode lib
   /usr/local/mysql
   /usr/local/mysql-*
   /usr/local/lib/mysql5*
+  /usr/local/opt/mysql5*
 ].map{|dir| "#{dir}/bin" }
 
 GLOB = "{#{dirs.join(',')}}/{mysql_config,mysql_config5,mariadb_config}"
@@ -73,14 +74,8 @@ def asplode lib
   rpath_dir = libs
 else
   inc, lib = dir_config('mysql', '/usr/local')
-  libs = ['m', 'z', 'socket', 'nsl', 'mygcc']
-  found = false
-  while not find_library('mysqlclient', 'mysql_query', lib, "#{lib}/mysql") do
-    exit 1 if libs.empty?
-    found ||= have_library(libs.shift)
-  end
 
-  asplode("mysql client") unless found
+  asplode("mysql client") unless find_library('mysqlclient', 'mysql_query', lib, "#{lib}/mysql")
 
   rpath_dir = lib
 end

spec/mysql2/client_spec.rb

@@ -478,13 +478,21 @@ def run_gc
         end
 
         it "should handle Timeouts without leaving the connection hanging if reconnect is true" do
+          if RUBY_PLATFORM.include?('darwin') && Mysql2::Client.info.fetch(:version).start_with?('5.5')
+            pending('libmysqlclient 5.5 on OSX is afflicted by an unknown bug that breaks this test. See #633 and #634.')
+          end
+
           client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:reconnect => true))
 
           expect { Timeout.timeout(0.1, ArgumentError) { client.query('SELECT SLEEP(1)') } }.to raise_error(ArgumentError)
           expect { client.query('SELECT 1') }.to_not raise_error
         end
 
-        it "should handle Timeouts without leaving the connection hanging if reconnect is set to true after construction true" do
+        it "should handle Timeouts without leaving the connection hanging if reconnect is set to true after construction" do
+          if RUBY_PLATFORM.include?('darwin') && Mysql2::Client.info.fetch(:version).start_with?('5.5')
+            pending('libmysqlclient 5.5 on OSX is afflicted by an unknown bug that breaks this test. See #633 and #634.')
+          end
+
           client = Mysql2::Client.new(DatabaseCredentials['root'])
 
           expect { Timeout.timeout(0.1, ArgumentError) { client.query('SELECT SLEEP(1)') } }.to raise_error(ArgumentError)