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 14:13:29 -0300 |
| commit | c90f3de6d3f0e1d12ad1884d89958cd12fb26f79 (patch) | |
| tree | 6252e45d24c707c9ca9d8dc8a717d7ab31752d7a /activerecord | |
| parent | a9af9f10cb841ed1c2f51c7990cef76297b15e39 (diff) | |
| download | rails-c90f3de6d3f0e1d12ad1884d89958cd12fb26f79.tar.gz rails-c90f3de6d3f0e1d12ad1884d89958cd12fb26f79.tar.bz2 rails-c90f3de6d3f0e1d12ad1884d89958cd12fb26f79.zip | |
Merge pull request #5244 from fotos/myqsl2_wait_timeout
Maximum wait_timeout on Windows is 2147483
Diffstat (limited to 'activerecord')
| -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 d95f3fbc1f..524a7d30fc 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -264,7 +264,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) |