diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-25 12:00:00 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-25 12:00:00 -0300 |
| commit | 1c3469b828d26e83c55e8ab84be53938063cd59b (patch) | |
| tree | 3ae055c749eec075b35d1d6dbc003b2dc3bea7a7 | |
| parent | 8e1d46c7e197bb904b07b7f677ab4593030d57d2 (diff) | |
| parent | a2bf014330310da718dd92ffdfd0435463ed3a4f (diff) | |
| download | rails-1c3469b828d26e83c55e8ab84be53938063cd59b.tar.gz rails-1c3469b828d26e83c55e8ab84be53938063cd59b.tar.bz2 rails-1c3469b828d26e83c55e8ab84be53938063cd59b.zip | |
Merge pull request #5244 from fotos/myqsl2_wait_timeout
Maximum wait_timeout on Windows is 2147483
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 2 |
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 350ccce03d..8fc172f6e8 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -268,7 +268,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) |