Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #5244 from fotos/myqsl2_wait_timeout

Maximum wait_timeout on Windows is 2147483
  • Loading branch information...
commit 1c3469b828d26e83c55e8ab84be53938063cd59b 2 parents 8e1d46c + a2bf014
@rafaelfranca rafaelfranca authored
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)
Please sign in to comment.
Something went wrong with that request. Please try again.