mysql2 0.3.19-x64-mingw32 → 0.3.20-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d5ccc0fcbdd2904edc1ce50120e678ef1dbebab
-  data.tar.gz: c41b33db3b33862b3d8c88bc03a3447d6e8867d7
+  metadata.gz: 79dfd872044ded0278886f2a4a0d1d922fa52787
+  data.tar.gz: 5bb78db2adf680cd08632f7a20d3beb605d516c2
 SHA512:
-  metadata.gz: e82689659526713623158dd4fd58ae4150eed964783bb582260cca2a351a62b47094cbb704411bc67db18d725f2581208ebaea3208ae1474e84fae87772e611e
-  data.tar.gz: d2970df3bb46eaa68918b1398cc0e8b818b2a305a0837db30c07bfcd07d49191e562ca6587f9bc56626e28cc15c6dbb3228439eee046a6998398c7021a87d6c8
+  metadata.gz: d590f3432423f29626957c30d590a8914acecdf39c50d159e40f8b01b2cbb5f5ec21c7b70f01f1d6c347e7d0a37a8ca1e3fa96544ff8395a81acb3c7c5e6c29f
+  data.tar.gz: 909e075673796ca39ebf64b97bf985fe1c8e2b558d24cf6c6503cdff4c350e88c6e8fee8b51c5058e739617c419cd6553a0e9c0be0f378ea9deb58bbe7bf8354

data/ext/mysql2/client.c

@@ -182,23 +182,31 @@ static void *nogvl_connect(void *ptr) {
  */
 static VALUE invalidate_fd(int clientfd)
 {
-#ifdef SOCK_CLOEXEC
+#ifdef O_CLOEXEC
   /* Atomically set CLOEXEC on the new FD in case another thread forks */
   int sockfd = open("/dev/null", O_RDWR | O_CLOEXEC);
-  if (sockfd < 0) {
-    /* Maybe SOCK_CLOEXEC is defined but not available on this kernel */
-    int sockfd = open("/dev/null", O_RDWR);
-    fcntl(sockfd, F_SETFD, FD_CLOEXEC);
-  }
 #else
-  /* Well we don't have SOCK_CLOEXEC, so just set FD_CLOEXEC quickly */
-  int sockfd = open("/dev/null", O_RDWR);
-  fcntl(sockfd, F_SETFD, FD_CLOEXEC);
+  /* Well we don't have O_CLOEXEC, trigger the fallback code below */
+  int sockfd = -1;
 #endif
 
   if (sockfd < 0) {
-    /*
-     * Cannot raise here, because one or both of the following may be true:
+    /* Either O_CLOEXEC wasn't defined at compile time, or it was defined at
+     * compile time, but isn't available at run-time. So we'll just be quick
+     * about setting FD_CLOEXEC now.
+     */
+    int flags;
+    sockfd = open("/dev/null", O_RDWR);
+    flags = fcntl(sockfd, F_GETFD);
+    /* Do the flags dance in case there are more defined flags in the future */
+    if (flags != -1) {
+      flags |= FD_CLOEXEC;
+      fcntl(sockfd, F_SETFD, flags);
+    }
+  }
+
+  if (sockfd < 0) {
+    /* Cannot raise here, because one or both of the following may be true:
      * a) we have no GVL (in C Ruby)
      * b) are running as a GC finalizer
      */

data/ext/mysql2/extconf.rb

@@ -3,12 +3,11 @@ require 'mkmf'
 
 def asplode lib
   if RUBY_PLATFORM =~ /mingw|mswin/
-    abort "-----\n#{lib} is missing. please check your installation of mysql and try again.\n-----"
+    abort "-----\n#{lib} is missing. Check your installation of MySQL or Connector/C, and try again.\n-----"
   elsif RUBY_PLATFORM =~ /darwin/
-    abort "-----\n#{lib} is missing. Try 'brew install mysql', check your installation of mysql and try again.\n-----"
+    abort "-----\n#{lib} is missing. You may need to 'brew install mysql' or 'port install mysql', and try again.\n-----"
   else
-    abort "-----\n#{lib} is missing. Try 'apt-get install libmysqlclient-dev' or
-'yum install mysql-devel', check your installation of mysql and try again.\n-----"
+    abort "-----\n#{lib} is missing. You may need to 'apt-get install libmysqlclient-dev' or 'yum install mysql-devel', and try again.\n-----"
   end
 end
 
@@ -73,15 +72,22 @@ elsif mc = (with_config('mysql-config') || Dir[GLOB].first)
   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)
+  unless find_library('mysqlclient', 'mysql_query', lib, "#{lib}/mysql")
+    found = false
+    # For some systems and some versions of libmysqlclient, there were extra
+    # libraries needed to link. Try each typical extra library, add it to the
+    # global compile flags, and see if that allows us to link libmysqlclient.
+    warn "-----\nlibmysqlclient is missing. Trying again with extra runtime libraries...\n-----"
+
+    %w{ m z socket nsl mygcc }.each do |extra_lib|
+      if have_library(extra_lib) && find_library('mysqlclient', 'mysql_query', lib, "#{lib}/mysql")
+        found = true
+        break
+      end
+    end
+    asplode('libmysqlclient') unless found
   end
 
-  asplode("mysql client") unless found
-
   rpath_dir = lib
 end
 

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.3.19"
+  VERSION = "0.3.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
 platform: x64-mingw32
 authors:
 - Brian Lopez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler