From baad1c4cdce95b167f5b0a8329f853e58d6430a2 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 21 Nov 2005 12:47:28 +0000 Subject: Simpler Mysql load test. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3148 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb') diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index d58590677b..ceb42a659c 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -5,7 +5,7 @@ module ActiveRecord # Establishes a connection to the database that's used by all Active Record objects. def self.mysql_connection(config) # :nodoc: # Only include the MySQL driver if one hasn't already been loaded - unless self.class.const_defined?(:Mysql) + unless defined? Mysql begin require_library_or_gem 'mysql' # The C version of mysql returns null fields in each_hash if Mysql::VERSION is defined @@ -21,7 +21,7 @@ module ActiveRecord end end end - + config = config.symbolize_keys host = config[:host] -- cgit v1.2.3