mysql2 0.2.20 → 0.2.21

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5973bd9a37d27c37169e315c5b73df1fcd3b1ce4
+  data.tar.gz: f5e1c5e6bb844649e2b07c640d7ab061ad03519c
+SHA512:
+  metadata.gz: ea791db6c0c353cc4f1f3adbd1875018bd27c6a4b602de992ec47c3691ac966723c8917d7dad33f32f720448a54f351a1136f64bb25ccdd29ec16b87e9e2d39f
+  data.tar.gz: d22086793bef4d4c3e7e6c2bec39dd22135015d692ac4b36c89d0755b4ac0837ccdf87f5d77c466474da08639a228bab2f29cd38926668dc21e3bf8dc21f21fa

data/README.md

@@ -15,14 +15,61 @@ Mysql2::Client - your connection to the database
 Mysql2::Result - returned from issuing a #query on the connection. It includes Enumerable.
 
 ## Installing
-
+### OSX / Linux
 ``` sh
 gem install mysql2
 ```
 
 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`
+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).
+* The directory `/usr/local`.
+
+### Configuration options
+
+Use these options by `gem install mysql2 -- [--optionA] [--optionB=argument]`.
+
+* `--with-mysql-dir[=/path/to/mysqldir]` -
+Specify the directory where MySQL is installed. The mysql2 gem will not use
+`mysql_config`, but will instead look at `mysqldir/lib` and `mysqldir/include`
+for the library and header files.
+This option is mutually exclusive with `--with-mysql-config`.
+
+* `--with-mysql-config[=/path/to/mysql_config]` -
+Specify a path to the `mysql_config` binary provided by your copy of MySQL. The
+mysql2 gem will ask this `mysql_config` binary about the compiler and linker
+arguments needed.
+This option is mutually exclusive with `--with-mysql-dir`.
+
+* `--with-mysql-rpath=/path/to/mysql/lib` / `--without-mysql-rpath` -
+Override the runtime path used to find the MySQL libraries.
+This may be needed if you deploy to a system where these libraries
+are located somewhere different than on your build system.
+This overrides any rpath calculated by default or by the options above.
+
+### Windows
+First, make sure you have the DevKit installed (http://rubyinstaller.org/downloads/) and its variables
+are loaded by running devkit\devktvars.bat .
+
+Next, you need a MySQL library to link against. If you have MySQL loaded on your development machine,
+you can use that. If not, you will need to either copy the MySQL directory from your server, or else
+obtain a copy of the MySQL C connector: http://dev.mysql.com/downloads/connector/c/
+
+If you're using the connector, I recommend just getting the .zip file and unzipping it someplace convenient.
+
+Now you can install mysql2. You must use the `--with-mysql-dir` option to tell gem where your MySQL library
+files are. For example, if you unzipped the connector to c:\mysql-connector-c-6.1.1-win32 you would install
+the gem like this:
+
+    gem install mysql2 -- --with-mysql-dir=c:\mysql-connector-c-6.1.1-win32
+    
+Finally, you must copy libmysql.dll from the lib subdirectory of your MySQL or MySQL connector directory into
+your ruby\bin directory. In the above example, libmysql.dll would be located at
+c:\mysql-connector-c-6.1.1-win32\lib .
 
 ## Usage
 
@@ -108,8 +155,12 @@ Mysql2::Client.new(
   :connect_timeout = seconds,
   :reconnect = true/false,
   :local_infile = true/false,
+  :secure_auth = true/false,
+  :default_file = '/path/to/my.cfg',
+  :default_group = 'my.cfg section'
   )
 ```
+### Multiple result sets
 
 You can also retrieve multiple result sets. For this to work you need to connect with
 flags `Mysql2::Client::MULTI_STATEMENTS`. Using multiple result sets is normally used
@@ -127,6 +178,35 @@ end
 
 See https://gist.github.com/1367987 for using MULTI_STATEMENTS with Active Record.
 
+### Secure auth
+
+Starting wih MySQL 5.6.5, secure_auth is enabled by default on servers (it was disabled by default prior to this).
+When secure_auth is enabled, the server will refuse a connection if the account password is stored in old pre-MySQL 4.1 format.
+The MySQL 5.6.5 client library may also refuse to attempt a connection if provided an older format password.
+To bypass this restriction in the client, pass the option :secure_auth => false to Mysql2::Client.new().
+If using ActiveRecord, your database.yml might look something like this:
+
+```
+development:
+  adapter: mysql2
+  encoding: utf8
+  database: my_db_name
+  username: root
+  password: my_password
+  host: 127.0.0.1
+  port: 3306
+  secure_auth: false
+```
+
+### Reading a MySQL config file
+You may read configuration options from a MySQL configuration file by passing
+the `:default_file` and `:default_group` paramters. For example:
+
+```
+  client = Mysql2::Client.new(:default_file => '/user/.my.cnf', :default_group => 'client')
+```
+
+
 ## Cascading config
 
 The default config hash is at:

data/ext/mysql2/client.c

@@ -57,7 +57,7 @@ static VALUE rb_hash_dup(VALUE other) {
 
 /*
  * 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;
@@ -72,7 +72,7 @@ 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;
@@ -84,7 +84,7 @@ struct nogvl_send_query_args {
 
 /*
  * used to pass all arguments to mysql_select_db while inside
- * rb_thread_blocking_region
+ * rb_thread_call_without_gvl
  */
 struct nogvl_select_db_args {
   MYSQL *mysql;
@@ -124,6 +124,7 @@ static void rb_mysql_client_mark(void * wrapper) {
 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));
+  VALUE e;
 #ifdef HAVE_RUBY_ENCODING_H
   rb_encoding *default_internal_enc = rb_default_internal_encoding();
   rb_encoding *conn_enc = rb_to_encoding(wrapper->encoding);
@@ -136,22 +137,22 @@ static VALUE rb_raise_mysql2_error(mysql_client_wrapper *wrapper) {
   }
 #endif
 
-  VALUE e = rb_exc_new3(cMysql2Error, rb_error_msg);
+  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);
   rb_exc_raise(e);
   return Qnil;
 }
 
-static VALUE nogvl_init(void *ptr) {
+static void *nogvl_init(void *ptr) {
   MYSQL *client;
 
   /* may initialize embedded server and read /etc/services off disk */
   client = mysql_init((MYSQL *)ptr);
-  return client ? Qtrue : Qfalse;
+  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;
 
@@ -160,10 +161,10 @@ static VALUE nogvl_connect(void *ptr) {
                               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) {
+static void *nogvl_close(void *ptr) {
   mysql_client_wrapper *wrapper;
 #ifndef _WIN32
   int flags;
@@ -190,7 +191,7 @@ static VALUE nogvl_close(void *ptr) {
     mysql_close(wrapper->client);
   }
 
-  return Qnil;
+  return NULL;
 }
 
 static void rb_mysql_client_free(void *ptr) {
@@ -283,20 +284,20 @@ static VALUE rb_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE po
   VALUE rv;
   GET_CLIENT(self);
 
-  args.host = NIL_P(host) ? "localhost" : StringValuePtr(host);
+  args.host = NIL_P(host) ? NULL : StringValuePtr(host);
   args.unix_socket = NIL_P(socket) ? NULL : StringValuePtr(socket);
-  args.port = NIL_P(port) ? 3306 : NUM2INT(port);
+  args.port = NIL_P(port) ? 0 : 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.client_flag = NUM2ULONG(flags);
 
-  rv = rb_thread_blocking_region(nogvl_connect, &args, RUBY_UBF_IO, 0);
+  rv = (VALUE) rb_thread_call_without_gvl(nogvl_connect, &args, RUBY_UBF_IO, 0);
   if (rv == Qfalse) {
     while (rv == Qfalse && errno == EINTR && !mysql_errno(wrapper->client)) {
       errno = 0;
-      rv = rb_thread_blocking_region(nogvl_connect, &args, RUBY_UBF_IO, 0);
+      rv = (VALUE) rb_thread_call_without_gvl(nogvl_connect, &args, RUBY_UBF_IO, 0);
     }
     if (rv == Qfalse)
       return rb_raise_mysql2_error(wrapper);
@@ -316,7 +317,7 @@ static VALUE rb_mysql_client_close(VALUE self) {
   GET_CLIENT(self);
 
   if (wrapper->connected) {
-    rb_thread_blocking_region(nogvl_close, wrapper, RUBY_UBF_IO, 0);
+    rb_thread_call_without_gvl(nogvl_close, wrapper, RUBY_UBF_IO, 0);
   }
 
   return Qnil;
@@ -327,19 +328,19 @@ static VALUE rb_mysql_client_close(VALUE self) {
  * 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;
 
   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 (rb_thread_blocking_region(nogvl_send_query, args, RUBY_UBF_IO, 0) == Qfalse) {
+  if ((VALUE)rb_thread_call_without_gvl(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);
@@ -352,14 +353,14 @@ static VALUE do_send_query(void *args) {
  * 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 VALUE nogvl_do_result(void *ptr, char use_result) {
+static void *nogvl_do_result(void *ptr, char use_result) {
   mysql_client_wrapper *wrapper;
   MYSQL_RES *result;
 
@@ -374,15 +375,15 @@ static VALUE nogvl_do_result(void *ptr, char use_result) {
      ready for another command to be issued */
   wrapper->active_thread = Qnil;
 
-  return (VALUE)result;
+  return result;
 }
 
 /* mysql_store_result may (unlikely) read rows off the socket */
-static VALUE nogvl_store_result(void *ptr) {
+static void *nogvl_store_result(void *ptr) {
   return nogvl_do_result(ptr, 0);
 }
 
-static VALUE nogvl_use_result(void *ptr) {
+static void *nogvl_use_result(void *ptr) {
   return nogvl_do_result(ptr, 1);
 }
 
@@ -402,7 +403,7 @@ static VALUE rb_mysql_client_async_result(VALUE self) {
     return Qnil;
 
   REQUIRE_CONNECTED(wrapper);
-  if (rb_thread_blocking_region(nogvl_read_query_result, wrapper->client, RUBY_UBF_IO, 0) == Qfalse) {
+  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 */
     MARK_CONN_INACTIVE(self);
     return rb_raise_mysql2_error(wrapper);
@@ -410,9 +411,9 @@ static VALUE rb_mysql_client_async_result(VALUE self) {
 
   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);
+    result = (MYSQL_RES *)rb_thread_call_without_gvl(nogvl_use_result, wrapper, RUBY_UBF_IO, 0);
   } else {
-    result = (MYSQL_RES *)rb_thread_blocking_region(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
+    result = (MYSQL_RES *)rb_thread_call_without_gvl(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
   }
 
   if (result == NULL) {
@@ -511,7 +512,7 @@ static VALUE finish_and_mark_inactive(void *args) {
     /* 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);
+    result = (MYSQL_RES *)rb_thread_call_without_gvl(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
     mysql_free_result(result);
 
     wrapper->active_thread = Qnil;
@@ -530,18 +531,18 @@ static VALUE finish_and_mark_inactive(void *args) {
  * again.
  */
 static VALUE rb_mysql_client_abandon_results(VALUE self) {
-  GET_CLIENT(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_blocking_region(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
+    result = (MYSQL_RES *)rb_thread_call_without_gvl(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
 
     if (result != NULL) {
       mysql_free_result(result);
@@ -679,8 +680,9 @@ static VALUE rb_mysql_client_real_escape(VALUE self, VALUE str) {
 
 static VALUE _mysql_client_options(VALUE self, int opt, VALUE value) {
   int result;
-  void *retval = NULL;
+  const void *retval = NULL;
   unsigned int intval = 0;
+  const char * charval = NULL;
   my_bool boolval;
 
   GET_CLIENT(self);
@@ -716,6 +718,21 @@ static VALUE _mysql_client_options(VALUE self, int opt, VALUE value) {
       retval = &boolval;
       break;
 
+    case MYSQL_SECURE_AUTH:
+      boolval = (value == Qfalse ? 0 : 1);
+      retval = &boolval;
+      break;
+
+    case MYSQL_READ_DEFAULT_FILE:
+      charval = (const char *)StringValuePtr(value);
+      retval  = charval;
+      break;
+
+    case MYSQL_READ_DEFAULT_GROUP:
+      charval = (const char *)StringValuePtr(value);
+      retval  = charval;
+      break;
+
     default:
       return Qfalse;
   }
@@ -744,8 +761,8 @@ static VALUE rb_mysql_client_info(VALUE self) {
 #ifdef HAVE_RUBY_ENCODING_H
   rb_encoding *default_internal_enc;
   rb_encoding *conn_enc;
-#endif
   GET_CLIENT(self);
+#endif
   version = rb_hash_new();
 
 #ifdef HAVE_RUBY_ENCODING_H
@@ -805,9 +822,12 @@ static VALUE rb_mysql_client_server_info(VALUE self) {
 static VALUE rb_mysql_client_socket(VALUE self) {
   GET_CLIENT(self);
 #ifndef _WIN32
-  REQUIRE_CONNECTED(wrapper);
-  int fd_set_fd = wrapper->client->net.fd;
-  return INT2NUM(fd_set_fd);
+  {
+    int fd_set_fd;
+    REQUIRE_CONNECTED(wrapper);
+    fd_set_fd = wrapper->client->net.fd;
+    return INT2NUM(fd_set_fd);
+  }
 #else
   rb_raise(cMysql2Error, "Raw access to the mysql file descriptor isn't supported on Windows");
 #endif
@@ -857,13 +877,13 @@ static VALUE rb_mysql_client_thread_id(VALUE self) {
   return ULL2NUM(retVal);
 }
 
-static VALUE nogvl_select_db(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 Qtrue;
+    return (void *)Qtrue;
   else
-    return Qfalse;
+    return (void *)Qfalse;
 }
 
 /* call-seq:
@@ -882,16 +902,16 @@ static VALUE rb_mysql_client_select_db(VALUE self, VALUE db)
   args.mysql = wrapper->client;
   args.db = StringValuePtr(db);
 
-  if (rb_thread_blocking_region(nogvl_select_db, &args, RUBY_UBF_IO, 0) == Qfalse)
+  if (rb_thread_call_without_gvl(nogvl_select_db, &args, RUBY_UBF_IO, 0) == Qfalse)
     rb_raise_mysql2_error(wrapper);
 
   return db;
 }
 
-static VALUE nogvl_ping(void *ptr) {
+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:
@@ -908,7 +928,7 @@ static VALUE rb_mysql_client_ping(VALUE self) {
   if (!wrapper->connected) {
     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);
   }
 }
 
@@ -934,8 +954,8 @@ static VALUE rb_mysql_client_more_results(VALUE self)
  */
 static VALUE rb_mysql_client_next_result(VALUE self)
 {
-    GET_CLIENT(self);
     int ret;
+    GET_CLIENT(self);
     ret = mysql_next_result(wrapper->client);
     if (ret > 0) {
       rb_raise_mysql2_error(wrapper);
@@ -960,7 +980,7 @@ static VALUE rb_mysql_client_store_result(VALUE self)
   VALUE current;
   GET_CLIENT(self);
 
-  result = (MYSQL_RES *)rb_thread_blocking_region(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
+  result = (MYSQL_RES *)rb_thread_call_without_gvl(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
 
   if (result == NULL) {
     if (mysql_errno(wrapper->client) != 0) {
@@ -1041,18 +1061,18 @@ static VALUE set_write_timeout(VALUE self, VALUE value) {
 
 static VALUE set_charset_name(VALUE self, VALUE value) {
   char *charset_name;
+#ifdef HAVE_RUBY_ENCODING_H
   size_t charset_name_len;
   const struct mysql2_mysql_enc_name_to_rb_map *mysql2rb;
-#ifdef HAVE_RUBY_ENCODING_H
   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
+  charset_name_len = RSTRING_LEN(value);
   mysql2rb = mysql2_mysql_enc_name_to_rb(charset_name, charset_name_len);
   if (mysql2rb == NULL || mysql2rb->rb_name == NULL) {
     VALUE inspect = rb_inspect(value);
@@ -1085,10 +1105,22 @@ static VALUE set_ssl_options(VALUE self, VALUE key, VALUE cert, VALUE ca, VALUE
   return self;
 }
 
+static VALUE set_secure_auth(VALUE self, VALUE value) {
+  return _mysql_client_options(self, MYSQL_SECURE_AUTH, value);
+}
+
+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 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->client, RUBY_UBF_IO, 0) == Qfalse) {
     /* TODO: warning - not enough memory? */
     return rb_raise_mysql2_error(wrapper);
   }
@@ -1153,6 +1185,9 @@ void init_mysql2_client() {
   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, "ssl_set", set_ssl_options, 5);
   rb_define_private_method(cMysql2Client, "initialize_ext", initialize_ext, 0);
   rb_define_private_method(cMysql2Client, "connect", rb_connect, 7);

data/ext/mysql2/client.h

@@ -1,24 +1,30 @@
 #ifndef MYSQL2_CLIENT_H
 #define MYSQL2_CLIENT_H
 
+#ifndef HAVE_RB_THREAD_CALL_WITHOUT_GVL
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+
+/* emulate rb_thread_call_without_gvl with rb_thread_blocking_region */
+#define rb_thread_call_without_gvl(func, data1, ubf, data2) \
+  rb_thread_blocking_region((rb_blocking_function_t *)func, data1, ubf, data2)
+
+#else /* ! HAVE_RB_THREAD_BLOCKING_REGION */
 /*
- * partial emulation of the 1.9 rb_thread_blocking_region under 1.8,
+ * partial emulation of the 2.0 rb_thread_call_without_gvl under 1.8,
  * this is enough for dealing with blocking I/O functions in the
  * presence of threads.
  */
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
 
 #include <rubysig.h>
 #define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
 typedef void rb_unblock_function_t(void *);
-typedef VALUE rb_blocking_function_t(void *);
-static VALUE
-rb_thread_blocking_region(
-  rb_blocking_function_t *func, void *data1,
+static void *
+rb_thread_call_without_gvl(
+   void *(*func)(void *), void *data1,
   RB_MYSQL_UNUSED rb_unblock_function_t *ubf,
   RB_MYSQL_UNUSED void *data2)
 {
-  VALUE rv;
+  void *rv;
 
   TRAP_BEG;
   rv = func(data1);
@@ -28,6 +34,7 @@ rb_thread_blocking_region(
 }
 
 #endif /* ! HAVE_RB_THREAD_BLOCKING_REGION */
+#endif /* ! HAVE_RB_THREAD_CALL_WITHOUT_GVL */
 
 void init_mysql2_client();
 

data/ext/mysql2/extconf.rb

@@ -5,6 +5,9 @@ def asplode lib
   abort "-----\n#{lib} is missing.  please check your installation of mysql and try again.\n-----"
 end
 
+# 2.0-only
+have_header('ruby/thread.h') && have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
+
 # 1.9-only
 have_func('rb_thread_blocking_region')
 have_func('rb_wait_for_single_fd')
@@ -28,21 +31,29 @@ dirs = ENV['PATH'].split(File::PATH_SEPARATOR) + %w[
 
 GLOB = "{#{dirs.join(',')}}/{mysql_config,mysql_config5}"
 
-if RUBY_PLATFORM =~ /mswin|mingw/
-  inc, lib = dir_config('mysql')
-
+# If the user has provided a --with-mysql-dir argument, we must respect it or fail.
+inc, lib = dir_config('mysql')
+if inc && lib
   # Ruby versions not incorporating the mkmf fix at
   # https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39717
   # do not properly search for lib directories, and must be corrected
-  unless lib[-3, 3] == 'lib'
+  unless lib && lib[-3, 3] == 'lib'
     @libdir_basename = 'lib'
     inc, lib = dir_config('mysql')
   end
-  exit 1 unless have_library("libmysql")
-elsif mc = (with_config('mysql-config') || Dir[GLOB].first) then
+  abort "-----\nCannot find include dir at #{inc}\n-----" unless inc && File.directory?(inc)
+  abort "-----\nCannot find library dir at #{lib}\n-----" unless lib && File.directory?(lib)
+  warn  "-----\nUsing --with-mysql-dir=#{File.dirname inc}\n-----"
+  rpath_dir = lib
+elsif mc = (with_config('mysql-config') || Dir[GLOB].first)
+  # If the user has provided a --with-mysql-config argument, we must respect it or fail.
+  # If the user gave --with-mysql-config with no argument means we should try to find it.
   mc = Dir[GLOB].first if mc == true
+  abort "-----\nCannot find mysql_config at #{mc}\n-----" unless mc && File.exists?(mc)
+  abort "-----\nCannot execute mysql_config at #{mc}\n-----" unless File.executable?(mc)
+  warn  "-----\nUsing mysql_config at #{mc}\n-----"
   ver = `#{mc} --version`.chomp.to_f
-  cflags = `#{mc} --cflags`.chomp
+  includes = `#{mc} --include`.chomp
   exit 1 if $? != 0
   libs = `#{mc} --libs_r`.chomp
   # MySQL 5.5 and above already have re-entrant code in libmysqlclient (no _r).
@@ -50,8 +61,9 @@ elsif mc = (with_config('mysql-config') || Dir[GLOB].first) then
     libs = `#{mc} --libs`.chomp
   end
   exit 1 if $? != 0
-  $CPPFLAGS += ' ' + cflags
+  $INCFLAGS += ' ' + includes
   $libs = libs + " " + $libs
+  rpath_dir = libs
 else
   inc, lib = dir_config('mysql', '/usr/local')
   libs = ['m', 'z', 'socket', 'nsl', 'mygcc']
@@ -59,11 +71,16 @@ else
     exit 1 if libs.empty?
     have_library(libs.shift)
   end
+  rpath_dir = lib
+end
+
+if RUBY_PLATFORM =~ /mswin|mingw/
+  exit 1 unless have_library('libmysql')
 end
 
-if have_header('mysql.h') then
+if have_header('mysql.h')
   prefix = nil
-elsif have_header('mysql/mysql.h') then
+elsif have_header('mysql/mysql.h')
   prefix = 'mysql'
 else
   asplode 'mysql.h'
@@ -74,16 +91,38 @@ end
   asplode h unless have_header h
 end
 
-# GCC specific flags
-if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
-  $CFLAGS << ' -Wall -funroll-loops'
+# These gcc style flags are also supported by clang and xcode compilers,
+# so we'll use a does-it-work test instead of an is-it-gcc test.
+gcc_flags = ' -Wall -funroll-loops'
+if try_link('int main() {return 0;}', gcc_flags)
+  $CFLAGS << gcc_flags
+end
 
-  if libdir = $libs[%r{-L(/[^ ]+)}, 1]
-    # The following comment and test is borrowed from the Pg gem:
-    # Try to use runtime path linker option, even if RbConfig doesn't know about it.
-    # The rpath option is usually set implicit by dir_config(), but so far not on Mac OS X.
-    if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', " -Wl,-rpath,#{libdir}")
-      $LDFLAGS << " -Wl,-rpath,#{libdir}"
+case explicit_rpath = with_config('mysql-rpath')
+when true
+  abort "-----\nOption --with-mysql-rpath must have an argument\n-----"
+when false
+  warn "-----\nOption --with-mysql-rpath has been disabled at your request\n-----"
+when String
+  # The user gave us a value so use it
+  rpath_flags = " -Wl,-rpath,#{explicit_rpath}"
+  warn "-----\nSetting mysql rpath to #{explicit_rpath}\n-----"
+  $LDFLAGS << rpath_flags
+else
+  if libdir = rpath_dir[%r{(-L)?(/[^ ]+)}, 2]
+    rpath_flags = " -Wl,-rpath,#{libdir}"
+    if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', rpath_flags)
+      # Usually Ruby sets RPATHFLAG the right way for each system, but not on OS X.
+      warn "-----\nSetting rpath to #{libdir}\n-----"
+      $LDFLAGS << rpath_flags
+    else
+      if RbConfig::CONFIG["RPATHFLAG"].to_s.empty?
+        # If we got here because try_link failed, warn the user
+        warn "-----\nDon't know how to set rpath on your system, if MySQL libraries are not in path mysql2 may not load\n-----"
+      end
+      # Make sure that LIBPATH gets set if we didn't explicitly set the rpath.
+      warn "-----\nSetting libpath to #{libdir}\n-----"
+      $LIBPATH << libdir unless $LIBPATH.include?(libdir)
     end
   end
 end

data/ext/mysql2/mysql2_ext.h

@@ -29,6 +29,9 @@ typedef unsigned int    uint;
 #ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/encoding.h>
 #endif
+#ifdef HAVE_RUBY_THREAD_H
+#include <ruby/thread.h>
+#endif
 
 #if defined(__GNUC__) && (__GNUC__ >= 3)
 #define RB_MYSQL_UNUSED __attribute__ ((unused))

data/ext/mysql2/result.c

@@ -99,10 +99,10 @@ static void rb_mysql_result_free(void *ptr) {
  * reliable way for us to tell this so we'll always release the GVL
  * to be safe
  */
-static VALUE nogvl_fetch_row(void *ptr) {
+static void *nogvl_fetch_row(void *ptr) {
   MYSQL_RES *result = ptr;
 
-  return (VALUE)mysql_fetch_row(result);
+  return mysql_fetch_row(result);
 }
 
 static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int symbolize_keys) {
@@ -157,6 +157,9 @@ static VALUE mysql2_set_field_string_encoding(VALUE val, MYSQL_FIELD field, rb_e
   /* if binary flag is set, respect it's wishes */
   if (field.flags & BINARY_FLAG && field.charsetnr == 63) {
     rb_enc_associate(val, binaryEncoding);
+  } else if (!field.charsetnr) {
+    /* MySQL 4.x may not provide an encoding, binary will get the bytes through */
+    rb_enc_associate(val, binaryEncoding);
   } else {
     /* lookup the encoding configured on this field */
     const char *enc_name;
@@ -200,7 +203,7 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
 #endif
 
   ptr = wrapper->result;
-  row = (MYSQL_ROW)rb_thread_blocking_region(nogvl_fetch_row, ptr, RUBY_UBF_IO, 0);
+  row = (MYSQL_ROW)rb_thread_call_without_gvl(nogvl_fetch_row, ptr, RUBY_UBF_IO, 0);
   if (row == NULL) {
     return Qnil;
   }
@@ -280,6 +283,10 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
           int tokens;
           unsigned int hour=0, min=0, sec=0;
           tokens = sscanf(row[i], "%2u:%2u:%2u", &hour, &min, &sec);
+          if (tokens < 3) {
+            val = Qnil;
+            break;
+          }
           val = rb_funcall(rb_cTime, db_timezone, 6, opt_time_year, opt_time_month, opt_time_month, UINT2NUM(hour), UINT2NUM(min), UINT2NUM(sec));
           if (!NIL_P(app_timezone)) {
             if (app_timezone == intern_local) {
@@ -297,6 +304,10 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
           uint64_t seconds;
 
           tokens = sscanf(row[i], "%4u-%2u-%2u %2u:%2u:%2u.%6u", &year, &month, &day, &hour, &min, &sec, &msec);
+          if (tokens < 6) { /* msec might be empty */
+            val = Qnil;
+            break;
+          }
           seconds = (year*31557600ULL) + (month*2592000ULL) + (day*86400ULL) + (hour*3600ULL) + (min*60ULL) + sec;
 
           if (seconds == 0) {
@@ -339,6 +350,10 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
           int tokens;
           unsigned int year=0, month=0, day=0;
           tokens = sscanf(row[i], "%4u-%2u-%2u", &year, &month, &day);
+          if (tokens < 3) {
+            val = Qnil;
+            break;
+          }
           if (year+month+day == 0) {
             val = Qnil;
           } else {

data/lib/mysql2/client.rb

@@ -10,7 +10,9 @@ module Mysql2
       :application_timezone => nil,   # timezone Mysql2 will convert to before handing the object back to the caller
       :cache_rows => true,            # tells Mysql2 to use it's internal row cache for results
       :connect_flags => REMEMBER_OPTIONS | LONG_PASSWORD | LONG_FLAG | TRANSACTIONS | PROTOCOL_41 | SECURE_CONNECTION,
-      :cast => true
+      :cast => true,
+      :default_file => nil,
+      :default_group => nil
     }
 
     def initialize(opts = {})
@@ -21,11 +23,10 @@ module Mysql2
 
       initialize_ext
 
-      # Set MySQL connection options (each one is a call to mysql_options())
-      [:reconnect, :connect_timeout, :local_infile, :read_timeout, :write_timeout].each do |key|
+      [:reconnect, :connect_timeout, :local_infile, :read_timeout, :write_timeout, :default_file, :default_group, :secure_auth].each do |key|
         next unless opts.key?(key)
         case key
-        when :reconnect, :local_infile
+        when :reconnect, :local_infile, :secure_auth
           send(:"#{key}=", !!opts[key])
         when :connect_timeout, :read_timeout, :write_timeout
           send(:"#{key}=", opts[key].to_i)
@@ -49,12 +50,20 @@ module Mysql2
 
       user     = opts[:username] || opts[:user]
       pass     = opts[:password] || opts[:pass]
-      host     = opts[:host] || opts[:hostname] || 'localhost'
-      port     = opts[:port] || 3306
+      host     = opts[:host] || opts[:hostname]
+      port     = opts[:port]
       database = opts[:database] || opts[:dbname] || opts[:db]
       socket   = opts[:socket] || opts[:sock]
       flags    = opts[:flags] ? opts[:flags] | @query_options[:connect_flags] : @query_options[:connect_flags]
 
+      # Correct the data types before passing these values down to the C level
+      user = user.to_s unless user.nil?
+      pass = pass.to_s unless pass.nil?
+      host = host.to_s unless host.nil?
+      port = port.to_i unless port.nil?
+      database = database.to_s unless database.nil?
+      socket = socket.to_s unless socket.nil?
+
       connect user, pass, host, port, database, socket, flags
     end
 

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.2.20"
+  VERSION = "0.2.21"
 end

data/spec/configuration.yml.example

@@ -9,3 +9,9 @@ user:
   username: LOCALUSERNAME
   password:
   database: mysql2_test
+
+numericuser:
+  host: localhost
+  username: LOCALUSERNAME
+  password:
+  database: 12345

data/spec/my.cnf.example

@@ -0,0 +1,9 @@
+[root]
+host=localhost
+user=LOCALUSERNAME
+password=
+
+[client]
+host=localhost
+user=LOCALUSERNAME
+password=

data/spec/mysql2/client_spec.rb

@@ -2,6 +2,22 @@
 require 'spec_helper'
 
 describe Mysql2::Client do
+  context "using defaults file" do
+    let(:cnf_file) { File.expand_path('../../my.cnf', __FILE__) }
+
+    it "should not raise an exception for valid defaults group" do
+      lambda {
+        @client = Mysql2::Client.new(:default_file => cnf_file, :default_group => "test")
+      }.should_not raise_error(Mysql2::Error)
+    end
+
+    it "should not raise an exception without default group" do
+      lambda {
+        @client = Mysql2::Client.new(:default_file => cnf_file)
+      }.should_not raise_error(Mysql2::Error)
+    end
+  end
+
   it "should raise an exception upon connection failure" do
     lambda {
       # The odd local host IP address forces the mysql client library to
@@ -88,6 +104,16 @@ describe Mysql2::Client do
     ssl_client.close
   end
 
+  it "should be able to connect to database with numeric-only name" do
+    lambda {
+      creds = DatabaseCredentials['numericuser']
+      @client.query "CREATE DATABASE IF NOT EXISTS `#{creds['database']}`"
+      @client.query "GRANT ALL ON `#{creds['database']}`.* TO #{creds['username']}@`#{creds['host']}`"
+      client = Mysql2::Client.new creds
+      @client.query "DROP DATABASE IF EXISTS `#{creds['database']}`"
+    }.should_not raise_error
+  end
+
   it "should respond to #close" do
     @client.should respond_to(:close)
   end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.2.20
-  prerelease: 
+  version: 0.2.21
 platform: ruby
 authors:
 - Brian Lopez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -109,6 +100,7 @@ files:
 - examples/threaded.rb
 - spec/configuration.yml.example
 - spec/em/em_spec.rb
+- spec/my.cnf.example
 - spec/mysql2/client_spec.rb
 - spec/mysql2/error_spec.rb
 - spec/mysql2/result_spec.rb
@@ -117,34 +109,34 @@ files:
 homepage: http://github.com/brianmario/mysql2
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple, fast Mysql library for Ruby, binding to libmysql
 test_files:
 - examples/eventmachine.rb
 - examples/threaded.rb
 - spec/configuration.yml.example
 - spec/em/em_spec.rb
+- spec/my.cnf.example
 - spec/mysql2/client_spec.rb
 - spec/mysql2/error_spec.rb
 - spec/mysql2/result_spec.rb