mysql2 0.3.12b2 → 0.3.12b3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mysql2 (0.3.12b2)
+    mysql2 (0.3.12b3)
 
 GEM
   remote: http://rubygems.org/

data/ext/mysql2/client.c

@@ -1054,107 +1054,107 @@ void init_mysql2_client() {
 
 #ifdef CLIENT_LONG_PASSWORD
   rb_const_set(cMysql2Client, rb_intern("LONG_PASSWORD"),
-      INT2NUM(CLIENT_LONG_PASSWORD));
+      LONG2NUM(CLIENT_LONG_PASSWORD));
 #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));
 #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
 }

data/ext/mysql2/extconf.rb

@@ -31,10 +31,12 @@ if RUBY_PLATFORM =~ /mswin|mingw/
   exit 1 unless have_library("libmysql")
 elsif mc = (with_config('mysql-config') || Dir[GLOB].first) then
   mc = Dir[GLOB].first if mc == true
+  ver = `#{mc} --version`.chomp.to_f
   cflags = `#{mc} --cflags`.chomp
   exit 1 if $? != 0
   libs = `#{mc} --libs_r`.chomp
-  if libs.empty?
+  # MySQL 5.5 and above already have re-entrant code in libmysqlclient (no _r).
+  if ver >= 5.5 || libs.empty?
     libs = `#{mc} --libs`.chomp
   end
   exit 1 if $? != 0

data/lib/mysql2.rb

@@ -16,11 +16,15 @@ module Mysql2
 end
 
 if defined?(ActiveRecord::VERSION::STRING) && ActiveRecord::VERSION::STRING < "3.1"
-  warn "============= WARNING FROM mysql2 ============="
-  warn "This version of mysql2 (#{Mysql2::VERSION}) doesn't ship with the ActiveRecord adapter."
-  warn "In Rails version 3.1.0 and up, the mysql2 ActiveRecord adapter is included with rails."
-  warn "If you want to use the mysql2 gem with Rails <= 3.0.x, please use the latest mysql2 in the 0.2.x series."
-  warn "============= END WARNING FROM mysql2 ============="
+  begin
+    require 'active_record/connection_adapters/mysql2_adapter'
+  rescue LoadError
+    warn "============= WARNING FROM mysql2 ============="
+    warn "This version of mysql2 (#{Mysql2::VERSION}) doesn't ship with the ActiveRecord adapter."
+    warn "In Rails version 3.1.0 and up, the mysql2 ActiveRecord adapter is included with rails."
+    warn "If you want to use the mysql2 gem with Rails <= 3.0.x, please use the latest mysql2 in the 0.2.x series."
+    warn "============= END WARNING FROM mysql2 ============="
+  end
 end
 
 # For holding utility methods

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.3.12b2"
+  VERSION = "0.3.12b3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.3.12b2
+  version: 0.3.12b3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine