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

1 files changed, 6 insertions, 0 deletions

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()