Skip to content
Browse files

Merge pull request #5244 from fotos/myqsl2_wait_timeout

Maximum wait_timeout on Windows is 2147483
  • Loading branch information...
2 parents 8e1d46c + a2bf014 commit 1c3469b828d26e83c55e8ab84be53938063cd59b @rafaelfranca rafaelfranca committed May 25, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
View
2 activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -268,7 +268,7 @@ def configure_connection
# 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)

0 comments on commit 1c3469b

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