Merge [6241] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Feb 26, 2007 · ee31d64 · ee31d64
1 parent f444374
commit ee31d64
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/vendor/mysql.rb b/activerecord/lib/active_record/vendor/mysql.rb
@@ -1174,7 +1174,11 @@ def real_connect(*args)
   def finalizer(net)
     proc {
       net.clear
-      net.write Mysql::COM_QUIT.chr
+      begin
+        net.write(Mysql::COM_QUIT.chr)
+        net.close
+      rescue  # Ignore IOError if socket is already closed.
+      end
     }
   end