Skip to content
Browse files

Merge [6241] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent f444374 commit ee31d643eb2f32937abad31c410bec28fc3b764d @jeremy jeremy committed Feb 26, 2007
Showing with 5 additions and 1 deletion.
  1. +5 −1 activerecord/lib/active_record/vendor/mysql.rb
View
6 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

0 comments on commit ee31d64

Please sign in to comment.
Something went wrong with that request. Please try again.