MySQL: more robust test for nullified result hashes. References #3124.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3246 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 2 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 6327840752..0a51559fed 100755
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -8,14 +8,10 @@ module ActiveRecord
       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
-          ConnectionAdapters::MysqlAdapter.null_values_in_each_hash = Mysql.const_defined?(:VERSION)
         rescue LoadError => cannot_require_mysql
           # Only use the supplied backup Ruby/MySQL driver if no driver is already in place
           begin
             require 'active_record/vendor/mysql'
-            # The ruby version of mysql returns null fields in each_hash
-            ConnectionAdapters::MysqlAdapter.null_values_in_each_hash = true
           rescue LoadError
             raise cannot_require_mysql
           end
@@ -77,9 +73,6 @@ module ActiveRecord
       @@emulate_booleans = true
       cattr_accessor :emulate_booleans
 
-      cattr_accessor :null_values_in_each_hash
-      @@null_values_in_each_hash = false
-
       LOST_CONNECTION_ERROR_MESSAGES = [
         "Server shutdown in progress",
         "Broken pipe",
@@ -90,6 +83,7 @@ module ActiveRecord
       def initialize(connection, logger, connection_options=nil, config={})
         super(connection, logger)
         @connection_options = connection_options
+        @null_values_in_each_hash = Mysql.const_defined?(:VERSION)
         @config = config
         connect
       end
@@ -332,7 +326,7 @@ module ActiveRecord
           @connection.query_with_result = true
           result = execute(sql, name)
           rows = []
-          if @@null_values_in_each_hash
+          if @null_values_in_each_hash
             result.each_hash { |row| rows << row }
           else
             all_fields = result.fetch_fields.inject({}) { |fields, f| fields[f.name] = nil; fields }