mysql2 0.3.1 → 0.5.2

data/examples/eventmachine.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 $LOAD_PATH.unshift 'lib'
 
 require 'rubygems'
@@ -18,4 +16,4 @@ EM.run do
   defer2.callback do |result|
     puts "Result: #{result.to_a.inspect}"
   end
-end
+end

data/examples/threaded.rb

@@ -1,20 +1,16 @@
-# encoding: utf-8
-
 $LOAD_PATH.unshift 'lib'
 require 'mysql2'
 require 'timeout'
 
-threads = []
 # Should never exceed worst case 3.5 secs across all 20 threads
 Timeout.timeout(3.5) do
-  20.times do
-    threads << Thread.new do
+  Array.new(20) do
+    Thread.new do
       overhead = rand(3)
       puts ">> thread #{Thread.current.object_id} query, #{overhead} sec overhead"
       # 3 second overhead per query
-      Mysql2::Client.new(:host => "localhost", :username => "root").query("SELECT sleep(#{overhead}) as result")
+      Mysql2::Client.new(host: "localhost", username: "root").query("SELECT sleep(#{overhead}) as result")
       puts "<< thread #{Thread.current.object_id} result, #{overhead} sec overhead"
     end
-  end
-  threads.each{|t| t.join }
-end
+  end.each(&:join)
+end

data/ext/mysql2/client.c

@@ -1,28 +1,74 @@
 #include <mysql2_ext.h>
-#include <client.h>
+
+#include <time.h>
 #include <errno.h>
+#ifndef _WIN32
+#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"
+
+#include "mysql_enc_name_to_ruby.h"
 
 VALUE cMysql2Client;
-extern VALUE mMysql2, cMysql2Error;
-static VALUE intern_encoding_from_charset;
-static VALUE sym_id, sym_version, sym_async, sym_symbolize_keys, sym_as, sym_array;
-static ID intern_merge, intern_error_number_eql, intern_sql_state_eql;
+extern VALUE mMysql2, cMysql2Error, cMysql2TimeoutError;
+static VALUE sym_id, sym_version, sym_header_version, sym_async, sym_symbolize_keys, sym_as, sym_array, sym_stream;
+static VALUE sym_no_good_index_used, sym_no_index_used, sym_query_was_slow;
+static ID intern_brackets, intern_merge, intern_merge_bang, intern_new_with_args;
+
+#define REQUIRE_INITIALIZED(wrapper) \
+  if (!wrapper->initialized) { \
+    rb_raise(cMysql2Error, "MySQL client is not initialized"); \
+  }
+
+#if defined(HAVE_MYSQL_NET_VIO) || defined(HAVE_ST_NET_VIO)
+  #define CONNECTED(wrapper) (wrapper->client->net.vio != NULL && wrapper->client->net.fd != -1)
+#elif defined(HAVE_MYSQL_NET_PVIO) || defined(HAVE_ST_NET_PVIO)
+  #define CONNECTED(wrapper) (wrapper->client->net.pvio != NULL && wrapper->client->net.fd != -1)
+#endif
 
-#define REQUIRE_OPEN_DB(wrapper) \
-  if(wrapper->closed) { \
-    rb_raise(cMysql2Error, "closed MySQL connection"); \
+#define REQUIRE_CONNECTED(wrapper) \
+  REQUIRE_INITIALIZED(wrapper) \
+  if (!CONNECTED(wrapper) && !wrapper->reconnect_enabled) { \
+    rb_raise(cMysql2Error, "MySQL client is not connected"); \
   }
 
-#define MARK_CONN_INACTIVE(conn) \
-  wrapper->active = 0
+#define REQUIRE_NOT_CONNECTED(wrapper) \
+  REQUIRE_INITIALIZED(wrapper) \
+  if (CONNECTED(wrapper)) { \
+    rb_raise(cMysql2Error, "MySQL connection is already open"); \
+  }
 
-#define GET_CLIENT(self) \
-  mysql_client_wrapper *wrapper; \
-  Data_Get_Struct(self, mysql_client_wrapper, wrapper)
+/*
+ * compatability with mysql-connector-c, where LIBMYSQL_VERSION is the correct
+ * variable to use, but MYSQL_SERVER_VERSION gives the correct numbers when
+ * linking against the server itself
+ */
+#if defined(MARIADB_CLIENT_VERSION_STR)
+  #define MYSQL_LINK_VERSION MARIADB_CLIENT_VERSION_STR
+#elif defined(LIBMYSQL_VERSION)
+  #define MYSQL_LINK_VERSION LIBMYSQL_VERSION
+#else
+  #define MYSQL_LINK_VERSION MYSQL_SERVER_VERSION
+#endif
+
+/*
+ * compatibility with mysql-connector-c 6.1.x, and with MySQL 5.7.3 - 5.7.10.
+ */
+#ifdef HAVE_CONST_MYSQL_OPT_SSL_ENFORCE
+  #define SSL_MODE_DISABLED 1
+  #define SSL_MODE_REQUIRED 3
+  #define HAVE_CONST_SSL_MODE_DISABLED
+  #define HAVE_CONST_SSL_MODE_REQUIRED
+#endif
 
 /*
  * used to pass all arguments to mysql_real_connect while inside
- * rb_thread_blocking_region
+ * rb_thread_call_without_gvl
  */
 struct nogvl_connect_args {
   MYSQL *mysql;
@@ -37,13 +83,61 @@ struct nogvl_connect_args {
 
 /*
  * used to pass all arguments to mysql_send_query while inside
- * rb_thread_blocking_region
+ * rb_thread_call_without_gvl
  */
 struct nogvl_send_query_args {
   MYSQL *mysql;
   VALUE sql;
+  const char *sql_ptr;
+  long sql_len;
+  mysql_client_wrapper *wrapper;
 };
 
+/*
+ * used to pass all arguments to mysql_select_db while inside
+ * rb_thread_call_without_gvl
+ */
+struct nogvl_select_db_args {
+  MYSQL *mysql;
+  char *db;
+};
+
+static VALUE rb_set_ssl_mode_option(VALUE self, VALUE setting) {
+  unsigned long version = mysql_get_client_version();
+
+  if (version < 50703) {
+    rb_warn( "Your mysql client library does not support setting ssl_mode; full support comes with 5.7.11." );
+    return Qnil;
+  }
+#ifdef HAVE_CONST_MYSQL_OPT_SSL_ENFORCE
+  GET_CLIENT(self);
+  int val = NUM2INT( setting );
+  if (version >= 50703 && version < 50711) {
+    if (val == SSL_MODE_DISABLED || val == SSL_MODE_REQUIRED) {
+      my_bool b = ( val == SSL_MODE_REQUIRED );
+      int result = mysql_options( wrapper->client, MYSQL_OPT_SSL_ENFORCE, &b );
+      return INT2NUM(result);
+    } else {
+      rb_warn( "MySQL client libraries between 5.7.3 and 5.7.10 only support SSL_MODE_DISABLED and SSL_MODE_REQUIRED" );
+      return Qnil;
+    }
+  }
+#endif
+#ifdef FULL_SSL_MODE_SUPPORT
+  GET_CLIENT(self);
+  int val = NUM2INT( setting );
+
+  if (val != SSL_MODE_DISABLED && val != SSL_MODE_PREFERRED && val != SSL_MODE_REQUIRED && val != SSL_MODE_VERIFY_CA && val != SSL_MODE_VERIFY_IDENTITY) {
+    rb_raise(cMysql2Error, "ssl_mode= takes DISABLED, PREFERRED, REQUIRED, VERIFY_CA, VERIFY_IDENTITY, you passed: %d", val );
+  }
+  int result = mysql_options( wrapper->client, MYSQL_OPT_SSL_MODE, &val );
+
+  return INT2NUM(result);
+#endif
+#ifdef NO_SSL_MODE_SUPPORT
+  return Qnil;
+#endif
+}
 /*
  * non-blocking mysql_*() functions that we won't be wrapping since
  * they do not appear to hit the network nor issue any interruptible
@@ -70,94 +164,148 @@ static void rb_mysql_client_mark(void * wrapper) {
   mysql_client_wrapper * w = wrapper;
   if (w) {
     rb_gc_mark(w->encoding);
+    rb_gc_mark(w->active_thread);
   }
 }
 
 static VALUE rb_raise_mysql2_error(mysql_client_wrapper *wrapper) {
   VALUE rb_error_msg = rb_str_new2(mysql_error(wrapper->client));
   VALUE rb_sql_state = rb_tainted_str_new2(mysql_sqlstate(wrapper->client));
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *default_internal_enc = rb_default_internal_encoding();
-  rb_encoding *conn_enc = rb_to_encoding(wrapper->encoding);
+  VALUE e;
 
-  rb_enc_associate(rb_error_msg, conn_enc);
-  rb_enc_associate(rb_sql_state, conn_enc);
-  if (default_internal_enc) {
-    rb_error_msg = rb_str_export_to_enc(rb_error_msg, default_internal_enc);
-    rb_sql_state = rb_str_export_to_enc(rb_sql_state, default_internal_enc);
-  }
-#endif
+  rb_enc_associate(rb_error_msg, rb_utf8_encoding());
+  rb_enc_associate(rb_sql_state, rb_usascii_encoding());
 
-  VALUE e = rb_exc_new3(cMysql2Error, rb_error_msg);
-  rb_funcall(e, intern_error_number_eql, 1, UINT2NUM(mysql_errno(wrapper->client)));
-  rb_funcall(e, intern_sql_state_eql, 1, rb_sql_state);
+  e = rb_funcall(cMysql2Error, intern_new_with_args, 4,
+                 rb_error_msg,
+                 LONG2FIX(wrapper->server_version),
+                 UINT2NUM(mysql_errno(wrapper->client)),
+                 rb_sql_state);
   rb_exc_raise(e);
-  return Qnil;
 }
 
-static VALUE nogvl_init(void *ptr) {
+static void *nogvl_init(void *ptr) {
   MYSQL *client;
+  mysql_client_wrapper *wrapper = ptr;
 
   /* may initialize embedded server and read /etc/services off disk */
-  client = mysql_init((MYSQL *)ptr);
-  return client ? Qtrue : Qfalse;
+  client = mysql_init(wrapper->client);
+
+  if (client) mysql2_set_local_infile(client, wrapper);
+
+  return (void*)(client ? Qtrue : Qfalse);
 }
 
-static VALUE nogvl_connect(void *ptr) {
+static void *nogvl_connect(void *ptr) {
   struct nogvl_connect_args *args = ptr;
   MYSQL *client;
 
-  do {
-    client = mysql_real_connect(args->mysql, args->host,
-                                args->user, args->passwd,
-                                args->db, args->port, args->unix_socket,
-                                args->client_flag);
-  } while (! client && errno == EINTR && (errno = 0) == 0);
+  client = mysql_real_connect(args->mysql, args->host,
+                              args->user, args->passwd,
+                              args->db, args->port, args->unix_socket,
+                              args->client_flag);
 
-  return client ? Qtrue : Qfalse;
+  return (void *)(client ? Qtrue : Qfalse);
 }
 
-static VALUE nogvl_close(void *ptr) {
-  mysql_client_wrapper *wrapper;
 #ifndef _WIN32
-  int flags;
+/*
+ * 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 O_CLOEXEC
+  /* Atomically set CLOEXEC on the new FD in case another thread forks */
+  int sockfd = open("/dev/null", O_RDWR | O_CLOEXEC);
+#else
+  /* Well we don't have O_CLOEXEC, trigger the fallback code below */
+  int sockfd = -1;
 #endif
-  wrapper = ptr;
-  if (!wrapper->closed) {
-    wrapper->closed = 1;
 
-    /*
-     * we'll send a QUIT message to the server, but that message is more of a
-     * formality than a hard requirement since the socket is getting shutdown
-     * anyways, so ensure the socket write does not block our interpreter
-     *
-     *
-     * if the socket is dead we have no chance of blocking,
-     * so ignore any potential fcntl errors since they don't matter
+  if (sockfd < 0) {
+    /* 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.
      */
-#ifndef _WIN32
-    flags = fcntl(wrapper->client->net.fd, F_GETFL);
-    if (flags > 0 && !(flags & O_NONBLOCK))
-      fcntl(wrapper->client->net.fd, F_SETFL, flags | O_NONBLOCK);
-#else
-    u_long iMode;
-    iMode = 1;
-    ioctlsocket(wrapper->client->net.fd, FIONBIO, &iMode);
-#endif
+    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
+     */
+    return Qfalse;
+  }
+
+  dup2(sockfd, clientfd);
+  close(sockfd);
 
+  return Qtrue;
+}
+#endif /* _WIN32 */
+
+static void *nogvl_close(void *ptr) {
+  mysql_client_wrapper *wrapper = ptr;
+
+  if (!wrapper->closed) {
     mysql_close(wrapper->client);
-    xfree(wrapper->client);
+    wrapper->closed = 1;
+    wrapper->reconnect_enabled = 0;
+    wrapper->active_thread = Qnil;
   }
 
-  return Qnil;
+  return NULL;
 }
 
-static void rb_mysql_client_free(void * ptr) {
-  mysql_client_wrapper *wrapper = (mysql_client_wrapper *)ptr;
+/* this is called during GC */
+static void rb_mysql_client_free(void *ptr) {
+  mysql_client_wrapper *wrapper = ptr;
+  decr_mysql2_client(wrapper);
+}
+
+void decr_mysql2_client(mysql_client_wrapper *wrapper)
+{
+  wrapper->refcount--;
 
-  nogvl_close(wrapper);
+  if (wrapper->refcount == 0) {
+#ifndef _WIN32
+    if (CONNECTED(wrapper) && !wrapper->automatic_close) {
+      /* The client is being garbage collected while connected. Prevent
+       * mysql_close() from sending a mysql-QUIT or from calling shutdown() on
+       * the socket by invalidating it. invalidate_fd() will drop this
+       * process's reference to the socket only, while a QUIT or shutdown()
+       * would render the underlying connection unusable, interrupting other
+       * processes which share this object across a fork().
+       */
+      if (invalidate_fd(wrapper->client->net.fd) == Qfalse) {
+        fprintf(stderr, "[WARN] mysql2 failed to invalidate FD safely\n");
+        close(wrapper->client->net.fd);
+      }
+      wrapper->client->net.fd = -1;
+    }
+#endif
 
-  xfree(ptr);
+    nogvl_close(wrapper);
+    xfree(wrapper->client);
+    xfree(wrapper);
+  }
 }
 
 static VALUE allocate(VALUE klass) {
@@ -165,13 +313,27 @@ static VALUE allocate(VALUE klass) {
   mysql_client_wrapper * wrapper;
   obj = Data_Make_Struct(klass, mysql_client_wrapper, rb_mysql_client_mark, rb_mysql_client_free, wrapper);
   wrapper->encoding = Qnil;
-  wrapper->active = 0;
-  wrapper->closed = 1;
+  wrapper->active_thread = Qnil;
+  wrapper->automatic_close = 1;
+  wrapper->server_version = 0;
+  wrapper->reconnect_enabled = 0;
+  wrapper->connect_timeout = 0;
+  wrapper->initialized = 0; /* means that that the wrapper is initialized */
+  wrapper->refcount = 1;
+  wrapper->closed = 0;
   wrapper->client = (MYSQL*)xmalloc(sizeof(MYSQL));
+
   return obj;
 }
 
-static VALUE rb_mysql_client_escape(VALUE klass, VALUE str) {
+/* call-seq:
+ *    Mysql2::Client.escape(string)
+ *
+ * Escape +string+ so that it may be used in a SQL statement.
+ * Note that this escape method is not connection encoding aware.
+ * If you need encoding support use Mysql2::Client#escape instead.
+ */
+static VALUE rb_mysql_client_escape(RB_MYSQL_UNUSED VALUE klass, VALUE str) {
   unsigned char *newStr;
   VALUE rb_str;
   unsigned long newLen, oldLen;
@@ -181,72 +343,180 @@ static VALUE rb_mysql_client_escape(VALUE klass, VALUE str) {
   oldLen = RSTRING_LEN(str);
   newStr = xmalloc(oldLen*2+1);
 
-  newLen = mysql_escape_string((char *)newStr, StringValuePtr(str), oldLen);
+  newLen = mysql_escape_string((char *)newStr, RSTRING_PTR(str), oldLen);
   if (newLen == oldLen) {
-    // no need to return a new ruby string if nothing changed
+    /* no need to return a new ruby string if nothing changed */
     xfree(newStr);
     return str;
   } else {
     rb_str = rb_str_new((const char*)newStr, newLen);
-#ifdef HAVE_RUBY_ENCODING_H
     rb_enc_copy(rb_str, str);
-#endif
     xfree(newStr);
     return rb_str;
   }
 }
 
-static VALUE rb_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE port, VALUE database, VALUE socket, VALUE flags) {
+static VALUE rb_mysql_client_warning_count(VALUE self) {
+  unsigned int warning_count;
+  GET_CLIENT(self);
+
+  warning_count = mysql_warning_count(wrapper->client);
+
+  return UINT2NUM(warning_count);
+}
+
+static VALUE rb_mysql_info(VALUE self) {
+  const char *info;
+  VALUE rb_str;
+  GET_CLIENT(self);
+
+  info = mysql_info(wrapper->client);
+
+  if (info == NULL) {
+    return Qnil;
+  }
+
+  rb_str = rb_str_new2(info);
+  rb_enc_associate(rb_str, rb_utf8_encoding());
+
+  return rb_str;
+}
+
+static VALUE rb_mysql_get_ssl_cipher(VALUE self)
+{
+  const char *cipher;
+  VALUE rb_str;
+  GET_CLIENT(self);
+
+  cipher = mysql_get_ssl_cipher(wrapper->client);
+
+  if (cipher == NULL) {
+    return Qnil;
+  }
+
+  rb_str = rb_str_new2(cipher);
+  rb_enc_associate(rb_str, rb_utf8_encoding());
+
+  return rb_str;
+}
+
+#ifdef CLIENT_CONNECT_ATTRS
+static int opt_connect_attr_add_i(VALUE key, VALUE value, VALUE arg)
+{
+  mysql_client_wrapper *wrapper = (mysql_client_wrapper *)arg;
+  rb_encoding *enc = rb_to_encoding(wrapper->encoding);
+  key = rb_str_export_to_enc(key, enc);
+  value = rb_str_export_to_enc(value, enc);
+
+  mysql_options4(wrapper->client, MYSQL_OPT_CONNECT_ATTR_ADD, StringValueCStr(key), StringValueCStr(value));
+  return ST_CONTINUE;
+}
+#endif
+
+static VALUE rb_mysql_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE port, VALUE database, VALUE socket, VALUE flags, VALUE conn_attrs) {
   struct nogvl_connect_args args;
+  time_t start_time, end_time, elapsed_time, connect_timeout;
+  VALUE rv;
   GET_CLIENT(self);
 
-  args.host = NIL_P(host) ? "localhost" : StringValuePtr(host);
-  args.unix_socket = NIL_P(socket) ? NULL : StringValuePtr(socket);
-  args.port = NIL_P(port) ? 3306 : NUM2INT(port);
-  args.user = NIL_P(user) ? NULL : StringValuePtr(user);
-  args.passwd = NIL_P(pass) ? NULL : StringValuePtr(pass);
-  args.db = NIL_P(database) ? NULL : StringValuePtr(database);
-  args.mysql = wrapper->client;
+  args.host        = NIL_P(host)     ? NULL : StringValueCStr(host);
+  args.unix_socket = NIL_P(socket)   ? NULL : StringValueCStr(socket);
+  args.port        = NIL_P(port)     ? 0    : NUM2INT(port);
+  args.user        = NIL_P(user)     ? NULL : StringValueCStr(user);
+  args.passwd      = NIL_P(pass)     ? NULL : StringValueCStr(pass);
+  args.db          = NIL_P(database) ? NULL : StringValueCStr(database);
+  args.mysql       = wrapper->client;
   args.client_flag = NUM2ULONG(flags);
 
-  if (rb_thread_blocking_region(nogvl_connect, &args, RUBY_UBF_IO, 0) == Qfalse) {
-    // unable to connect
-    return rb_raise_mysql2_error(wrapper);
+#ifdef CLIENT_CONNECT_ATTRS
+  mysql_options(wrapper->client, MYSQL_OPT_CONNECT_ATTR_RESET, 0);
+  rb_hash_foreach(conn_attrs, opt_connect_attr_add_i, (VALUE)wrapper);
+#endif
+
+  if (wrapper->connect_timeout)
+    time(&start_time);
+  rv = (VALUE) rb_thread_call_without_gvl(nogvl_connect, &args, RUBY_UBF_IO, 0);
+  if (rv == Qfalse) {
+    while (rv == Qfalse && errno == EINTR) {
+      if (wrapper->connect_timeout) {
+        time(&end_time);
+        /* avoid long connect timeout from system time changes */
+        if (end_time < start_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--;
+        if (elapsed_time >= (time_t)wrapper->connect_timeout)
+          break;
+        connect_timeout = wrapper->connect_timeout - elapsed_time;
+        mysql_options(wrapper->client, MYSQL_OPT_CONNECT_TIMEOUT, &connect_timeout);
+      }
+      errno = 0;
+      rv = (VALUE) rb_thread_call_without_gvl(nogvl_connect, &args, RUBY_UBF_IO, 0);
+    }
+    /* restore the connect timeout for reconnecting */
+    if (wrapper->connect_timeout)
+      mysql_options(wrapper->client, MYSQL_OPT_CONNECT_TIMEOUT, &wrapper->connect_timeout);
+    if (rv == Qfalse)
+      rb_raise_mysql2_error(wrapper);
   }
 
+  wrapper->server_version = mysql_get_server_version(wrapper->client);
   return self;
 }
 
 /*
- * Immediately disconnect from the server, normally the garbage collector
+ * Immediately disconnect from the server; normally the garbage collector
  * will disconnect automatically when a connection is no longer needed.
  * Explicitly closing this will free up server resources sooner than waiting
  * for the garbage collector.
+ *
+ * @return [nil]
  */
 static VALUE rb_mysql_client_close(VALUE self) {
   GET_CLIENT(self);
 
-  if (!wrapper->closed) {
-    rb_thread_blocking_region(nogvl_close, wrapper, RUBY_UBF_IO, 0);
+  if (wrapper->client) {
+    rb_thread_call_without_gvl(nogvl_close, wrapper, RUBY_UBF_IO, 0);
   }
 
   return Qnil;
 }
 
+/* call-seq:
+ *    client.closed?
+ *
+ * @return [Boolean]
+ */
+static VALUE rb_mysql_client_closed(VALUE self) {
+  GET_CLIENT(self);
+  return CONNECTED(wrapper) ? Qfalse : Qtrue;
+}
+
 /*
  * mysql_send_query is unlikely to block since most queries are small
  * enough to fit in a socket buffer, but sometimes large UPDATE and
  * INSERTs will cause the process to block
  */
-static VALUE nogvl_send_query(void *ptr) {
+static void *nogvl_send_query(void *ptr) {
   struct nogvl_send_query_args *args = ptr;
   int rv;
-  const char *sql = StringValuePtr(args->sql);
-  long sql_len = RSTRING_LEN(args->sql);
 
-  rv = mysql_send_query(args->mysql, sql, sql_len);
+  rv = mysql_send_query(args->mysql, args->sql_ptr, args->sql_len);
 
-  return rv == 0 ? Qtrue : Qfalse;
+  return (void*)(rv == 0 ? Qtrue : Qfalse);
+}
+
+static VALUE do_send_query(void *args) {
+  struct nogvl_send_query_args *query_args = args;
+  mysql_client_wrapper *wrapper = query_args->wrapper;
+  if ((VALUE)rb_thread_call_without_gvl(nogvl_send_query, args, RUBY_UBF_IO, 0) == Qfalse) {
+    /* an error occurred, we're not active anymore */
+    wrapper->active_thread = Qnil;
+    rb_raise_mysql2_error(wrapper);
+  }
+  return Qnil;
 }
 
 /*
@@ -254,117 +524,130 @@ static VALUE nogvl_send_query(void *ptr) {
  * response can overflow the socket buffers and cause us to eventually
  * block while calling mysql_read_query_result
  */
-static VALUE nogvl_read_query_result(void *ptr) {
+static void *nogvl_read_query_result(void *ptr) {
   MYSQL * client = ptr;
   my_bool res = mysql_read_query_result(client);
 
-  return res == 0 ? Qtrue : Qfalse;
+  return (void *)(res == 0 ? Qtrue : Qfalse);
+}
+
+static void *nogvl_do_result(void *ptr, char use_result) {
+  mysql_client_wrapper *wrapper = ptr;
+  MYSQL_RES *result;
+
+  if (use_result) {
+    result = mysql_use_result(wrapper->client);
+  } else {
+    result = mysql_store_result(wrapper->client);
+  }
+
+  /* once our result is stored off, this connection is
+     ready for another command to be issued */
+  wrapper->active_thread = Qnil;
+
+  return result;
 }
 
 /* mysql_store_result may (unlikely) read rows off the socket */
-static VALUE nogvl_store_result(void *ptr) {
-  MYSQL * client = ptr;
-  return (VALUE)mysql_store_result(client);
+static void *nogvl_store_result(void *ptr) {
+  return nogvl_do_result(ptr, 0);
 }
 
+static void *nogvl_use_result(void *ptr) {
+  return nogvl_do_result(ptr, 1);
+}
+
+/* call-seq:
+ *    client.async_result
+ *
+ * Returns the result for the last async issued query.
+ */
 static VALUE rb_mysql_client_async_result(VALUE self) {
   MYSQL_RES * result;
   VALUE resultObj;
-#ifdef HAVE_RUBY_ENCODING_H
-  mysql2_result_wrapper * result_wrapper;
-#endif
+  VALUE current, is_streaming;
   GET_CLIENT(self);
 
-  REQUIRE_OPEN_DB(wrapper);
-  if (rb_thread_blocking_region(nogvl_read_query_result, wrapper->client, RUBY_UBF_IO, 0) == Qfalse) {
-    // an error occurred, mark this connection inactive
-    MARK_CONN_INACTIVE(self);
-    return rb_raise_mysql2_error(wrapper);
-  }
+  /* if we're not waiting on a result, do nothing */
+  if (NIL_P(wrapper->active_thread))
+    return Qnil;
 
-  result = (MYSQL_RES *)rb_thread_blocking_region(nogvl_store_result, wrapper->client, RUBY_UBF_IO, 0);
+  REQUIRE_CONNECTED(wrapper);
+  if ((VALUE)rb_thread_call_without_gvl(nogvl_read_query_result, wrapper->client, RUBY_UBF_IO, 0) == Qfalse) {
+    /* an error occurred, mark this connection inactive */
+    wrapper->active_thread = Qnil;
+    rb_raise_mysql2_error(wrapper);
+  }
 
-  // we have our result, mark this connection inactive
-  MARK_CONN_INACTIVE(self);
+  is_streaming = rb_hash_aref(rb_iv_get(self, "@current_query_options"), sym_stream);
+  if (is_streaming == Qtrue) {
+    result = (MYSQL_RES *)rb_thread_call_without_gvl(nogvl_use_result, wrapper, RUBY_UBF_IO, 0);
+  } else {
+    result = (MYSQL_RES *)rb_thread_call_without_gvl(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
+  }
 
   if (result == NULL) {
-    if (mysql_field_count(wrapper->client) != 0) {
+    if (mysql_errno(wrapper->client) != 0) {
+      wrapper->active_thread = Qnil;
       rb_raise_mysql2_error(wrapper);
     }
+    /* no data and no error, so query was not a SELECT */
     return Qnil;
   }
 
-  resultObj = rb_mysql_result_to_obj(result);
-  // pass-through query options for result construction later
-  rb_iv_set(resultObj, "@query_options", rb_funcall(rb_iv_get(self, "@query_options"), rb_intern("dup"), 0));
+  // Duplicate the options hash and put the copy in the Result object
+  current = rb_hash_dup(rb_iv_get(self, "@current_query_options"));
+  (void)RB_GC_GUARD(current);
+  Check_Type(current, T_HASH);
+  resultObj = rb_mysql_result_to_obj(self, wrapper->encoding, current, result, Qnil);
+
+  rb_mysql_set_server_query_flags(wrapper->client, resultObj);
 
-#ifdef HAVE_RUBY_ENCODING_H
-  GetMysql2Result(resultObj, result_wrapper);
-  result_wrapper->encoding = wrapper->encoding;
-#endif
   return resultObj;
 }
 
-static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
-  struct nogvl_send_query_args args;
-  fd_set fdset;
-  int fd, retval;
-  int async = 0;
-  VALUE opts, defaults, read_timeout;
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *conn_enc;
-#endif
-  struct timeval tv;
-  struct timeval* tvp;
-  long int sec;
-  VALUE result;
-  GET_CLIENT(self);
-
-  REQUIRE_OPEN_DB(wrapper);
-  args.mysql = wrapper->client;
+#ifndef _WIN32
+struct async_query_args {
+  int fd;
+  VALUE self;
+};
 
-  // see if this connection is still waiting on a result from a previous query
-  if (wrapper->active == 0) {
-    // mark this connection active
-    wrapper->active = 1;
-  } else {
-    rb_raise(cMysql2Error, "This connection is still waiting for a result, try again once you have the result");
-  }
+static VALUE disconnect_and_raise(VALUE self, VALUE error) {
+  GET_CLIENT(self);
 
-  defaults = rb_iv_get(self, "@query_options");
-  if (rb_scan_args(argc, argv, "11", &args.sql, &opts) == 2) {
-    opts = rb_funcall(defaults, intern_merge, 1, opts);
-    rb_iv_set(self, "@query_options", opts);
+  wrapper->active_thread = Qnil;
 
-    if (rb_hash_aref(opts, sym_async) == Qtrue) {
-      async = 1;
+  /* Invalidate the MySQL socket to prevent further communication.
+   * The GC will come along later and call mysql_close to free it.
+   */
+  if (CONNECTED(wrapper)) {
+    if (invalidate_fd(wrapper->client->net.fd) == Qfalse) {
+      fprintf(stderr, "[WARN] mysql2 failed to invalidate FD safely, closing unsafely\n");
+      close(wrapper->client->net.fd);
     }
-  } else {
-    opts = defaults;
+    wrapper->client->net.fd = -1;
   }
 
-  Check_Type(args.sql, T_STRING);
-#ifdef HAVE_RUBY_ENCODING_H
-  conn_enc = rb_to_encoding(wrapper->encoding);
-  // ensure the string is in the encoding the connection is expecting
-  args.sql = rb_str_export_to_enc(args.sql, conn_enc);
-#endif
+  rb_exc_raise(error);
+}
 
-  if (rb_thread_blocking_region(nogvl_send_query, &args, RUBY_UBF_IO, 0) == Qfalse) {
-    // an error occurred, we're not active anymore
-    MARK_CONN_INACTIVE(self);
-    return rb_raise_mysql2_error(wrapper);
-  }
+static VALUE do_query(void *args) {
+  struct async_query_args *async_args = args;
+  struct timeval tv;
+  struct timeval *tvp;
+  long int sec;
+  int retval;
+  VALUE read_timeout;
 
-  read_timeout = rb_iv_get(self, "@read_timeout");
+  read_timeout = rb_iv_get(async_args->self, "@read_timeout");
 
   tvp = NULL;
   if (!NIL_P(read_timeout)) {
     Check_Type(read_timeout, T_FIXNUM);
     tvp = &tv;
     sec = FIX2INT(read_timeout);
-    // TODO: support partial seconds?
-    // also, this check is here for sanity, we also check up in Ruby
+    /* TODO: support partial seconds?
+       also, this check is here for sanity, we also check up in Ruby */
     if (sec >= 0) {
       tvp->tv_sec = sec;
     } else {
@@ -373,176 +656,372 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
     tvp->tv_usec = 0;
   }
 
-  if (!async) {
-    // the below code is largely from do_mysql
-    // http://github.com/datamapper/do
-    fd = wrapper->client->net.fd;
-    for(;;) {
-      int fd_set_fd = fd;
+  for(;;) {
+    retval = rb_wait_for_single_fd(async_args->fd, RB_WAITFD_IN, tvp);
 
-#ifdef _WIN32
-      WSAPROTOCOL_INFO wsa_pi;
-      // dupicate the SOCKET from libmysql
-      int r = WSADuplicateSocket(fd, GetCurrentProcessId(), &wsa_pi);
-      SOCKET s = WSASocket(wsa_pi.iAddressFamily, wsa_pi.iSocketType, wsa_pi.iProtocol, &wsa_pi, 0, 0);
-      // create the CRT fd so ruby can get back to the SOCKET
-      fd_set_fd = _open_osfhandle(s, O_RDWR|O_BINARY);
-#endif
+    if (retval == 0) {
+      rb_raise(cMysql2TimeoutError, "Timeout waiting for a response from the last query. (waited %d seconds)", FIX2INT(read_timeout));
+    }
 
-      FD_ZERO(&fdset);
-      FD_SET(fd_set_fd, &fdset);
+    if (retval < 0) {
+      rb_sys_fail(0);
+    }
 
-      retval = rb_thread_select(fd_set_fd + 1, &fdset, NULL, NULL, tvp);
+    if (retval > 0) {
+      break;
+    }
+  }
 
-#ifdef _WIN32
-      // cleanup the CRT fd
-      _close(fd_set_fd);
-      // cleanup the duplicated SOCKET
-      closesocket(s);
+  return Qnil;
+}
 #endif
 
-      if (retval == 0) {
-        rb_raise(cMysql2Error, "Timeout waiting for a response from the last query. (waited %d seconds)", FIX2INT(read_timeout));
-      }
-
-      if (retval < 0) {
-        rb_sys_fail(0);
-      }
+static VALUE disconnect_and_mark_inactive(VALUE self) {
+  GET_CLIENT(self);
 
-      if (retval > 0) {
-        break;
+  /* Check if execution terminated while result was still being read. */
+  if (!NIL_P(wrapper->active_thread)) {
+    if (CONNECTED(wrapper)) {
+      /* Invalidate the MySQL socket to prevent further communication. */
+#ifndef _WIN32
+      if (invalidate_fd(wrapper->client->net.fd) == Qfalse) {
+        rb_warn("mysql2 failed to invalidate FD safely, closing unsafely\n");
+        close(wrapper->client->net.fd);
       }
+#else
+      close(wrapper->client->net.fd);
+#endif
+      wrapper->client->net.fd = -1;
     }
+    /* Skip mysql client check performed before command execution. */
+    wrapper->client->status = MYSQL_STATUS_READY;
+    wrapper->active_thread = Qnil;
+  }
 
-    result = rb_mysql_client_async_result(self);
+  return Qnil;
+}
 
-    return result;
+void rb_mysql_client_set_active_thread(VALUE self) {
+  VALUE thread_current = rb_thread_current();
+  GET_CLIENT(self);
+
+  // see if this connection is still waiting on a result from a previous query
+  if (NIL_P(wrapper->active_thread)) {
+    // mark this connection active
+    wrapper->active_thread = thread_current;
+  } else if (wrapper->active_thread == thread_current) {
+    rb_raise(cMysql2Error, "This connection is still waiting for a result, try again once you have the result");
   } else {
+    VALUE inspect = rb_inspect(wrapper->active_thread);
+    const char *thr = StringValueCStr(inspect);
+
+    rb_raise(cMysql2Error, "This connection is in use by: %s", thr);
+  }
+}
+
+/* call-seq:
+ *    client.abandon_results!
+ *
+ * When using MULTI_STATEMENTS support, calling this will throw
+ * away any unprocessed results as fast as it can in order to
+ * put the connection back into a state where queries can be issued
+ * again.
+ */
+static VALUE rb_mysql_client_abandon_results(VALUE self) {
+  MYSQL_RES *result;
+  int ret;
+
+  GET_CLIENT(self);
+
+  while (mysql_more_results(wrapper->client) == 1) {
+    ret = mysql_next_result(wrapper->client);
+    if (ret > 0) {
+      rb_raise_mysql2_error(wrapper);
+    }
+
+    result = (MYSQL_RES *)rb_thread_call_without_gvl(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
+
+    if (result != NULL) {
+      mysql_free_result(result);
+    }
+  }
+
+  return Qnil;
+}
+
+/* call-seq:
+ *    client.query(sql, options = {})
+ *
+ * Query the database with +sql+, with optional +options+.  For the possible
+ * options, see default_query_options on the Mysql2::Client class.
+ */
+static VALUE rb_mysql_query(VALUE self, VALUE sql, VALUE current) {
+#ifndef _WIN32
+  struct async_query_args async_args;
+#endif
+  struct nogvl_send_query_args args;
+  GET_CLIENT(self);
+
+  REQUIRE_CONNECTED(wrapper);
+  args.mysql = wrapper->client;
+
+  (void)RB_GC_GUARD(current);
+  Check_Type(current, T_HASH);
+  rb_iv_set(self, "@current_query_options", current);
+
+  Check_Type(sql, T_STRING);
+  /* ensure the string is in the encoding the connection is expecting */
+  args.sql = rb_str_export_to_enc(sql, rb_to_encoding(wrapper->encoding));
+  args.sql_ptr = RSTRING_PTR(args.sql);
+  args.sql_len = RSTRING_LEN(args.sql);
+  args.wrapper = wrapper;
+
+  rb_mysql_client_set_active_thread(self);
+
+#ifndef _WIN32
+  rb_rescue2(do_send_query, (VALUE)&args, disconnect_and_raise, self, rb_eException, (VALUE)0);
+
+  if (rb_hash_aref(current, sym_async) == Qtrue) {
     return Qnil;
+  } else {
+    async_args.fd = wrapper->client->net.fd;
+    async_args.self = self;
+
+    rb_rescue2(do_query, (VALUE)&async_args, disconnect_and_raise, self, rb_eException, (VALUE)0);
+
+    return rb_ensure(rb_mysql_client_async_result, self, disconnect_and_mark_inactive, self);
   }
+#else
+  do_send_query(&args);
+
+  /* this will just block until the result is ready */
+  return rb_ensure(rb_mysql_client_async_result, self, disconnect_and_mark_inactive, self);
+#endif
 }
 
+/* call-seq:
+ *    client.escape(string)
+ *
+ * Escape +string+ so that it may be used in a SQL statement.
+ */
 static VALUE rb_mysql_client_real_escape(VALUE self, VALUE str) {
   unsigned char *newStr;
   VALUE rb_str;
   unsigned long newLen, oldLen;
-#ifdef HAVE_RUBY_ENCODING_H
   rb_encoding *default_internal_enc;
   rb_encoding *conn_enc;
-#endif
   GET_CLIENT(self);
 
-  REQUIRE_OPEN_DB(wrapper);
+  REQUIRE_CONNECTED(wrapper);
   Check_Type(str, T_STRING);
-#ifdef HAVE_RUBY_ENCODING_H
   default_internal_enc = rb_default_internal_encoding();
   conn_enc = rb_to_encoding(wrapper->encoding);
-  // ensure the string is in the encoding the connection is expecting
+  /* ensure the string is in the encoding the connection is expecting */
   str = rb_str_export_to_enc(str, conn_enc);
-#endif
 
   oldLen = RSTRING_LEN(str);
   newStr = xmalloc(oldLen*2+1);
 
-  newLen = mysql_real_escape_string(wrapper->client, (char *)newStr, StringValuePtr(str), oldLen);
+  newLen = mysql_real_escape_string(wrapper->client, (char *)newStr, RSTRING_PTR(str), oldLen);
   if (newLen == oldLen) {
-    // no need to return a new ruby string if nothing changed
+    /* no need to return a new ruby string if nothing changed */
+    if (default_internal_enc) {
+      str = rb_str_export_to_enc(str, default_internal_enc);
+    }
     xfree(newStr);
     return str;
   } else {
     rb_str = rb_str_new((const char*)newStr, newLen);
-#ifdef HAVE_RUBY_ENCODING_H
     rb_enc_associate(rb_str, conn_enc);
     if (default_internal_enc) {
       rb_str = rb_str_export_to_enc(rb_str, default_internal_enc);
     }
-#endif
     xfree(newStr);
     return rb_str;
   }
 }
 
-static VALUE rb_mysql_client_info(VALUE self) {
-  VALUE version, client_info;
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *default_internal_enc;
-  rb_encoding *conn_enc;
-#endif
+static VALUE _mysql_client_options(VALUE self, int opt, VALUE value) {
+  int result;
+  const void *retval = NULL;
+  unsigned int intval = 0;
+  const char * charval = NULL;
+  my_bool boolval;
+
   GET_CLIENT(self);
-  version = rb_hash_new();
 
-#ifdef HAVE_RUBY_ENCODING_H
-  default_internal_enc = rb_default_internal_encoding();
-  conn_enc = rb_to_encoding(wrapper->encoding);
+  REQUIRE_NOT_CONNECTED(wrapper);
+
+  if (NIL_P(value))
+      return Qfalse;
+
+  switch(opt) {
+    case MYSQL_OPT_CONNECT_TIMEOUT:
+      intval = NUM2UINT(value);
+      retval = &intval;
+      break;
+
+    case MYSQL_OPT_READ_TIMEOUT:
+      intval = NUM2UINT(value);
+      retval = &intval;
+      break;
+
+    case MYSQL_OPT_WRITE_TIMEOUT:
+      intval = NUM2UINT(value);
+      retval = &intval;
+      break;
+
+    case MYSQL_OPT_LOCAL_INFILE:
+      intval = (value == Qfalse ? 0 : 1);
+      retval = &intval;
+      break;
+
+    case MYSQL_OPT_RECONNECT:
+      boolval = (value == Qfalse ? 0 : 1);
+      retval = &boolval;
+      break;
+
+#ifdef MYSQL_SECURE_AUTH
+    case MYSQL_SECURE_AUTH:
+      boolval = (value == Qfalse ? 0 : 1);
+      retval = &boolval;
+      break;
 #endif
 
-  rb_hash_aset(version, sym_id, LONG2NUM(mysql_get_client_version()));
-  client_info = rb_str_new2(mysql_get_client_info());
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_associate(client_info, conn_enc);
-  if (default_internal_enc) {
-    client_info = rb_str_export_to_enc(client_info, default_internal_enc);
-  }
+    case MYSQL_READ_DEFAULT_FILE:
+      charval = (const char *)StringValueCStr(value);
+      retval  = charval;
+      break;
+
+    case MYSQL_READ_DEFAULT_GROUP:
+      charval = (const char *)StringValueCStr(value);
+      retval  = charval;
+      break;
+
+    case MYSQL_INIT_COMMAND:
+      charval = (const char *)StringValueCStr(value);
+      retval  = charval;
+      break;
+
+#ifdef HAVE_CONST_MYSQL_ENABLE_CLEARTEXT_PLUGIN
+    case MYSQL_ENABLE_CLEARTEXT_PLUGIN:
+      boolval = (value == Qfalse ? 0 : 1);
+      retval = &boolval;
+      break;
 #endif
-  rb_hash_aset(version, sym_version, client_info);
-  return version;
+
+    default:
+      return Qfalse;
+  }
+
+  result = mysql_options(wrapper->client, opt, retval);
+
+  /* Zero means success */
+  if (result != 0) {
+    rb_warn("%s\n", mysql_error(wrapper->client));
+  } else {
+    /* Special case for options that are stored in the wrapper struct */
+    switch (opt) {
+      case MYSQL_OPT_RECONNECT:
+        wrapper->reconnect_enabled = boolval;
+        break;
+      case MYSQL_OPT_CONNECT_TIMEOUT:
+        wrapper->connect_timeout = intval;
+        break;
+    }
+  }
+
+  return (result == 0) ? Qtrue : Qfalse;
 }
 
+/* call-seq:
+ *    client.info
+ *
+ * Returns a string that represents the client library version.
+ */
+static VALUE rb_mysql_client_info(RB_MYSQL_UNUSED VALUE klass) {
+  VALUE version_info, version, header_version;
+  version_info = rb_hash_new();
+
+  version = rb_str_new2(mysql_get_client_info());
+  header_version = rb_str_new2(MYSQL_LINK_VERSION);
+
+  rb_enc_associate(version, rb_usascii_encoding());
+  rb_enc_associate(header_version, rb_usascii_encoding());
+
+  rb_hash_aset(version_info, sym_id, LONG2NUM(mysql_get_client_version()));
+  rb_hash_aset(version_info, sym_version, version);
+  rb_hash_aset(version_info, sym_header_version, header_version);
+
+  return version_info;
+}
+
+/* call-seq:
+ *    client.server_info
+ *
+ * Returns a string that represents the server version number
+ */
 static VALUE rb_mysql_client_server_info(VALUE self) {
   VALUE version, server_info;
-#ifdef HAVE_RUBY_ENCODING_H
   rb_encoding *default_internal_enc;
   rb_encoding *conn_enc;
-#endif
   GET_CLIENT(self);
 
-  REQUIRE_OPEN_DB(wrapper);
-#ifdef HAVE_RUBY_ENCODING_H
+  REQUIRE_CONNECTED(wrapper);
   default_internal_enc = rb_default_internal_encoding();
   conn_enc = rb_to_encoding(wrapper->encoding);
-#endif
 
   version = rb_hash_new();
   rb_hash_aset(version, sym_id, LONG2FIX(mysql_get_server_version(wrapper->client)));
   server_info = rb_str_new2(mysql_get_server_info(wrapper->client));
-#ifdef HAVE_RUBY_ENCODING_H
   rb_enc_associate(server_info, conn_enc);
   if (default_internal_enc) {
     server_info = rb_str_export_to_enc(server_info, default_internal_enc);
   }
-#endif
   rb_hash_aset(version, sym_version, server_info);
   return version;
 }
 
+/* call-seq:
+ *    client.socket
+ *
+ * Return the file descriptor number for this client.
+ */
+#ifndef _WIN32
 static VALUE rb_mysql_client_socket(VALUE self) {
   GET_CLIENT(self);
-  REQUIRE_OPEN_DB(wrapper);
-  int fd_set_fd = wrapper->client->net.fd;
-#ifdef _WIN32
-  WSAPROTOCOL_INFO wsa_pi;
-  // dupicate the SOCKET from libmysql
-  int r = WSADuplicateSocket(wrapper->client->net.fd, GetCurrentProcessId(), &wsa_pi);
-  SOCKET s = WSASocket(wsa_pi.iAddressFamily, wsa_pi.iSocketType, wsa_pi.iProtocol, &wsa_pi, 0, 0);
-  // create the CRT fd so ruby can get back to the SOCKET
-  fd_set_fd = _open_osfhandle(s, O_RDWR|O_BINARY);
-  return INT2NUM(fd_set_fd);
+  REQUIRE_CONNECTED(wrapper);
+  return INT2NUM(wrapper->client->net.fd);
+}
 #else
-  return INT2NUM(fd_set_fd);
-#endif
+static VALUE rb_mysql_client_socket(RB_MYSQL_UNUSED VALUE self) {
+  rb_raise(cMysql2Error, "Raw access to the mysql file descriptor isn't supported on Windows");
 }
+#endif
 
+/* call-seq:
+ *    client.last_id
+ *
+ * Returns the value generated for an AUTO_INCREMENT column by the previous INSERT or UPDATE
+ * statement.
+ */
 static VALUE rb_mysql_client_last_id(VALUE self) {
   GET_CLIENT(self);
-  REQUIRE_OPEN_DB(wrapper);
+  REQUIRE_CONNECTED(wrapper);
   return ULL2NUM(mysql_insert_id(wrapper->client));
 }
 
+/* call-seq:
+ *    client.affected_rows
+ *
+ * returns the number of rows changed, deleted, or inserted by the last statement
+ * if it was an UPDATE, DELETE, or INSERT.
+ */
 static VALUE rb_mysql_client_affected_rows(VALUE self) {
   my_ulonglong retVal;
   GET_CLIENT(self);
 
-  REQUIRE_OPEN_DB(wrapper);
+  REQUIRE_CONNECTED(wrapper);
   retVal = mysql_affected_rows(wrapper->client);
   if (retVal == (my_ulonglong)-1) {
     rb_raise_mysql2_error(wrapper);
@@ -550,92 +1029,270 @@ static VALUE rb_mysql_client_affected_rows(VALUE self) {
   return ULL2NUM(retVal);
 }
 
+/* call-seq:
+ *    client.thread_id
+ *
+ * Returns the thread ID of the current connection.
+ */
 static VALUE rb_mysql_client_thread_id(VALUE self) {
   unsigned long retVal;
   GET_CLIENT(self);
 
-  REQUIRE_OPEN_DB(wrapper);
+  REQUIRE_CONNECTED(wrapper);
   retVal = mysql_thread_id(wrapper->client);
   return ULL2NUM(retVal);
 }
 
-static VALUE nogvl_ping(void *ptr)
+static void *nogvl_select_db(void *ptr) {
+  struct nogvl_select_db_args *args = ptr;
+
+  if (mysql_select_db(args->mysql, args->db) == 0)
+    return (void *)Qtrue;
+  else
+    return (void *)Qfalse;
+}
+
+/* call-seq:
+ *    client.select_db(name)
+ *
+ * Causes the database specified by +name+ to become the default (current)
+ * database on the connection specified by mysql.
+ */
+static VALUE rb_mysql_client_select_db(VALUE self, VALUE db)
 {
+  struct nogvl_select_db_args args;
+
+  GET_CLIENT(self);
+  REQUIRE_CONNECTED(wrapper);
+
+  args.mysql = wrapper->client;
+  args.db = StringValueCStr(db);
+
+  if (rb_thread_call_without_gvl(nogvl_select_db, &args, RUBY_UBF_IO, 0) == Qfalse)
+    rb_raise_mysql2_error(wrapper);
+
+  return db;
+}
+
+static void *nogvl_ping(void *ptr) {
   MYSQL *client = ptr;
 
-  return mysql_ping(client) == 0 ? Qtrue : Qfalse;
+  return (void *)(mysql_ping(client) == 0 ? Qtrue : Qfalse);
 }
 
+/* call-seq:
+ *    client.ping
+ *
+ * Checks whether the connection to the server is working. If the connection
+ * has gone down and auto-reconnect is enabled an attempt to reconnect is made.
+ * If the connection is down and auto-reconnect is disabled, ping returns an
+ * error.
+ */
 static VALUE rb_mysql_client_ping(VALUE self) {
   GET_CLIENT(self);
 
-  if (wrapper->closed) {
+  if (!CONNECTED(wrapper)) {
     return Qfalse;
   } else {
-    return rb_thread_blocking_region(nogvl_ping, wrapper->client, RUBY_UBF_IO, 0);
+    return (VALUE)rb_thread_call_without_gvl(nogvl_ping, wrapper->client, RUBY_UBF_IO, 0);
   }
 }
 
-#ifdef HAVE_RUBY_ENCODING_H
-static VALUE rb_mysql_client_encoding(VALUE self) {
+/* call-seq:
+ *    client.set_server_option(value)
+ *
+ * Enables or disables an option for the connection.
+ * Read https://dev.mysql.com/doc/refman/5.7/en/mysql-set-server-option.html
+ * for more information.
+ */
+static VALUE rb_mysql_client_set_server_option(VALUE self, VALUE value) {
   GET_CLIENT(self);
-  return wrapper->encoding;
+
+  if (mysql_set_server_option(wrapper->client, NUM2INT(value)) == 0) {
+    return Qtrue;
+  } else {
+    return Qfalse;
+  }
 }
-#endif
 
-static VALUE set_reconnect(VALUE self, VALUE value) {
-  my_bool reconnect;
+/* call-seq:
+ *    client.more_results?
+ *
+ * Returns true or false if there are more results to process.
+ */
+static VALUE rb_mysql_client_more_results(VALUE self)
+{
+  GET_CLIENT(self);
+  if (mysql_more_results(wrapper->client) == 0)
+    return Qfalse;
+  else
+    return Qtrue;
+}
+
+/* call-seq:
+ *    client.next_result
+ *
+ * Fetch the next result set from the server.
+ * Returns nothing.
+ */
+static VALUE rb_mysql_client_next_result(VALUE self)
+{
+    int ret;
+    GET_CLIENT(self);
+    ret = mysql_next_result(wrapper->client);
+    if (ret > 0) {
+      rb_raise_mysql2_error(wrapper);
+      return Qfalse;
+    } else if (ret == 0) {
+      return Qtrue;
+    } else {
+      return Qfalse;
+    }
+}
+
+/* call-seq:
+ *    client.store_result
+ *
+ * Return the next result object from a query which
+ * yielded multiple result sets.
+ */
+static VALUE rb_mysql_client_store_result(VALUE self)
+{
+  MYSQL_RES * result;
+  VALUE resultObj;
+  VALUE current;
   GET_CLIENT(self);
 
-  if(!NIL_P(value)) {
-    reconnect = value == Qfalse ? 0 : 1;
+  result = (MYSQL_RES *)rb_thread_call_without_gvl(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
 
-    /* set default reconnect behavior */
-    if (mysql_options(wrapper->client, MYSQL_OPT_RECONNECT, &reconnect)) {
-      /* TODO: warning - unable to set reconnect behavior */
-      rb_warn("%s\n", mysql_error(wrapper->client));
+  if (result == NULL) {
+    if (mysql_errno(wrapper->client) != 0) {
+      rb_raise_mysql2_error(wrapper);
     }
+    /* no data and no error, so query was not a SELECT */
+    return Qnil;
   }
-  return value;
+
+  // Duplicate the options hash and put the copy in the Result object
+  current = rb_hash_dup(rb_iv_get(self, "@current_query_options"));
+  (void)RB_GC_GUARD(current);
+  Check_Type(current, T_HASH);
+  resultObj = rb_mysql_result_to_obj(self, wrapper->encoding, current, result, Qnil);
+
+  return resultObj;
 }
 
-static VALUE set_connect_timeout(VALUE self, VALUE value) {
-  unsigned int connect_timeout = 0;
+/* call-seq:
+ *    client.encoding
+ *
+ * Returns the encoding set on the client.
+ */
+static VALUE rb_mysql_client_encoding(VALUE self) {
   GET_CLIENT(self);
+  return wrapper->encoding;
+}
 
-  if(!NIL_P(value)) {
-    connect_timeout = NUM2INT(value);
-    if(0 == connect_timeout) return value;
+/* call-seq:
+ *    client.automatic_close?
+ *
+ * @return [Boolean]
+ */
+static VALUE get_automatic_close(VALUE self) {
+  GET_CLIENT(self);
+  return wrapper->automatic_close ? Qtrue : Qfalse;
+}
 
-    /* set default connection timeout behavior */
-    if (mysql_options(wrapper->client, MYSQL_OPT_CONNECT_TIMEOUT, &connect_timeout)) {
-      /* TODO: warning - unable to set connection timeout */
-      rb_warn("%s\n", mysql_error(wrapper->client));
-    }
+/* call-seq:
+ *    client.automatic_close = false
+ *
+ * Set this to +false+ to leave the connection open after it is garbage
+ * collected. To avoid "Aborted connection" errors on the server, explicitly
+ * call +close+ when the connection is no longer needed.
+ *
+ * @see http://dev.mysql.com/doc/en/communication-errors.html
+ */
+static VALUE set_automatic_close(VALUE self, VALUE value) {
+  GET_CLIENT(self);
+  if (RTEST(value)) {
+    wrapper->automatic_close = 1;
+  } else {
+#ifndef _WIN32
+    wrapper->automatic_close = 0;
+#else
+    rb_warn("Connections are always closed by garbage collector on Windows");
+#endif
   }
   return value;
 }
 
+/* call-seq:
+ *    client.reconnect = true
+ *
+ * Enable or disable the automatic reconnect behavior of libmysql.
+ * Read http://dev.mysql.com/doc/refman/5.5/en/auto-reconnect.html
+ * for more information.
+ */
+static VALUE set_reconnect(VALUE self, VALUE value) {
+  return _mysql_client_options(self, MYSQL_OPT_RECONNECT, value);
+}
+
+static VALUE set_local_infile(VALUE self, VALUE value) {
+  return _mysql_client_options(self, MYSQL_OPT_LOCAL_INFILE, value);
+}
+
+static VALUE set_connect_timeout(VALUE self, VALUE value) {
+  long int sec;
+  Check_Type(value, T_FIXNUM);
+  sec = FIX2INT(value);
+  if (sec < 0) {
+    rb_raise(cMysql2Error, "connect_timeout must be a positive integer, you passed %ld", sec);
+  }
+  return _mysql_client_options(self, MYSQL_OPT_CONNECT_TIMEOUT, value);
+}
+
+static VALUE set_read_timeout(VALUE self, VALUE value) {
+  long int sec;
+  Check_Type(value, T_FIXNUM);
+  sec = FIX2INT(value);
+  if (sec < 0) {
+    rb_raise(cMysql2Error, "read_timeout must be a positive integer, you passed %ld", sec);
+  }
+  /* Set the instance variable here even though _mysql_client_options
+     might not succeed, because the timeout is used in other ways
+     elsewhere */
+  rb_iv_set(self, "@read_timeout", value);
+  return _mysql_client_options(self, MYSQL_OPT_READ_TIMEOUT, value);
+}
+
+static VALUE set_write_timeout(VALUE self, VALUE value) {
+  long int sec;
+  Check_Type(value, T_FIXNUM);
+  sec = FIX2INT(value);
+  if (sec < 0) {
+    rb_raise(cMysql2Error, "write_timeout must be a positive integer, you passed %ld", sec);
+  }
+  return _mysql_client_options(self, MYSQL_OPT_WRITE_TIMEOUT, value);
+}
+
 static VALUE set_charset_name(VALUE self, VALUE value) {
-  char * charset_name;
-#ifdef HAVE_RUBY_ENCODING_H
-  VALUE new_encoding;
-#endif
+  char *charset_name;
+  const struct mysql2_mysql_enc_name_to_rb_map *mysql2rb;
+  rb_encoding *enc;
+  VALUE rb_enc;
   GET_CLIENT(self);
 
-#ifdef HAVE_RUBY_ENCODING_H
-  new_encoding = rb_funcall(cMysql2Client, intern_encoding_from_charset, 1, value);
-  if (new_encoding == Qnil) {
+  Check_Type(value, T_STRING);
+  charset_name = RSTRING_PTR(value);
+
+  mysql2rb = mysql2_mysql_enc_name_to_rb(charset_name, (unsigned int)RSTRING_LEN(value));
+  if (mysql2rb == NULL || mysql2rb->rb_name == NULL) {
     VALUE inspect = rb_inspect(value);
     rb_raise(cMysql2Error, "Unsupported charset: '%s'", RSTRING_PTR(inspect));
   } else {
-    if (wrapper->encoding == Qnil) {
-      wrapper->encoding = new_encoding;
-    }
+    enc = rb_enc_find(mysql2rb->rb_name);
+    rb_enc = rb_enc_from_encoding(enc);
+    wrapper->encoding = rb_enc;
   }
-#endif
-
-  charset_name = StringValuePtr(value);
 
   if (mysql_options(wrapper->client, MYSQL_SET_CHARSET_NAME, charset_name)) {
     /* TODO: warning - unable to set charset */
@@ -648,192 +1305,347 @@ static VALUE set_charset_name(VALUE self, VALUE value) {
 static VALUE set_ssl_options(VALUE self, VALUE key, VALUE cert, VALUE ca, VALUE capath, VALUE cipher) {
   GET_CLIENT(self);
 
-  if(!NIL_P(ca) || !NIL_P(key)) {
-    mysql_ssl_set(wrapper->client,
-        NIL_P(key) ? NULL : StringValuePtr(key),
-        NIL_P(cert) ? NULL : StringValuePtr(cert),
-        NIL_P(ca) ? NULL : StringValuePtr(ca),
-        NIL_P(capath) ? NULL : StringValuePtr(capath),
-        NIL_P(cipher) ? NULL : StringValuePtr(cipher));
-  }
+  mysql_ssl_set(wrapper->client,
+      NIL_P(key)    ? NULL : StringValueCStr(key),
+      NIL_P(cert)   ? NULL : StringValueCStr(cert),
+      NIL_P(ca)     ? NULL : StringValueCStr(ca),
+      NIL_P(capath) ? NULL : StringValueCStr(capath),
+      NIL_P(cipher) ? NULL : StringValueCStr(cipher));
 
   return self;
 }
 
-static VALUE init_connection(VALUE self) {
+static VALUE set_secure_auth(VALUE self, VALUE value) {
+/* This option was deprecated in MySQL 5.x and removed in MySQL 8.0 */
+#ifdef MYSQL_SECURE_AUTH
+  return _mysql_client_options(self, MYSQL_SECURE_AUTH, value);
+#else
+  return Qfalse;
+#endif
+}
+
+static VALUE set_read_default_file(VALUE self, VALUE value) {
+  return _mysql_client_options(self, MYSQL_READ_DEFAULT_FILE, value);
+}
+
+static VALUE set_read_default_group(VALUE self, VALUE value) {
+  return _mysql_client_options(self, MYSQL_READ_DEFAULT_GROUP, value);
+}
+
+static VALUE set_init_command(VALUE self, VALUE value) {
+  return _mysql_client_options(self, MYSQL_INIT_COMMAND, value);
+}
+
+static VALUE set_enable_cleartext_plugin(VALUE self, VALUE value) {
+#ifdef HAVE_CONST_MYSQL_ENABLE_CLEARTEXT_PLUGIN
+  return _mysql_client_options(self, MYSQL_ENABLE_CLEARTEXT_PLUGIN, value);
+#else
+  rb_raise(cMysql2Error, "enable-cleartext-plugin is not available, you may need a newer MySQL client library");
+#endif
+}
+
+static VALUE initialize_ext(VALUE self) {
   GET_CLIENT(self);
 
-  if (rb_thread_blocking_region(nogvl_init, wrapper->client, RUBY_UBF_IO, 0) == Qfalse) {
+  if ((VALUE)rb_thread_call_without_gvl(nogvl_init, wrapper, RUBY_UBF_IO, 0) == Qfalse) {
     /* TODO: warning - not enough memory? */
-    return rb_raise_mysql2_error(wrapper);
+    rb_raise_mysql2_error(wrapper);
   }
 
-  wrapper->closed = 0;
+  wrapper->initialized = 1;
   return self;
 }
 
+/* call-seq: client.prepare # => Mysql2::Statement
+ *
+ * Create a new prepared statement.
+ */
+static VALUE rb_mysql_client_prepare_statement(VALUE self, VALUE sql) {
+  GET_CLIENT(self);
+  REQUIRE_CONNECTED(wrapper);
+
+  return rb_mysql_stmt_new(self, sql);
+}
+
 void init_mysql2_client() {
-  // verify the libmysql we're about to use was the version we were built against
-  // https://github.com/luislavena/mysql-gem/commit/a600a9c459597da0712f70f43736e24b484f8a99
+#ifdef _WIN32
+  /* verify the libmysql we're about to use was the version we were built against
+     https://github.com/luislavena/mysql-gem/commit/a600a9c459597da0712f70f43736e24b484f8a99 */
   int i;
   int dots = 0;
   const char *lib = mysql_get_client_info();
-  for (i = 0; lib[i] != 0 && MYSQL_SERVER_VERSION[i] != 0; i++) {
+
+  for (i = 0; lib[i] != 0 && MYSQL_LINK_VERSION[i] != 0; i++) {
     if (lib[i] == '.') {
       dots++;
-              // we only compare MAJOR and MINOR
+              /* we only compare MAJOR and MINOR */
       if (dots == 2) break;
     }
-    if (lib[i] != MYSQL_SERVER_VERSION[i]) {
-      rb_raise(rb_eRuntimeError, "Incorrect MySQL client library version! This gem was compiled for %s but the client library is %s.", MYSQL_SERVER_VERSION, lib);
-      return;
+    if (lib[i] != MYSQL_LINK_VERSION[i]) {
+      rb_raise(rb_eRuntimeError, "Incorrect MySQL client library version! This gem was compiled for %s but the client library is %s.", MYSQL_LINK_VERSION, lib);
     }
   }
+#endif
+
+  /* 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");
+  }
 
+#if 0
+  mMysql2      = rb_define_module("Mysql2"); Teach RDoc about Mysql2 constant.
+#endif
   cMysql2Client = rb_define_class_under(mMysql2, "Client", rb_cObject);
 
   rb_define_alloc_func(cMysql2Client, allocate);
 
   rb_define_singleton_method(cMysql2Client, "escape", rb_mysql_client_escape, 1);
+  rb_define_singleton_method(cMysql2Client, "info", rb_mysql_client_info, 0);
 
   rb_define_method(cMysql2Client, "close", rb_mysql_client_close, 0);
-  rb_define_method(cMysql2Client, "query", rb_mysql_client_query, -1);
+  rb_define_method(cMysql2Client, "closed?", rb_mysql_client_closed, 0);
+  rb_define_method(cMysql2Client, "abandon_results!", rb_mysql_client_abandon_results, 0);
   rb_define_method(cMysql2Client, "escape", rb_mysql_client_real_escape, 1);
-  rb_define_method(cMysql2Client, "info", rb_mysql_client_info, 0);
   rb_define_method(cMysql2Client, "server_info", rb_mysql_client_server_info, 0);
   rb_define_method(cMysql2Client, "socket", rb_mysql_client_socket, 0);
   rb_define_method(cMysql2Client, "async_result", rb_mysql_client_async_result, 0);
   rb_define_method(cMysql2Client, "last_id", rb_mysql_client_last_id, 0);
   rb_define_method(cMysql2Client, "affected_rows", rb_mysql_client_affected_rows, 0);
+  rb_define_method(cMysql2Client, "prepare", rb_mysql_client_prepare_statement, 1);
   rb_define_method(cMysql2Client, "thread_id", rb_mysql_client_thread_id, 0);
   rb_define_method(cMysql2Client, "ping", rb_mysql_client_ping, 0);
-#ifdef HAVE_RUBY_ENCODING_H
+  rb_define_method(cMysql2Client, "select_db", rb_mysql_client_select_db, 1);
+  rb_define_method(cMysql2Client, "set_server_option", rb_mysql_client_set_server_option, 1);
+  rb_define_method(cMysql2Client, "more_results?", rb_mysql_client_more_results, 0);
+  rb_define_method(cMysql2Client, "next_result", rb_mysql_client_next_result, 0);
+  rb_define_method(cMysql2Client, "store_result", rb_mysql_client_store_result, 0);
+  rb_define_method(cMysql2Client, "automatic_close?", get_automatic_close, 0);
+  rb_define_method(cMysql2Client, "automatic_close=", set_automatic_close, 1);
+  rb_define_method(cMysql2Client, "reconnect=", set_reconnect, 1);
+  rb_define_method(cMysql2Client, "warning_count", rb_mysql_client_warning_count, 0);
+  rb_define_method(cMysql2Client, "query_info_string", rb_mysql_info, 0);
+  rb_define_method(cMysql2Client, "ssl_cipher", rb_mysql_get_ssl_cipher, 0);
   rb_define_method(cMysql2Client, "encoding", rb_mysql_client_encoding, 0);
-#endif
 
-  rb_define_private_method(cMysql2Client, "reconnect=", set_reconnect, 1);
   rb_define_private_method(cMysql2Client, "connect_timeout=", set_connect_timeout, 1);
+  rb_define_private_method(cMysql2Client, "read_timeout=", set_read_timeout, 1);
+  rb_define_private_method(cMysql2Client, "write_timeout=", set_write_timeout, 1);
+  rb_define_private_method(cMysql2Client, "local_infile=", set_local_infile, 1);
   rb_define_private_method(cMysql2Client, "charset_name=", set_charset_name, 1);
+  rb_define_private_method(cMysql2Client, "secure_auth=", set_secure_auth, 1);
+  rb_define_private_method(cMysql2Client, "default_file=", set_read_default_file, 1);
+  rb_define_private_method(cMysql2Client, "default_group=", set_read_default_group, 1);
+  rb_define_private_method(cMysql2Client, "init_command=", set_init_command, 1);
   rb_define_private_method(cMysql2Client, "ssl_set", set_ssl_options, 5);
-  rb_define_private_method(cMysql2Client, "init_connection", init_connection, 0);
-  rb_define_private_method(cMysql2Client, "connect", rb_connect, 7);
-
-  intern_encoding_from_charset = rb_intern("encoding_from_charset");
+  rb_define_private_method(cMysql2Client, "ssl_mode=", rb_set_ssl_mode_option, 1);
+  rb_define_private_method(cMysql2Client, "enable_cleartext_plugin=", set_enable_cleartext_plugin, 1);
+  rb_define_private_method(cMysql2Client, "initialize_ext", initialize_ext, 0);
+  rb_define_private_method(cMysql2Client, "connect", rb_mysql_connect, 8);
+  rb_define_private_method(cMysql2Client, "_query", rb_mysql_query, 2);
 
   sym_id              = ID2SYM(rb_intern("id"));
   sym_version         = ID2SYM(rb_intern("version"));
+  sym_header_version  = ID2SYM(rb_intern("header_version"));
   sym_async           = ID2SYM(rb_intern("async"));
   sym_symbolize_keys  = ID2SYM(rb_intern("symbolize_keys"));
   sym_as              = ID2SYM(rb_intern("as"));
   sym_array           = ID2SYM(rb_intern("array"));
+  sym_stream          = ID2SYM(rb_intern("stream"));
 
+  sym_no_good_index_used = ID2SYM(rb_intern("no_good_index_used"));
+  sym_no_index_used      = ID2SYM(rb_intern("no_index_used"));
+  sym_query_was_slow     = ID2SYM(rb_intern("query_was_slow"));
+
+  intern_brackets = rb_intern("[]");
   intern_merge = rb_intern("merge");
-  intern_error_number_eql = rb_intern("error_number=");
-  intern_sql_state_eql = rb_intern("sql_state=");
+  intern_merge_bang = rb_intern("merge!");
+  intern_new_with_args = rb_intern("new_with_args");
 
 #ifdef CLIENT_LONG_PASSWORD
   rb_const_set(cMysql2Client, rb_intern("LONG_PASSWORD"),
-      INT2NUM(CLIENT_LONG_PASSWORD));
+      LONG2NUM(CLIENT_LONG_PASSWORD));
+#else
+  /* HACK because MariaDB 10.2 no longer defines this constant,
+   * but we're using it in our default connection flags. */
+  rb_const_set(cMysql2Client, rb_intern("LONG_PASSWORD"), INT2NUM(0));
 #endif
 
 #ifdef CLIENT_FOUND_ROWS
   rb_const_set(cMysql2Client, rb_intern("FOUND_ROWS"),
-      INT2NUM(CLIENT_FOUND_ROWS));
+      LONG2NUM(CLIENT_FOUND_ROWS));
 #endif
 
 #ifdef CLIENT_LONG_FLAG
   rb_const_set(cMysql2Client, rb_intern("LONG_FLAG"),
-      INT2NUM(CLIENT_LONG_FLAG));
+      LONG2NUM(CLIENT_LONG_FLAG));
 #endif
 
 #ifdef CLIENT_CONNECT_WITH_DB
   rb_const_set(cMysql2Client, rb_intern("CONNECT_WITH_DB"),
-      INT2NUM(CLIENT_CONNECT_WITH_DB));
+      LONG2NUM(CLIENT_CONNECT_WITH_DB));
 #endif
 
 #ifdef CLIENT_NO_SCHEMA
   rb_const_set(cMysql2Client, rb_intern("NO_SCHEMA"),
-      INT2NUM(CLIENT_NO_SCHEMA));
+      LONG2NUM(CLIENT_NO_SCHEMA));
 #endif
 
 #ifdef CLIENT_COMPRESS
-  rb_const_set(cMysql2Client, rb_intern("COMPRESS"), INT2NUM(CLIENT_COMPRESS));
+  rb_const_set(cMysql2Client, rb_intern("COMPRESS"), LONG2NUM(CLIENT_COMPRESS));
 #endif
 
 #ifdef CLIENT_ODBC
-  rb_const_set(cMysql2Client, rb_intern("ODBC"), INT2NUM(CLIENT_ODBC));
+  rb_const_set(cMysql2Client, rb_intern("ODBC"), LONG2NUM(CLIENT_ODBC));
 #endif
 
 #ifdef CLIENT_LOCAL_FILES
   rb_const_set(cMysql2Client, rb_intern("LOCAL_FILES"),
-      INT2NUM(CLIENT_LOCAL_FILES));
+      LONG2NUM(CLIENT_LOCAL_FILES));
 #endif
 
 #ifdef CLIENT_IGNORE_SPACE
   rb_const_set(cMysql2Client, rb_intern("IGNORE_SPACE"),
-      INT2NUM(CLIENT_IGNORE_SPACE));
+      LONG2NUM(CLIENT_IGNORE_SPACE));
 #endif
 
 #ifdef CLIENT_PROTOCOL_41
   rb_const_set(cMysql2Client, rb_intern("PROTOCOL_41"),
-      INT2NUM(CLIENT_PROTOCOL_41));
+      LONG2NUM(CLIENT_PROTOCOL_41));
 #endif
 
 #ifdef CLIENT_INTERACTIVE
   rb_const_set(cMysql2Client, rb_intern("INTERACTIVE"),
-      INT2NUM(CLIENT_INTERACTIVE));
+      LONG2NUM(CLIENT_INTERACTIVE));
 #endif
 
 #ifdef CLIENT_SSL
-  rb_const_set(cMysql2Client, rb_intern("SSL"), INT2NUM(CLIENT_SSL));
+  rb_const_set(cMysql2Client, rb_intern("SSL"), LONG2NUM(CLIENT_SSL));
 #endif
 
 #ifdef CLIENT_IGNORE_SIGPIPE
   rb_const_set(cMysql2Client, rb_intern("IGNORE_SIGPIPE"),
-      INT2NUM(CLIENT_IGNORE_SIGPIPE));
+      LONG2NUM(CLIENT_IGNORE_SIGPIPE));
 #endif
 
 #ifdef CLIENT_TRANSACTIONS
   rb_const_set(cMysql2Client, rb_intern("TRANSACTIONS"),
-      INT2NUM(CLIENT_TRANSACTIONS));
+      LONG2NUM(CLIENT_TRANSACTIONS));
 #endif
 
 #ifdef CLIENT_RESERVED
-  rb_const_set(cMysql2Client, rb_intern("RESERVED"), INT2NUM(CLIENT_RESERVED));
+  rb_const_set(cMysql2Client, rb_intern("RESERVED"), LONG2NUM(CLIENT_RESERVED));
 #endif
 
 #ifdef CLIENT_SECURE_CONNECTION
   rb_const_set(cMysql2Client, rb_intern("SECURE_CONNECTION"),
-      INT2NUM(CLIENT_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 HAVE_CONST_MYSQL_OPTION_MULTI_STATEMENTS_ON
+  rb_const_set(cMysql2Client, rb_intern("OPTION_MULTI_STATEMENTS_ON"),
+      LONG2NUM(MYSQL_OPTION_MULTI_STATEMENTS_ON));
+#endif
+
+#ifdef HAVE_CONST_MYSQL_OPTION_MULTI_STATEMENTS_OFF
+  rb_const_set(cMysql2Client, rb_intern("OPTION_MULTI_STATEMENTS_OFF"),
+      LONG2NUM(MYSQL_OPTION_MULTI_STATEMENTS_OFF));
 #endif
 
 #ifdef CLIENT_MULTI_STATEMENTS
   rb_const_set(cMysql2Client, rb_intern("MULTI_STATEMENTS"),
-      INT2NUM(CLIENT_MULTI_STATEMENTS));
+      LONG2NUM(CLIENT_MULTI_STATEMENTS));
 #endif
 
 #ifdef CLIENT_PS_MULTI_RESULTS
   rb_const_set(cMysql2Client, rb_intern("PS_MULTI_RESULTS"),
-      INT2NUM(CLIENT_PS_MULTI_RESULTS));
+      LONG2NUM(CLIENT_PS_MULTI_RESULTS));
 #endif
 
 #ifdef CLIENT_SSL_VERIFY_SERVER_CERT
   rb_const_set(cMysql2Client, rb_intern("SSL_VERIFY_SERVER_CERT"),
-      INT2NUM(CLIENT_SSL_VERIFY_SERVER_CERT));
+      LONG2NUM(CLIENT_SSL_VERIFY_SERVER_CERT));
 #endif
 
 #ifdef CLIENT_REMEMBER_OPTIONS
   rb_const_set(cMysql2Client, rb_intern("REMEMBER_OPTIONS"),
-      INT2NUM(CLIENT_REMEMBER_OPTIONS));
+      LONG2NUM(CLIENT_REMEMBER_OPTIONS));
 #endif
 
 #ifdef CLIENT_ALL_FLAGS
   rb_const_set(cMysql2Client, rb_intern("ALL_FLAGS"),
-      INT2NUM(CLIENT_ALL_FLAGS));
+      LONG2NUM(CLIENT_ALL_FLAGS));
 #endif
 
 #ifdef CLIENT_BASIC_FLAGS
   rb_const_set(cMysql2Client, rb_intern("BASIC_FLAGS"),
-      INT2NUM(CLIENT_BASIC_FLAGS));
+      LONG2NUM(CLIENT_BASIC_FLAGS));
+#endif
+
+#ifdef CLIENT_CONNECT_ATTRS
+  rb_const_set(cMysql2Client, rb_intern("CONNECT_ATTRS"),
+      LONG2NUM(CLIENT_CONNECT_ATTRS));
+#else
+  /* HACK because MySQL 5.5 and earlier don't define this constant,
+   * but we're using it in our default connection flags. */
+  rb_const_set(cMysql2Client, rb_intern("CONNECT_ATTRS"),
+      INT2NUM(0));
+#endif
+
+#if defined(FULL_SSL_MODE_SUPPORT) // MySQL 5.7.11 and above
+  rb_const_set(cMysql2Client, rb_intern("SSL_MODE_DISABLED"), INT2NUM(SSL_MODE_DISABLED));
+  rb_const_set(cMysql2Client, rb_intern("SSL_MODE_PREFERRED"), INT2NUM(SSL_MODE_PREFERRED));
+  rb_const_set(cMysql2Client, rb_intern("SSL_MODE_REQUIRED"), INT2NUM(SSL_MODE_REQUIRED));
+  rb_const_set(cMysql2Client, rb_intern("SSL_MODE_VERIFY_CA"), INT2NUM(SSL_MODE_VERIFY_CA));
+  rb_const_set(cMysql2Client, rb_intern("SSL_MODE_VERIFY_IDENTITY"), INT2NUM(SSL_MODE_VERIFY_IDENTITY));
+#elif defined(HAVE_CONST_MYSQL_OPT_SSL_ENFORCE) // MySQL 5.7.3 - 5.7.10
+  rb_const_set(cMysql2Client, rb_intern("SSL_MODE_DISABLED"), INT2NUM(SSL_MODE_DISABLED));
+  rb_const_set(cMysql2Client, rb_intern("SSL_MODE_REQUIRED"), INT2NUM(SSL_MODE_REQUIRED));
+#endif
+
+#ifndef HAVE_CONST_SSL_MODE_DISABLED
+  rb_const_set(cMysql2Client, rb_intern("SSL_MODE_DISABLED"), INT2NUM(0));
+#endif
+#ifndef HAVE_CONST_SSL_MODE_PREFERRED
+  rb_const_set(cMysql2Client, rb_intern("SSL_MODE_PREFERRED"), INT2NUM(0));
+#endif
+#ifndef HAVE_CONST_SSL_MODE_REQUIRED
+  rb_const_set(cMysql2Client, rb_intern("SSL_MODE_REQUIRED"), INT2NUM(0));
+#endif
+#ifndef HAVE_CONST_SSL_MODE_VERIFY_CA
+  rb_const_set(cMysql2Client, rb_intern("SSL_MODE_VERIFY_CA"), INT2NUM(0));
 #endif
+#ifndef HAVE_CONST_SSL_MODE_VERIFY_IDENTITY
+  rb_const_set(cMysql2Client, rb_intern("SSL_MODE_VERIFY_IDENTITY"), INT2NUM(0));
+#endif
+}
+
+#define flag_to_bool(f) ((client->server_status & f) ? Qtrue : Qfalse)
+
+void rb_mysql_set_server_query_flags(MYSQL *client, VALUE result) {
+  VALUE server_flags = rb_hash_new();
+
+#ifdef HAVE_CONST_SERVER_QUERY_NO_GOOD_INDEX_USED
+  rb_hash_aset(server_flags, sym_no_good_index_used, flag_to_bool(SERVER_QUERY_NO_GOOD_INDEX_USED));
+#else
+  rb_hash_aset(server_flags, sym_no_good_index_used, Qnil);
+#endif
+
+#ifdef HAVE_CONST_SERVER_QUERY_NO_INDEX_USED
+  rb_hash_aset(server_flags, sym_no_index_used, flag_to_bool(SERVER_QUERY_NO_INDEX_USED));
+#else
+  rb_hash_aset(server_flags, sym_no_index_used, Qnil);
+#endif
+
+#ifdef HAVE_CONST_SERVER_QUERY_WAS_SLOW
+  rb_hash_aset(server_flags, sym_query_was_slow, flag_to_bool(SERVER_QUERY_WAS_SLOW));
+#else
+  rb_hash_aset(server_flags, sym_query_was_slow, Qnil);
+#endif
+
+  rb_iv_set(result, "@server_flags", server_flags);
 }