Merge branch 'master' into 0.2.x

Author: sodabrew

.travis.yml

@@ -2,41 +2,55 @@ language: ruby
 bundler_args: --without benchmarks
 script:
   - bundle exec rake spec
-# Temporary workaround for broken Rubygems on Travis
 before_install:
-  - gem update --system 2.1.11
   - gem --version
+  - |
+    bash -c " # Install MySQL 5.7 if DB=mysql57
+    if [[ x$DB =~ mysql57 ]]; then
+      sudo bash .travis_mysql57.sh
+    fi
+    "
   - |
     bash -c " # Install MariaDB if DB=mariadb
     if [[ x$DB =~ xmariadb ]]; then
-      sudo service mysql stop
-      sudo apt-get purge '^mysql*' 'libmysql*'
-      sudo apt-get install python-software-properties
-      sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
-      if [[ x$DB = xmariadb55 ]]; then
-        sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu precise main'
-      elif [[ x$DB = xmariadb10 ]]; then
-        sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu precise main'
-      fi
-      sudo apt-get update
-      sudo apt-get -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold -y install mariadb-server libmariadbd-dev
+      sudo bash .travis_mariadb.sh '$DB'
+    fi
+    "
+  - |
+    bash -c " # Install MySQL is OS=darwin
+    if [[ x$OSTYPE =~ ^xdarwin ]]; then
+      brew install mysql
+      mysql.server start
     fi
     "
+  - |
+    bash -c " # Configure SSL support
+    sudo bash .travis_ssl.sh
+    "
   - mysqld --version
+  - mysql -u root -e "CREATE DATABASE IF NOT EXISTS test"
+  - mysql -u root -e "CREATE USER '$USER'@'localhost'" || true
+os:
+  - linux
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.4
   - ree
 matrix:
   allow_failures:
-    - rvm: rbx
+    - env: DB=mysql57
+    - rvm: rbx-2
   include:
     - rvm: 2.0.0
       env: DB=mariadb55
     - rvm: 2.0.0
       env: DB=mariadb10
-    - rvm: rbx
+    - rvm: 2.0.0
+      env: DB=mysql57
+    - rvm: rbx-2
       env: RBXOPT=-Xgc.honor_start=true
+    - rvm: 2.0.0
+      os: osx

.travis_mariadb.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+service mysql stop
+apt-get purge '^mysql*' 'libmysql*'
+apt-get install python-software-properties
+apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
+
+if [[ x$1 = xmariadb55 ]]; then
+  add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu precise main'
+elif [[ x$1 = xmariadb10 ]]; then
+  add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu precise main'
+fi
+
+apt-get update
+apt-get -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold -y install mariadb-server libmariadbd-dev

.travis_mysql57.sh

@@ -0,0 +1,16 @@
+#!/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

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# Halt the tests on error
+set -e
+
+# Whever MySQL configs live, go there (this is for cross-platform)
+cd $(my_print_defaults --help | grep my.cnf | xargs find 2>/dev/null | xargs dirname)
+
+# Create config files to run openssl in batch mode
+# Set the CA startdate to yesterday to avoid "ASN: before date in the future"
+# (there can be 90k seconds in a daylight saving change day)
+
+echo "
+[ ca ]
+default_startdate = $(ruby -e 'print (Time.now - 90000).strftime("%y%m%d000000Z")')
+
+[ req ]
+distinguished_name = req_distinguished_name
+
+[ req_distinguished_name ]
+# If this isn't set, the error is "error, no objects specified in config file"
+commonName = Common Name (hostname, IP, or your name)
+
+countryName_default            = US
+stateOrProvinceName_default    = CA
+localityName_default           = San Francisco
+0.organizationName_default     = test_example
+organizationalUnitName_default = Testing
+emailAddress_default           = [email protected]
+" | tee ca.cnf cert.cnf
+
+# The client and server certs must have a diferent common name than the CA
+# to avoid "SSL connection error: error:00000001:lib(0):func(0):reason(1)"
+
+echo "
+commonName_default             = ca_name
+" >> ca.cnf
+
+echo "
+commonName_default             = cert_name
+" >> cert.cnf
+
+# Generate a set of certificates
+openssl genrsa -out ca-key.pem 2048
+openssl req -new -x509 -nodes -days 1000 -key ca-key.pem -out ca-cert.pem -batch -config ca.cnf
+openssl req -newkey rsa:2048 -days 1000 -nodes -keyout pkcs8-server-key.pem -out server-req.pem -batch -config cert.cnf
+openssl x509 -req -in server-req.pem -days 1000 -CA ca-cert.pem -CAkey ca-key.pem -set_serial 01 -out server-cert.pem
+openssl req -newkey rsa:2048 -days 1000 -nodes -keyout pkcs8-client-key.pem -out client-req.pem -batch -config cert.cnf
+openssl x509 -req -in client-req.pem -days 1000 -CA ca-cert.pem -CAkey ca-key.pem -set_serial 01 -out client-cert.pem
+
+# Convert format from PKCS#8 to PKCS#1
+openssl rsa -in pkcs8-server-key.pem -out server-key.pem
+openssl rsa -in pkcs8-client-key.pem -out client-key.pem
+
+# Put the configs into the server
+echo "
+[mysqld]
+ssl-ca=/etc/mysql/ca-cert.pem
+ssl-cert=/etc/mysql/server-cert.pem
+ssl-key=/etc/mysql/server-key.pem
+" >> my.cnf
+
+# FIXME The startdate code above isn't doing the trick, we must wait until the minute moves
+ruby -e 'start = Time.now.min; while Time.now.min == start; sleep 2; end'
+
+# Ok, let's see what we got!
+service mysql restart || brew services restart mysql

README.md

@@ -1,16 +1,16 @@
-# Mysql2 - A modern, simple and very fast Mysql library for Ruby - binding to libmysql
+# Mysql2 - A modern, simple and very fast MySQL library for Ruby - binding to libmysql
 
 [![Build Status](https://travis-ci.org/brianmario/mysql2.png)](https://travis-ci.org/brianmario/mysql2)
 
 The Mysql2 gem is meant to serve the extremely common use-case of connecting, querying and iterating on results.
-Some database libraries out there serve as direct 1:1 mappings of the already complex C API's available.
+Some database libraries out there serve as direct 1:1 mappings of the already complex C APIs available.
 This one is not.
 
 It also forces the use of UTF-8 [or binary] for the connection [and all strings in 1.9, unless Encoding.default_internal is set then it'll convert from UTF-8 to that encoding] and uses encoding-aware MySQL API calls where it can.
 
 The API consists of two classes:
 
-`Mysql2::Client` - your connection to the database
+`Mysql2::Client` - your connection to the database.
 
 `Mysql2::Result` - returned from issuing a #query on the connection. It includes Enumerable.
 
@@ -26,7 +26,7 @@ By default, the mysql2 gem will try to find a copy of MySQL in this order:
 
 * Option `--with-mysql-dir`, if provided (see below).
 * Option `--with-mysql-config`, if provided (see below).
-* Several typical paths for `msyql_config` (default for the majority of users).
+* Several typical paths for `mysql_config` (default for the majority of users).
 * The directory `/usr/local`.
 
 ### Configuration options
@@ -104,7 +104,10 @@ results.each do |row|
   # conveniently, row is a hash
   # the keys are the fields, as you'd expect
   # the values are pre-built ruby primitives mapped from their corresponding field types in MySQL
-  # Here's an otter: http://farm1.static.flickr.com/130/398077070_b8795d0ef3_b.jpg
+  puts row["id"] # row["id"].class == Fixnum
+  if row["dne"]  # non-existant hash entry is nil
+    puts row["dne"]
+  end
 end
 ```
 
@@ -335,7 +338,7 @@ result = client.query("SELECT * FROM table_with_boolean_field", :cast_booleans =
 
 ### Skipping casting
 
-Mysql2 casting is fast, but not as fast as not casting data.  In rare cases where typecasting is not needed, it will be faster to disable it by providing :cast => false.
+Mysql2 casting is fast, but not as fast as not casting data.  In rare cases where typecasting is not needed, it will be faster to disable it by providing :cast => false. (Note that :cast => false overrides :cast_booleans => true.)
 
 ``` ruby
 client = Mysql2::Client.new

ext/mysql2/client.c

@@ -6,7 +6,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #endif
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 #include <fcntl.h>
 #include "wait_for_single_fd.h"
 
@@ -167,26 +169,30 @@ static void *nogvl_connect(void *ptr) {
 
 #ifndef _WIN32
 /*
- * Redirect clientfd to a dummy socket for mysql_close to
- * write, shutdown, and close on as a no-op.
- * We do this hack because we want to call mysql_close to release
- * memory, but do not want mysql_close to drop connections in the
- * parent if the socket got shared in fork.
+ * Redirect clientfd to /dev/null for mysql_close and SSL_close to write,
+ * shutdown, and close. The hack is needed to prevent shutdown() from breaking
+ * a socket that may be in use by the parent or other processes after fork.
+ *
+ * /dev/null is used to absorb writes; previously a dummy socket was used, but
+ * it could not abosrb writes and caused openssl to go into an infinite loop.
+ *
  * Returns Qtrue or Qfalse (success or failure)
+ *
+ * Note: if this function is needed on Windows, use "nul" instead of "/dev/null"
  */
 static VALUE invalidate_fd(int clientfd)
 {
 #ifdef SOCK_CLOEXEC
   /* Atomically set CLOEXEC on the new FD in case another thread forks */
-  int sockfd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+  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 = socket(AF_UNIX, SOCK_STREAM, 0);
+    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 = socket(AF_UNIX, SOCK_STREAM, 0);
+  int sockfd = open("/dev/null", O_RDWR);
   fcntl(sockfd, F_SETFD, FD_CLOEXEC);
 #endif
 
@@ -326,10 +332,10 @@ static VALUE rb_mysql_info(VALUE self) {
 
 static VALUE rb_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE port, VALUE database, VALUE socket, VALUE flags) {
   struct nogvl_connect_args args;
-  VALUE rv;
-  GET_CLIENT(self);
   time_t start_time, end_time;
   unsigned int elapsed_time, connect_timeout;
+  VALUE rv;
+  GET_CLIENT(self);
 
   args.host = NIL_P(host) ? NULL : StringValuePtr(host);
   args.unix_socket = NIL_P(socket) ? NULL : StringValuePtr(socket);
@@ -349,11 +355,11 @@ static VALUE rb_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE po
         time(&end_time);
         /* avoid long connect timeout from system time changes */
         if (end_time < start_time)
-            start_time = end_time;
+          start_time = end_time;
         elapsed_time = end_time - start_time;
         /* avoid an early timeout due to time truncating milliseconds off the start time */
         if (elapsed_time > 0)
-            elapsed_time--;
+          elapsed_time--;
         if (elapsed_time >= wrapper->connect_timeout)
           break;
         connect_timeout = wrapper->connect_timeout - elapsed_time;
@@ -764,17 +770,17 @@ static VALUE _mysql_client_options(VALUE self, int opt, VALUE value) {
 
   switch(opt) {
     case MYSQL_OPT_CONNECT_TIMEOUT:
-      intval = NUM2INT(value);
+      intval = NUM2UINT(value);
       retval = &intval;
       break;
 
     case MYSQL_OPT_READ_TIMEOUT:
-      intval = NUM2INT(value);
+      intval = NUM2UINT(value);
       retval = &intval;
       break;
 
     case MYSQL_OPT_WRITE_TIMEOUT:
-      intval = NUM2INT(value);
+      intval = NUM2UINT(value);
       retval = &intval;
       break;
 
@@ -1233,6 +1239,13 @@ void init_mysql2_client() {
     }
   }
 
+  /* Initializing mysql library, so different threads could call Client.new */
+  /* without race condition in the library */
+  if (mysql_library_init(0, NULL, NULL) != 0) {
+    rb_raise(rb_eRuntimeError, "Could not initialize MySQL client library");
+    return;
+  }
+
 #if 0
   mMysql2      = rb_define_module("Mysql2"); Teach RDoc about Mysql2 constant.
 #endif
@@ -1365,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

ext/mysql2/client.h

@@ -41,7 +41,7 @@ typedef struct {
   VALUE active_thread; /* rb_thread_current() or Qnil */
   long server_version;
   int reconnect_enabled;
-  int connect_timeout;
+  unsigned int connect_timeout;
   int active;
   int connected;
   int initialized;

ext/mysql2/infile.c

@@ -1,7 +1,9 @@
 #include <mysql2_ext.h>
 
 #include <errno.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 #include <fcntl.h>
 
 #define ERROR_LEN 1024