diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-09 06:43:40 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-09 06:43:40 +0000 |
| commit | 44591ffb710701993ffdec0b61185f8067e4e78f (patch) | |
| tree | 8d4937ae9e9eb4077435b1eafe4a2d11b0aac281 /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | |
| parent | bb4c32e2b5858b25524191ee4868e616fa5bd9be (diff) | |
| download | rails-44591ffb710701993ffdec0b61185f8067e4e78f.tar.gz rails-44591ffb710701993ffdec0b61185f8067e4e78f.tar.bz2 rails-44591ffb710701993ffdec0b61185f8067e4e78f.zip | |
r3886@sedna: jeremy | 2005-11-07 03:09:59 -0800
r3944@sedna: jeremy | 2005-11-09 01:29:56 -0800
Upgrade bundled ruby-mysql 0.2.4 with mysql411 shim (see #440) to ruby-mysql0.2.6 with a patchset for 4.1 protocol support. Local change [301] is now apart of the main driver; reapplied local change [2182]. Removed GC.start fromResult.free.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2947 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 0834bf51e0..ca410c4add 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -14,7 +14,6 @@ module ActiveRecord # Only use the supplied backup Ruby/MySQL driver if no driver is already in place begin require 'active_record/vendor/mysql' - require 'active_record/vendor/mysql411' # The ruby version of mysql returns null fields in each_hash ConnectionAdapters::MysqlAdapter.null_values_in_each_hash = true rescue LoadError |