3 files changed, 10 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index eb4b48bc37..6fed3e5c19 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -466,6 +466,7 @@ module ActiveRecord
 
     # Returns +true+ if the attributes hash has been frozen.
     def frozen?
+      sync_with_transaction_state
       @attributes.frozen?
     end
 
@@ -583,7 +584,7 @@ module ActiveRecord
       end
 
       def thaw
-        if frozen?
+        if @attributes.frozen?
           @attributes = @attributes.dup
         end
       end
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index e05490753f..bc6d04b7bb 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -530,7 +530,6 @@ module ActiveRecord
     def destroy
       _raise_readonly_record_error if readonly?
       destroy_associations
-      self.class.connection.add_transaction_record(self)
       @_trigger_destroy_callback = if persisted?
         destroy_row > 0
       else
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index 410f07d3ab..d5a4f12376 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -26,13 +26,15 @@ class TransactionTest < ActiveRecord::TestCase
   def test_raise_after_destroy
     assert_not_predicate @first, :frozen?
 
-    assert_raises(RuntimeError) {
-      Topic.transaction do
-        @first.destroy
-        assert_predicate @first, :frozen?
-        raise
+    assert_not_called(@first, :rolledback!) do
+      assert_raises(RuntimeError) do
+        Topic.transaction do
+          @first.destroy
+          assert_predicate @first, :frozen?
+          raise
+        end
       end
-    }
+    end
 
     assert_not_predicate @first, :frozen?
   end