diff options
Diffstat (limited to 'activerecord')
| -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 |