diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-09-14 23:59:35 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-09-15 00:03:04 +0100 |
| commit | 02f56554d68cddae02ccc4a8511cc5c64210d258 (patch) | |
| tree | 4b091ddba84e3948128e9071ba3f4044eb79cdea /activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | |
| parent | 61951427903dbc0d92f6106ec5874025e2185056 (diff) | |
| download | rails-02f56554d68cddae02ccc4a8511cc5c64210d258.tar.gz rails-02f56554d68cddae02ccc4a8511cc5c64210d258.tar.bz2 rails-02f56554d68cddae02ccc4a8511cc5c64210d258.zip | |
Ensure disconnecting or reconnecting resets the transaction state
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index 8fc172f6e8..328d080687 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -74,6 +74,7 @@ module ActiveRecord end def reconnect! + super disconnect! connect end @@ -82,6 +83,7 @@ module ActiveRecord # Disconnects from the database if already connected. # Otherwise, this method does nothing. def disconnect! + super unless @connection.nil? @connection.close @connection = nil |