diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-10 22:52:14 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-10 22:52:14 +0000 |
| commit | b9f28eb587a4ad52ea2e0f499aaa7bc53746c173 (patch) | |
| tree | e1e32df231eb178928cebe2249c91f6130cc7ca1 /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | |
| parent | 14ed815b1c0098f1f7132d0a5a7e22088849c30e (diff) | |
| download | rails-b9f28eb587a4ad52ea2e0f499aaa7bc53746c173.tar.gz rails-b9f28eb587a4ad52ea2e0f499aaa7bc53746c173.tar.bz2 rails-b9f28eb587a4ad52ea2e0f499aaa7bc53746c173.zip | |
Added support for the new protocol spoken by MySQL 4.1.1+ servers for the Ruby/MySQL adapter that ships with Rails #440 [Matt Mower]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@372 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, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index f9c38470aa..a6374f7b73 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -13,6 +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' rescue LoadError raise cannot_require_mysql end |