mysql2 0.3.7 → 0.3.8

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.2@mysql2 --create
+rvm use 1.9.3@mysql2 --create

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+before_script:
+  - "mysql -e 'create database test;' >/dev/null"

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.3.8 (November 9th, 2011)
+* remove fiber support from mysql2, the code has moved to the
+  em-synchrony gem.
+* use rb_wait_for_single_fd() if available
+* fixed a bug with inheriting query options
+* remove ext/ from the default loadpath
+* fix build issues on OSX with Xcode 4.2 (gcc-llvm compiler)
+
 ## 0.3.7 (August 16th, 2011)
 * ensure symbolized column names support encodings in 1.9
 
@@ -36,6 +44,12 @@
 * BREAKING CHANGE: the ActiveRecord adapter has been pulled into Rails 3.1 and is no longer part of the gem
 * added Mysql2::Client.escape (class-level) for raw one-off non-encoding-aware escaping
 
+## 0.2.14 (November 9th, 2011)
+* use rb_wait_for_single_fd() if available
+* fixed a bug with inheriting query options
+* remove ext/ from the default loadpath
+* fix build issues on OSX with Xcode 4.2 (gcc-llvm compiler)
+
 ## 0.2.13 (August 16th, 2011)
 * fix stupid bug around symbol encoding support (thanks coderrr!)
 

data/README.md

@@ -6,7 +6,7 @@ This one is not.
 
 It also forces the use of UTF-8 [or binary] for the connection [and all strings in 1.9, unless Encoding.default_internal is set then it'll convert from UTF-8 to that encoding] and uses encoding-aware MySQL API calls where it can.
 
-The API consists of two clases:
+The API consists of two classes:
 
 Mysql2::Client - your connection to the database
 
@@ -214,7 +214,7 @@ This would be helpful if you wanted to iterate over the results in a streaming m
 
 ## ActiveRecord
 
-To use the ActiveRecord driver (with our 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 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".
 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
@@ -222,8 +222,7 @@ Rails versions < 3.1 make sure and specify `gem "mysql2", "~> 0.2.7"` in your Ge
 
 ## Asynchronous ActiveRecord
 
-You can also use Mysql2 with asynchronous Rails (first introduced at http://www.mikeperham.com/2010/04/03/introducing-phat-an-asynchronous-rails-app/) by
-setting the adapter in your database.yml to "em_mysql2".  You must be running Ruby 1.9, thin and the rack-fiber_pool middleware for it to work.
+Please see the [em-synchrony](https://github.com/igrigorik/em-synchrony) project for details about using EventMachine with mysql2 and Rails.
 
 ## Sequel
 

data/ext/mysql2/client.c

@@ -4,6 +4,7 @@
 #ifndef _WIN32
 #include <sys/socket.h>
 #endif
+#include "wait_for_single_fd.h"
 
 VALUE cMysql2Client;
 extern VALUE mMysql2, cMysql2Error;
@@ -45,6 +46,7 @@ struct nogvl_connect_args {
 struct nogvl_send_query_args {
   MYSQL *mysql;
   VALUE sql;
+  mysql_client_wrapper *wrapper;
 };
 
 /*
@@ -145,7 +147,7 @@ static VALUE nogvl_close(void *ptr) {
 #endif
 
     mysql_close(wrapper->client);
-    xfree(wrapper->client);
+    free(wrapper->client);
   }
 
   return Qnil;
@@ -156,7 +158,7 @@ static void rb_mysql_client_free(void * ptr) {
 
   nogvl_close(wrapper);
 
-  xfree(ptr);
+  free(ptr);
 }
 
 static VALUE allocate(VALUE klass) {
@@ -167,7 +169,7 @@ static VALUE allocate(VALUE klass) {
   wrapper->active = 0;
   wrapper->reconnect_enabled = 0;
   wrapper->closed = 1;
-  wrapper->client = (MYSQL*)xmalloc(sizeof(MYSQL));
+  wrapper->client = (MYSQL*)malloc(sizeof(MYSQL));
   return obj;
 }
 
@@ -179,19 +181,19 @@ static VALUE rb_mysql_client_escape(RB_MYSQL_UNUSED VALUE klass, VALUE str) {
   Check_Type(str, T_STRING);
 
   oldLen = RSTRING_LEN(str);
-  newStr = xmalloc(oldLen*2+1);
+  newStr = malloc(oldLen*2+1);
 
   newLen = mysql_escape_string((char *)newStr, StringValuePtr(str), oldLen);
   if (newLen == oldLen) {
     // no need to return a new ruby string if nothing changed
-    xfree(newStr);
+    free(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);
+    free(newStr);
     return rb_str;
   }
 }
@@ -249,6 +251,17 @@ static VALUE nogvl_send_query(void *ptr) {
   return 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) {
+    // an error occurred, we're not active anymore
+    MARK_CONN_INACTIVE(self);
+    return rb_raise_mysql2_error(wrapper);
+  }
+  return Qnil;
+}
+
 /*
  * even though we did rb_thread_select before calling this, a large
  * response can overflow the socket buffers and cause us to eventually
@@ -341,9 +354,7 @@ static VALUE do_query(void *args) {
   struct timeval tv;
   struct timeval* tvp;
   long int sec;
-  fd_set fdset;
   int retval;
-  int fd_set_fd;
   VALUE read_timeout;
 
   async_args = (struct async_query_args *)args;
@@ -364,14 +375,8 @@ static VALUE do_query(void *args) {
     tvp->tv_usec = 0;
   }
 
-  fd_set_fd = async_args->fd;
   for(;;) {
-    // the below code is largely from do_mysql
-    // http://github.com/datamapper/do
-    FD_ZERO(&fdset);
-    FD_SET(fd_set_fd, &fdset);
-
-    retval = rb_thread_select(fd_set_fd + 1, &fdset, NULL, NULL, tvp);
+    retval = rb_wait_for_single_fd(async_args->fd, RB_WAITFD_IN, tvp);
 
     if (retval == 0) {
       rb_raise(cMysql2Error, "Timeout waiting for a response from the last query. (waited %d seconds)", FIX2INT(read_timeout));
@@ -426,13 +431,6 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
   REQUIRE_OPEN_DB(wrapper);
   args.mysql = wrapper->client;
 
-  // 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");
-  }
 
   defaults = rb_iv_get(self, "@query_options");
   if (rb_scan_args(argc, argv, "11", &args.sql, &opts) == 2) {
@@ -453,12 +451,17 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
   args.sql = rb_str_export_to_enc(args.sql, conn_enc);
 #endif
 
-  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);
+  // 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");
   }
 
+  args.wrapper = wrapper;
+  rb_rescue2(do_send_query, (VALUE)&args, disconnect_and_raise, self, rb_eException, (VALUE)0);
+
 #ifndef _WIN32
   if (!async) {
     async_args.fd = wrapper->client->net.fd;
@@ -496,12 +499,12 @@ static VALUE rb_mysql_client_real_escape(VALUE self, VALUE str) {
 #endif
 
   oldLen = RSTRING_LEN(str);
-  newStr = xmalloc(oldLen*2+1);
+  newStr = malloc(oldLen*2+1);
 
   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
-    xfree(newStr);
+    free(newStr);
     return str;
   } else {
     rb_str = rb_str_new((const char*)newStr, newLen);
@@ -511,7 +514,7 @@ static VALUE rb_mysql_client_real_escape(VALUE self, VALUE str) {
       rb_str = rb_str_export_to_enc(rb_str, default_internal_enc);
     }
 #endif
-    xfree(newStr);
+    free(newStr);
     return rb_str;
   }
 }

data/ext/mysql2/extconf.rb

@@ -7,6 +7,7 @@ end
 
 # 1.9-only
 have_func('rb_thread_blocking_region')
+have_func('rb_wait_for_single_fd')
 
 # borrowed from mysqlplus
 # http://github.com/oldmoe/mysqlplus/blob/master/ext/extconf.rb

data/ext/mysql2/result.c

@@ -80,7 +80,7 @@ static void rb_mysql_result_free(void * wrapper) {
   mysql2_result_wrapper * w = wrapper;
   /* FIXME: this may call flush_use_result, which can hit the socket */
   rb_mysql_result_free_result(w);
-  xfree(wrapper);
+  free(wrapper);
 }
 
 /*
@@ -139,7 +139,7 @@ static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int
 }
 
 #ifdef HAVE_RUBY_ENCODING_H
-inline VALUE mysql2_set_field_string_encoding(VALUE val, MYSQL_FIELD field, rb_encoding *default_internal_enc, rb_encoding *conn_enc) {
+static VALUE mysql2_set_field_string_encoding(VALUE val, MYSQL_FIELD field, rb_encoding *default_internal_enc, rb_encoding *conn_enc) {
   // if binary flag is set, respect it's wishes
   if (field.flags & BINARY_FLAG && field.charsetnr == 63) {
     rb_enc_associate(val, binaryEncoding);

data/ext/mysql2/wait_for_single_fd.h

@@ -0,0 +1,36 @@
+/*
+ * backwards compatibility for pre-1.9.3 C API
+ *
+ * Ruby 1.9.3 provides this API which allows the use of ppoll() on Linux
+ * to minimize select() and malloc() overhead on high-numbered FDs.
+ */
+#ifdef HAVE_RB_WAIT_FOR_SINGLE_FD
+#  include <ruby/io.h>
+#else
+#  define RB_WAITFD_IN  0x001
+#  define RB_WAITFD_PRI 0x002
+#  define RB_WAITFD_OUT 0x004
+
+static int my_wait_for_single_fd(int fd, int events, struct timeval *tvp)
+{
+  fd_set fdset;
+  fd_set *rfds = NULL;
+  fd_set *wfds = NULL;
+  fd_set *efds = NULL;
+
+  FD_ZERO(&fdset);
+  FD_SET(fd, &fdset);
+
+  if (events & RB_WAITFD_IN)
+    rfds = &fdset;
+  if (events & RB_WAITFD_OUT)
+    wfds = &fdset;
+  if (events & RB_WAITFD_PRI)
+    efds = &fdset;
+
+  return rb_thread_select(fd + 1, rfds, wfds, efds, tvp);
+}
+
+#define rb_wait_for_single_fd(fd,events,tvp) \
+        my_wait_for_single_fd((fd),(events),(tvp))
+#endif

data/lib/mysql2/client.rb

@@ -15,6 +15,7 @@ module Mysql2
 
     def initialize(opts = {})
       @query_options = @@default_query_options.dup
+      @query_options.merge! opts
 
       init_connection
 
@@ -30,7 +31,7 @@ module Mysql2
         raise Mysql2::Error, "read_timeout must be a positive integer, you passed #{@read_timeout}"
       end
 
-      ssl_set(*opts.values_at(:sslkey, :sslcert, :sslca, :sslcapath, :sslciper))
+      ssl_set(*opts.values_at(:sslkey, :sslcert, :sslca, :sslcapath, :sslcipher))
 
       user     = opts[:username]
       pass     = opts[:password]

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/mysql2.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.homepage = %q{http://github.com/brianmario/mysql2}
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib", "ext"]
+  s.require_paths = ["lib"]
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{A simple, fast Mysql library for Ruby, binding to libmysql}
   s.test_files = `git ls-files spec examples`.split("\n")
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   # tests
   s.add_development_dependency 'eventmachine'
   s.add_development_dependency 'rake-compiler', "~> 0.7.7"
+  s.add_development_dependency 'rake', '0.8.7' # NB: 0.8.7 required by rake-compiler 0.7.9
   s.add_development_dependency 'rspec'
   # benchmarks
   s.add_development_dependency 'activerecord'
@@ -26,4 +27,3 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sequel'
   s.add_development_dependency 'faker'
 end
-

data/spec/em/em_spec.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
-if defined? EventMachine
-  require 'spec_helper'
+require 'spec_helper'
+begin
+  require 'eventmachine'
   require 'mysql2/em'
 
   describe Mysql2::EM::Client do
@@ -44,6 +45,6 @@ if defined? EventMachine
       results[1].keys.should include("second_query")
     end
   end
-else
+rescue LoadError
   puts "EventMachine not installed, skipping the specs that use it"
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mysql2
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Brian Lopez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 -07:00
+date: 2011-11-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,21 +49,23 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 49
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 7
+        version: 0.8.7
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,7 +79,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mysql
+  name: activerecord
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,7 +93,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: do_mysql
+  name: mysql
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -105,7 +107,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sequel
+  name: do_mysql
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -119,7 +121,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: faker
+  name: sequel
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -132,6 +134,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: faker
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
 description: 
 email: seniorlopez@gmail.com
 executables: []
@@ -144,6 +160,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -167,17 +184,14 @@ files:
 - ext/mysql2/mysql2_ext.h
 - ext/mysql2/result.c
 - ext/mysql2/result.h
-- lib/active_record/connection_adapters/em_mysql2_adapter.rb
-- lib/active_record/fiber_patches.rb
+- ext/mysql2/wait_for_single_fd.h
 - lib/mysql2.rb
 - lib/mysql2/client.rb
 - lib/mysql2/em.rb
-- lib/mysql2/em_fiber.rb
 - lib/mysql2/error.rb
 - lib/mysql2/result.rb
 - lib/mysql2/version.rb
 - mysql2.gemspec
-- spec/em/em_fiber_spec.rb
 - spec/em/em_spec.rb
 - spec/mysql2/client_spec.rb
 - spec/mysql2/error_spec.rb
@@ -197,7 +211,6 @@ rdoc_options:
 - --charset=UTF-8
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -226,7 +239,6 @@ summary: A simple, fast Mysql library for Ruby, binding to libmysql
 test_files: 
 - examples/eventmachine.rb
 - examples/threaded.rb
-- spec/em/em_fiber_spec.rb
 - spec/em/em_spec.rb
 - spec/mysql2/client_spec.rb
 - spec/mysql2/error_spec.rb

data/lib/active_record/connection_adapters/em_mysql2_adapter.rb

@@ -1,64 +0,0 @@
-# encoding: utf-8
-
-# AR adapter for using a fibered mysql2 connection with EM
-# This adapter should be used within Thin or Unicorn with the rack-fiber_pool middleware.
-# Just update your database.yml's adapter to be 'em_mysql2'
-
-module ActiveRecord
-  class Base
-    def self.em_mysql2_connection(config)
-      client = ::Mysql2::Fibered::Client.new(config.symbolize_keys)
-      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
-      ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
-    end
-  end
-end
-
-require 'fiber'
-require 'eventmachine'
-require 'mysql2'
-require 'active_record/connection_adapters/mysql2_adapter'
-require 'active_record/fiber_patches'
-
-module Mysql2
-  module Fibered
-    class Client < ::Mysql2::Client
-      module Watcher
-        def initialize(client, deferable)
-          @client = client
-          @deferable = deferable
-        end
-
-        def notify_readable
-          begin
-            detach
-            results = @client.async_result
-            @deferable.succeed(results)
-          rescue Exception => e
-            @deferable.fail(e)
-          end
-        end
-      end
-
-      def query(sql, opts={})
-        if ::EM.reactor_running?
-          super(sql, opts.merge(:async => true))
-          deferrable = ::EM::DefaultDeferrable.new
-          ::EM.watch(self.socket, Watcher, self, deferrable).notify_readable = true
-          fiber = Fiber.current
-          deferrable.callback do |result|
-            fiber.resume(result)
-          end
-          deferrable.errback do |err|
-            fiber.resume(err)
-          end
-          Fiber.yield.tap do |result|
-            raise result if result.is_a?(Exception)
-          end
-        else
-          super(sql, opts)
-        end
-      end
-    end
-  end
-end

data/lib/active_record/fiber_patches.rb

@@ -1,132 +0,0 @@
-# Necessary monkeypatching to make AR fiber-friendly.
-
-module ActiveRecord
-  module ConnectionAdapters
-
-    def self.fiber_pools
-      @fiber_pools ||= []
-    end
-    def self.register_fiber_pool(fp)
-      fiber_pools << fp
-    end
-
-    class FiberedMonitor
-      class Queue
-        def initialize
-          @queue = []
-        end
-
-        def wait(timeout)
-          t = timeout || 5
-          fiber = Fiber.current
-          x = EM::Timer.new(t) do
-            @queue.delete(fiber)
-            fiber.resume(false)
-          end
-          @queue << fiber
-          Fiber.yield.tap do
-            x.cancel
-          end
-        end
-
-        def signal
-          fiber = @queue.pop
-          fiber.resume(true) if fiber
-        end
-      end
-
-      def synchronize
-        yield
-      end
-
-      def new_cond
-        Queue.new
-      end
-    end
-
-    # ActiveRecord's connection pool is based on threads.  Since we are working
-    # with EM and a single thread, multiple fiber design, we need to provide
-    # our own connection pool that keys off of Fiber.current so that different
-    # fibers running in the same thread don't try to use the same connection.
-    class ConnectionPool
-      def initialize(spec)
-        @spec = spec
-
-        # The cache of reserved connections mapped to threads
-        @reserved_connections = {}
-
-        # The mutex used to synchronize pool access
-        @connection_mutex = FiberedMonitor.new
-        @queue = @connection_mutex.new_cond
-
-        # default 5 second timeout unless on ruby 1.9
-        @timeout = spec.config[:wait_timeout] || 5
-
-        # default max pool size to 5
-        @size = (spec.config[:pool] && spec.config[:pool].to_i) || 5
-
-        @connections = []
-        @checked_out = []
-        @automatic_reconnect = true
-        @tables = {}
-
-        @columns     = Hash.new do |h, table_name|
-          h[table_name] = with_connection do |conn|
-
-            # Fetch a list of columns
-            conn.columns(table_name, "#{table_name} Columns").tap do |columns|
-
-              # set primary key information
-              columns.each do |column|
-                column.primary = column.name == primary_keys[table_name]
-              end
-            end
-          end
-        end
-
-        @columns_hash = Hash.new do |h, table_name|
-          h[table_name] = Hash[columns[table_name].map { |col|
-            [col.name, col]
-          }]
-        end
-
-        @primary_keys = Hash.new do |h, table_name|
-          h[table_name] = with_connection do |conn|
-            table_exists?(table_name) ? conn.primary_key(table_name) : 'id'
-          end
-        end
-      end
-
-      def clear_stale_cached_connections!
-        cache = @reserved_connections
-        keys = Set.new(cache.keys)
-
-        ActiveRecord::ConnectionAdapters.fiber_pools.each do |pool|
-          pool.busy_fibers.each_pair do |object_id, fiber|
-            keys.delete(object_id)
-          end
-        end
-
-        keys.each do |key|
-          next unless cache.has_key?(key)
-          checkin cache[key]
-          cache.delete(key)
-        end
-      end
-
-      private
-
-      def current_connection_id #:nodoc:
-        Fiber.current.object_id
-      end
-
-      def checkout_and_verify(c)
-        @checked_out << c
-        c.run_callbacks :checkout
-        c.verify!
-        c
-      end
-    end
-
-  end
-end

data/lib/mysql2/em_fiber.rb

@@ -1,31 +0,0 @@
-# encoding: utf-8
-
-require 'mysql2/em'
-require 'fiber'
-
-module Mysql2
-  module EM
-    module Fiber
-      class Client < ::Mysql2::EM::Client
-        def query(sql, opts={})
-          if ::EM.reactor_running?
-            deferable = super(sql, opts)
-
-            fiber = ::Fiber.current
-            deferable.callback do |result|
-              fiber.resume(result)
-            end
-            deferable.errback do |err|
-              fiber.resume(err)
-            end
-            ::Fiber.yield.tap do |result|
-              raise result if result.is_a?(::Exception)
-            end
-          else
-            super(sql, opts)
-          end
-        end
-      end
-    end
-  end
-end

data/spec/em/em_fiber_spec.rb

@@ -1,22 +0,0 @@
-# encoding: UTF-8
-if defined? EventMachine && defined? Fiber
-  require 'spec_helper'
-  require 'mysql2/em_fiber'
-
-  describe Mysql2::EM::Fiber::Client do
-    it 'should support queries' do
-      results = []
-      EM.run do
-        Fiber.new {
-          client1 = Mysql2::EM::Fiber::Client.new
-          results = client1.query "SELECT sleep(0.1) as first_query"
-          EM.stop_event_loop
-        }.resume
-      end
-
-      results.first.keys.should include("first_query")
-    end
-  end
-else
-  puts "Either EventMachine or Fibers not available. Skipping tests that use them."
-end