diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-11 10:59:49 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-11 10:59:49 +0000 |
| commit | 45ea2bd4528aab5394cb5c94528f5b2c001ed518 (patch) | |
| tree | 03c1cf7accc719f6354b6c9a926725e76600b3d9 /activerecord/lib | |
| parent | 2182a8203ff4c7b3d4fc36d59961a73d591f5e6b (diff) | |
| download | rails-45ea2bd4528aab5394cb5c94528f5b2c001ed518.tar.gz rails-45ea2bd4528aab5394cb5c94528f5b2c001ed518.tar.bz2 rails-45ea2bd4528aab5394cb5c94528f5b2c001ed518.zip | |
Fixed the 4.11 changes to the mysql adapter
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@391 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/vendor/mysql411.rb (renamed from activerecord/lib/active_record/connection_adapters/mysql411.rb) | 0 |
2 files changed, 1 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 a6374f7b73..645e5f6dd4 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -13,7 +13,7 @@ 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/connection_adapters/mysql411' + require 'active_record/vendor/mysql411' rescue LoadError raise cannot_require_mysql end diff --git a/activerecord/lib/active_record/connection_adapters/mysql411.rb b/activerecord/lib/active_record/vendor/mysql411.rb index 15f8f03cec..15f8f03cec 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql411.rb +++ b/activerecord/lib/active_record/vendor/mysql411.rb |