diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-11 05:43:46 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-11 05:43:46 +0000 |
commit | 04594cfadbfffceb087e1151f8b81255108d5211 (patch) | |
tree | e20ddad3b066a320fa4ec4cffc80f846af3f0dbe | |
parent | 8aa63a78b8ac238dd379108a5cb2cc5cc5418a40 (diff) | |
download | rails-04594cfadbfffceb087e1151f8b81255108d5211.tar.gz rails-04594cfadbfffceb087e1151f8b81255108d5211.tar.bz2 rails-04594cfadbfffceb087e1151f8b81255108d5211.zip |
Fixed "connection lost" issue with the bundled Ruby/MySQL driver (would kill the app after 8 hours of inactivity) #2163, #428 [kajism@yahoo.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2182 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/vendor/mysql.rb | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index d3690eb92f..2122c58fde 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed "connection lost" issue with the bundled Ruby/MySQL driver (would kill the app after 8 hours of inactivity) #2163, #428 [kajism@yahoo.com] + * Fixed comparison of Active Record objects so two new objects are not equal #2099 [deberg] * Fixed that the SQL Server adapter would sometimes return DBI::Timestamp objects instead of Time #2127 [Tom Ward] diff --git a/activerecord/lib/active_record/vendor/mysql.rb b/activerecord/lib/active_record/vendor/mysql.rb index 84f5d2533c..39ceb607b0 100644 --- a/activerecord/lib/active_record/vendor/mysql.rb +++ b/activerecord/lib/active_record/vendor/mysql.rb @@ -1022,6 +1022,9 @@ class Mysql end @sock.sync = true buf.join + rescue + errno = Error::CR_SERVER_LOST + raise Error::new(errno, Error::err(errno)) end def write(data) @@ -1039,6 +1042,9 @@ class Mysql @pkt_nr = @pkt_nr + 1 & 0xff @sock.sync = true @sock.flush + rescue + errno = Error::CR_SERVER_LOST + raise Error::new(errno, Error::err(errno)) end def close() |