aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFotos Georgiadis <gfotos@gmail.com>2012-03-02 19:12:11 +0200
committerFotos Georgiadis <gfotos@gmail.com>2012-03-02 19:19:34 +0200
commita2bf014330310da718dd92ffdfd0435463ed3a4f (patch)
tree87a869666573977f3a08eb4f3e345669410b1767
parentfcef72890b7f8b974ee490268a48e147bd621253 (diff)
downloadrails-a2bf014330310da718dd92ffdfd0435463ed3a4f.tar.gz
rails-a2bf014330310da718dd92ffdfd0435463ed3a4f.tar.bz2
rails-a2bf014330310da718dd92ffdfd0435463ed3a4f.zip
Maximum wait_timeout on Windows is 2147483
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index 3f45f23de8..b343898854 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -260,7 +260,7 @@ module ActiveRecord
# increase timeout so mysql server doesn't disconnect us
wait_timeout = @config[:wait_timeout]
- wait_timeout = 2592000 unless wait_timeout.is_a?(Fixnum)
+ wait_timeout = 2147483 unless wait_timeout.is_a?(Fixnum)
variable_assignments << "@@wait_timeout = #{wait_timeout}"
execute("SET #{variable_assignments.join(', ')}", :skip_logging)