mysql2 0.3.12b4 → 0.3.12b5

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## 0.3.12 (not yet released)
+## 0.3.12b5 (not yet released)
+* builds on Ruby 2.0-head and Rubinius 2.0-dev
+* encoding names now stored in a Gperf lookup rather than an array
+* long-standing bug fix: options set on a single query must not be applied to subsequent queries
+* add method warning_count
+* add method abandon_results!
+* add setter for reconnect option
+* remove options method (added in 0.3.12b1)
+* support microsecond Time resolution
+* several INT / UINT fixes
+
+## 0.3.12b4 (August 22, 2012)
+* add write_timeout as well
+
+## 0.3.12b3 (August 22, 2012)
+* several INT / LONG fixes
+* fix linking to MySQL 5.5
+
+## 0.3.12b2 (August 10, 2012)
+* more_results is now more_results?
+
+## 0.3.12b1 (August 8, 2012)
+* several threading and async bug fixes
+* better handling of read and write timeouts
+* add :local_infile connection option
+* add MULTI_STATEMENTS connection flag and methods store_result, next_result, more_results
+* add select_db and options methods
+* add :stream query option
+* add support for utf8mb4 encoding
+* deprecation warnings for the :user, :pass, :hostname, :dbname, :db, :sock connection options
+
 ## 0.3.11 (December 6th, 2011)
 * change mysql error detection strategy from using mysql_field_count to the more explicit mysql_errno
 * bugfix to avoid race condition with active connections that error out

data/README.md

@@ -1,5 +1,7 @@
 # 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.
 This one is not.
@@ -18,7 +20,9 @@ Mysql2::Result - returned from issuing a #query on the connection. It includes E
 gem install mysql2
 ```
 
-You may have to specify --with-mysql-config=/some/random/path/bin/mysql_config
+This gem links against MySQL's `libmysqlclient` C shared library. You may need to install a package such as `libmysqlclient-dev`, `mysql-devel`, or other appropriate package for your system.
+
+If you have installed MySQL to a non-standard location, add `gem install mysql2 --with-mysql-config=/some/random/path/bin/mysql_config`
 
 ## Usage
 
@@ -100,6 +104,7 @@ Mysql2::Client.new(
   :flags = REMEMBER_OPTIONS | LONG_PASSWORD | LONG_FLAG | TRANSACTIONS | PROTOCOL_41 | SECURE_CONNECTION | MULTI_STATEMENTS,
   :encoding = 'utf8',
   :read_timeout = seconds,
+  :write_timeout = seconds,
   :connect_timeout = seconds,
   :reconnect = true/false,
   :local_infile = true/false,
@@ -120,7 +125,7 @@ while ( client.next_result)
 end
 ```
 
-See https://gist.github.com/1367987 for using MULTI_STATEMENTS with ActiveRecord.
+See https://gist.github.com/1367987 for using MULTI_STATEMENTS with Active Record.
 
 ## Cascading config
 
@@ -264,15 +269,15 @@ There are a few things that need to be kept in mind while using streaming:
 
 Read more about the consequences of using `mysql_use_result` (what streaming is implemented with) here: http://dev.mysql.com/doc/refman/5.0/en/mysql-use-result.html.
 
-## ActiveRecord
+## Active Record
 
-To use the ActiveRecord driver (with or without rails), all you should need to do is have this gem installed and set the adapter in your database.yml to "mysql2".
+To use the Active Record driver (with or without rails), all you should need to do is have this gem installed and set the adapter in your database.yml to "mysql2".
 That was easy right? :)
 
-NOTE: as of 0.3.0, and ActiveRecord 3.1 - the ActiveRecord adapter has been pulled out of this gem and into ActiveRecord itself. If you need to use mysql2 with
+NOTE: as of 0.3.0, and Active Record 3.1 - the Active Record adapter has been pulled out of this gem and into Active Record itself. If you need to use mysql2 with
 Rails versions < 3.1 make sure and specify `gem "mysql2", "~> 0.2.7"` in your Gemfile
 
-## Asynchronous ActiveRecord
+## Asynchronous Active Record
 
 Please see the [em-synchrony](https://github.com/igrigorik/em-synchrony) project for details about using EventMachine with mysql2 and Rails.
 
@@ -328,7 +333,7 @@ The specs pass on my system (SL 10.6.3, x86_64) in these rubies:
 * ruby-trunk
 * rbx-head - broken at the moment, working with the rbx team for a solution
 
-The ActiveRecord driver should work on 2.3.5 and 3.0
+The Active Record driver should work on 2.3.5 and 3.0
 
 ## Yeah... but why?
 
@@ -387,6 +392,7 @@ though.
 ## Special Thanks
 
 * Eric Wong - for the contribution (and the informative explanations) of some thread-safety, non-blocking I/O and cleanup patches. You rock dude
-* Yury Korolev (http://github.com/yury) - for TONS of help testing the ActiveRecord adapter
+* Yury Korolev (http://github.com/yury) - for TONS of help testing the Active Record adapter
 * Aaron Patterson (http://github.com/tenderlove) - tons of contributions, suggestions and general badassness
-* Mike Perham (http://github.com/mperham) - Async ActiveRecord adapter (uses Fibers and EventMachine)
+* Mike Perham (http://github.com/mperham) - Async Active Record adapter (uses Fibers and EventMachine)
+* Aaron Stone (http://github.com/sodabrew) - additional client settings, local files, microsecond time, maintenance support.

data/ext/mysql2/client.c

@@ -4,13 +4,21 @@
 #ifndef _WIN32
 #include <sys/socket.h>
 #endif
+#include <unistd.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, sym_stream;
-static ID intern_merge, intern_error_number_eql, intern_sql_state_eql;
+static ID intern_merge, intern_merge_bang, intern_error_number_eql, intern_sql_state_eql;
+
+#ifndef HAVE_RB_HASH_DUP
+static VALUE rb_hash_dup(VALUE other) {
+  return rb_funcall(rb_cHash, rb_intern("[]"), 1, other);
+}
+#endif
 
 #define REQUIRE_INITIALIZED(wrapper) \
   if (!wrapper->initialized) { \
@@ -190,12 +198,19 @@ static VALUE allocate(VALUE klass) {
   wrapper->encoding = Qnil;
   wrapper->active_thread = Qnil;
   wrapper->reconnect_enabled = 0;
-  wrapper->connected = 0; // means that a database connection is open
-  wrapper->initialized = 0; // means that that the wrapper is initialized
+  wrapper->connected = 0; /* means that a database connection is open */
+  wrapper->initialized = 0; /* means that that the wrapper is initialized */
   wrapper->client = (MYSQL*)xmalloc(sizeof(MYSQL));
   return obj;
 }
 
+/* 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;
@@ -208,7 +223,7 @@ static VALUE rb_mysql_client_escape(RB_MYSQL_UNUSED VALUE klass, VALUE str) {
 
   newLen = mysql_escape_string((char *)newStr, StringValuePtr(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 {
@@ -221,6 +236,15 @@ static VALUE rb_mysql_client_escape(RB_MYSQL_UNUSED VALUE klass, VALUE str) {
   }
 }
 
+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_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE port, VALUE database, VALUE socket, VALUE flags) {
   struct nogvl_connect_args args;
   VALUE rv;
@@ -283,7 +307,7 @@ static VALUE do_send_query(void *args) {
   struct nogvl_send_query_args *query_args = args;
   mysql_client_wrapper *wrapper = query_args->wrapper;
   if (rb_thread_blocking_region(nogvl_send_query, args, RUBY_UBF_IO, 0) == Qfalse) {
-    // an error occurred, we're not active anymore
+    /* an error occurred, we're not active anymore */
     MARK_CONN_INACTIVE(self);
     return rb_raise_mysql2_error(wrapper);
   }
@@ -313,8 +337,8 @@ static VALUE nogvl_do_result(void *ptr, char use_result) {
     result = mysql_store_result(wrapper->client);
   }
 
-  // once our result is stored off, this connection is
-  // ready for another command to be issued
+  /* once our result is stored off, this connection is
+     ready for another command to be issued */
   wrapper->active_thread = Qnil;
 
   return (VALUE)result;
@@ -342,18 +366,18 @@ static VALUE rb_mysql_client_async_result(VALUE self) {
 #endif
   GET_CLIENT(self);
 
-  // if we're not waiting on a result, do nothing
+  /* if we're not waiting on a result, do nothing */
   if (NIL_P(wrapper->active_thread))
     return Qnil;
 
   REQUIRE_CONNECTED(wrapper);
   if (rb_thread_blocking_region(nogvl_read_query_result, wrapper->client, RUBY_UBF_IO, 0) == Qfalse) {
-    // an error occurred, mark this connection inactive
+    /* an error occurred, mark this connection inactive */
     MARK_CONN_INACTIVE(self);
     return rb_raise_mysql2_error(wrapper);
   }
 
-  VALUE is_streaming = rb_hash_aref(rb_iv_get(self, "@query_options"), sym_stream);
+  VALUE is_streaming = rb_hash_aref(rb_iv_get(self, "@current_query_options"), sym_stream);
   if(is_streaming == Qtrue) {
     result = (MYSQL_RES *)rb_thread_blocking_region(nogvl_use_result, wrapper, RUBY_UBF_IO, 0);
   } else {
@@ -365,13 +389,13 @@ static VALUE rb_mysql_client_async_result(VALUE self) {
       MARK_CONN_INACTIVE(self);
       rb_raise_mysql2_error(wrapper);
     }
-    // no data and no error, so query was not a SELECT
+    /* 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));
+  /* pass-through query options for result construction later */
+  rb_iv_set(resultObj, "@query_options", rb_hash_dup(rb_iv_get(self, "@current_query_options")));
 
 #ifdef HAVE_RUBY_ENCODING_H
   GetMysql2Result(resultObj, result_wrapper);
@@ -392,9 +416,10 @@ static VALUE disconnect_and_raise(VALUE self, VALUE error) {
   wrapper->active_thread = Qnil;
   wrapper->connected = 0;
 
-  // manually close the socket for read/write
-  // this feels dirty, but is there another way?
-  shutdown(wrapper->client->net.fd, 2);
+  /* manually close the socket for read/write
+     this feels dirty, but is there another way? */
+  close(wrapper->client->net.fd);
+  wrapper->client->net.fd = -1;
 
   rb_exc_raise(error);
 
@@ -417,8 +442,8 @@ static VALUE do_query(void *args) {
     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 {
@@ -455,9 +480,9 @@ static VALUE finish_and_mark_inactive(void *args) {
   GET_CLIENT(self);
 
   if (!NIL_P(wrapper->active_thread)) {
-    // if we got here, the result hasn't been read off the wire yet
-    // so lets do that and then throw it away because we have no way
-    // of getting it back up to the caller from here
+    /* if we got here, the result hasn't been read off the wire yet
+       so lets do that and then throw it away because we have no way
+       of getting it back up to the caller from here */
     result = (MYSQL_RES *)rb_thread_blocking_region(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
     mysql_free_result(result);
 
@@ -468,6 +493,36 @@ static VALUE finish_and_mark_inactive(void *args) {
 }
 #endif
 
+/* 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) {
+  GET_CLIENT(self);
+
+  MYSQL_RES *result;
+  int ret;
+
+  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_blocking_region(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
+
+    if (result != NULL) {
+      mysql_free_result(result);
+    }
+  }
+
+  return Qnil;
+}
+
 /* call-seq:
  *    client.query(sql, options = {})
  *
@@ -480,7 +535,7 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
 #endif
   struct nogvl_send_query_args args;
   int async = 0;
-  VALUE opts, defaults;
+  VALUE opts, current;
   VALUE thread_current = rb_thread_current();
 #ifdef HAVE_RUBY_ENCODING_H
   rb_encoding *conn_enc;
@@ -490,31 +545,28 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
   REQUIRE_CONNECTED(wrapper);
   args.mysql = wrapper->client;
 
-
-  defaults = rb_iv_get(self, "@query_options");
+  rb_iv_set(self, "@current_query_options", rb_hash_dup(rb_iv_get(self, "@query_options")));
+  current = rb_iv_get(self, "@current_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);
+    opts = rb_funcall(current, intern_merge_bang, 1, opts);
 
-    if (rb_hash_aref(opts, sym_async) == Qtrue) {
+    if (rb_hash_aref(current, sym_async) == Qtrue) {
       async = 1;
     }
-  } else {
-    opts = defaults;
   }
 
   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
+  /* ensure the string is in the encoding the connection is expecting */
   args.sql = rb_str_export_to_enc(args.sql, conn_enc);
 #endif
   args.sql_ptr = StringValuePtr(args.sql);
   args.sql_len = RSTRING_LEN(args.sql);
 
-  // see if this connection is still waiting on a result from a previous query
+  /* see if this connection is still waiting on a result from a previous query */
   if (NIL_P(wrapper->active_thread)) {
-    // mark this connection active
+    /* 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");
@@ -544,7 +596,7 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
 #else
   do_send_query(&args);
 
-  // this will just block until the result is ready
+  /* this will just block until the result is ready */
   return rb_ensure(rb_mysql_client_async_result, self, finish_and_mark_inactive, self);
 #endif
 }
@@ -569,7 +621,7 @@ static VALUE rb_mysql_client_real_escape(VALUE self, VALUE str) {
 #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
 
@@ -578,7 +630,7 @@ static VALUE rb_mysql_client_real_escape(VALUE self, VALUE str) {
 
   newLen = mysql_real_escape_string(wrapper->client, (char *)newStr, StringValuePtr(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 {
@@ -639,11 +691,11 @@ static VALUE _mysql_client_options(VALUE self, int opt, VALUE value) {
 
   result = mysql_options(wrapper->client, opt, retval);
 
-  // Zero means success
+  /* Zero means success */
   if (result != 0) {
     rb_warn("%s\n", mysql_error(wrapper->client));
   } else {
-    // Special case for reconnect, this option is also stored in the wrapper struct
+    /* Special case for reconnect, this option is also stored in the wrapper struct */
     if (opt == MYSQL_OPT_RECONNECT)
       wrapper->reconnect_enabled = boolval;
   }
@@ -651,12 +703,6 @@ static VALUE _mysql_client_options(VALUE self, int opt, VALUE value) {
   return (result == 0) ? Qtrue : Qfalse;
 }
 
-static VALUE rb_mysql_client_options(VALUE self, VALUE option, VALUE value) {
-  Check_Type(option, T_FIXNUM);
-  int opt = NUM2INT(option);
-  return _mysql_client_options(self, opt, value);
-}
-
 /* call-seq:
  *    client.info
  *
@@ -835,6 +881,11 @@ static VALUE rb_mysql_client_ping(VALUE self) {
   }
 }
 
+/* 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);
@@ -844,18 +895,33 @@ static VALUE rb_mysql_client_more_results(VALUE self)
       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)
 {
     GET_CLIENT(self);
     int ret;
     ret = mysql_next_result(wrapper->client);
-    if (ret == 0)
+    if (ret > 0) {
+      rb_raise_mysql2_error(wrapper);
+      return Qfalse;
+    } else if (ret == 0) {
       return Qtrue;
-    else
+    } 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;
@@ -864,12 +930,7 @@ static VALUE rb_mysql_client_store_result(VALUE self)
   mysql2_result_wrapper * result_wrapper;
 #endif
 
-
   GET_CLIENT(self);
-  // MYSQL_RES* res = mysql_store_result(wrapper->client);
-  // if (res == NULL)
-  //    mysql_raise(wrapper->client);
-  // return mysqlres2obj(res);
 
   result = (MYSQL_RES *)rb_thread_blocking_region(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
 
@@ -877,13 +938,13 @@ static VALUE rb_mysql_client_store_result(VALUE self)
     if (mysql_errno(wrapper->client) != 0) {
       rb_raise_mysql2_error(wrapper);
     }
-    // no data and no error, so query was not a SELECT
+    /* 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));
+  /* pass-through query options for result construction later */
+  rb_iv_set(resultObj, "@query_options", rb_hash_dup(rb_iv_get(self, "@current_query_options")));
 
 #ifdef HAVE_RUBY_ENCODING_H
   GetMysql2Result(resultObj, result_wrapper);
@@ -905,6 +966,13 @@ static VALUE rb_mysql_client_encoding(VALUE self) {
 }
 #endif
 
+/* 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);
 }
@@ -930,9 +998,9 @@ static VALUE set_read_timeout(VALUE self, VALUE 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
+  /* 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);
 }
@@ -948,26 +1016,30 @@ static VALUE set_write_timeout(VALUE self, VALUE value) {
 }
 
 static VALUE set_charset_name(VALUE self, VALUE value) {
-  char * charset_name;
+  char *charset_name;
+  size_t charset_name_len;
+  const struct mysql2_mysql_enc_name_to_rb_map *mysql2rb;
 #ifdef HAVE_RUBY_ENCODING_H
-  VALUE new_encoding;
+  rb_encoding *enc;
+  VALUE rb_enc;
 #endif
   GET_CLIENT(self);
 
+  charset_name = RSTRING_PTR(value);
+  charset_name_len = RSTRING_LEN(value);
+
 #ifdef HAVE_RUBY_ENCODING_H
-  new_encoding = rb_funcall(cMysql2Client, intern_encoding_from_charset, 1, value);
-  if (new_encoding == Qnil) {
+  mysql2rb = mysql2_mysql_enc_name_to_rb(charset_name, charset_name_len);
+  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 */
     rb_warn("%s\n", mysql_error(wrapper->client));
@@ -1004,15 +1076,15 @@ static VALUE initialize_ext(VALUE self) {
 }
 
 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
+  /* 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++) {
     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]) {
@@ -1032,6 +1104,7 @@ void init_mysql2_client() {
 
   rb_define_method(cMysql2Client, "close", rb_mysql_client_close, 0);
   rb_define_method(cMysql2Client, "query", rb_mysql_client_query, -1);
+  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);
@@ -1045,12 +1118,12 @@ void init_mysql2_client() {
   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, "options", rb_mysql_client_options, 2);
+  rb_define_method(cMysql2Client, "reconnect=", set_reconnect, 1);
+  rb_define_method(cMysql2Client, "warning_count", rb_mysql_client_warning_count, 0);
 #ifdef HAVE_RUBY_ENCODING_H
   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);
@@ -1060,8 +1133,6 @@ void init_mysql2_client() {
   rb_define_private_method(cMysql2Client, "initialize_ext", initialize_ext, 0);
   rb_define_private_method(cMysql2Client, "connect", rb_connect, 7);
 
-  intern_encoding_from_charset = rb_intern("encoding_from_charset");
-
   sym_id              = ID2SYM(rb_intern("id"));
   sym_version         = ID2SYM(rb_intern("version"));
   sym_async           = ID2SYM(rb_intern("async"));
@@ -1071,6 +1142,7 @@ void init_mysql2_client() {
   sym_stream          = ID2SYM(rb_intern("stream"));
 
   intern_merge = rb_intern("merge");
+  intern_merge_bang = rb_intern("merge!");
   intern_error_number_eql = rb_intern("error_number=");
   intern_sql_state_eql = rb_intern("sql_state=");