1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
index 4a7f2aaca8..8f06cf3a1f 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -111,6 +111,8 @@ module ActiveRecord
       def commit
         super
         connection.release_savepoint(savepoint_name)
+        parent = connection.transaction_manager.current_transaction
+        records.each { |r| parent.add_record(r) }
       end
 
       def full_rollback?; false; end
@@ -169,16 +171,14 @@ module ActiveRecord
         transaction = begin_transaction options
         yield
       rescue Exception => error
-        transaction.rollback if transaction
+        rollback_transaction if transaction
         raise
       ensure
         begin
-          transaction.commit unless error
+          commit_transaction unless error
         rescue Exception
           transaction.rollback
           raise
-        ensure
-          @stack.pop if transaction
         end
       end