aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorJeff Lawson <jdl@cogentlogic.com>2010-08-01 11:41:03 +0100
committerAaron Patterson <aaron.patterson@gmail.com>2010-08-17 13:15:58 -0700
commit7ce1539934b67e536446f7323c7848fdd6ba68e3 (patch)
treee751d515187b1bd78ecfa1b77ba95c6f81f11017 /activerecord/lib/active_record/connection_adapters
parent137e4e759a7360f6277ec469d165894bf96dbabf (diff)
downloadrails-7ce1539934b67e536446f7323c7848fdd6ba68e3.tar.gz
rails-7ce1539934b67e536446f7323c7848fdd6ba68e3.tar.bz2
rails-7ce1539934b67e536446f7323c7848fdd6ba68e3.zip
Bug Fix -- clean up connection after stored procedure [#3151 state:resolved]
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql_adapter.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 802921e181..dca0ea67e6 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -275,6 +275,7 @@ module ActiveRecord
rows = []
result.each { |row| rows << row }
result.free
+ @connection.more_results && @connection.next_result # invoking stored procedures with CLIENT_MULTI_RESULTS requires this to tidy up else connection will be dropped
rows
end
@@ -617,6 +618,7 @@ module ActiveRecord
result = execute(sql, name)
rows = []
result.each_hash { |row| rows << row }
+ @connection.more_results && @connection.next_result # invoking stored procedures with CLIENT_MULTI_RESULTS requires this to tidy up else connection will be dropped
result.free
rows
end