r9556: * sql/transactions.lisp: Apply return value patch from

        Edi Weitz for WITH-TRANSACTION

diff --git a/ChangeLog b/ChangeLog
index d3d497ec06163515371efa3ed435693a04e62b6f..1039bb25b1900349175666af721923cb128beff8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 04 Jun 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * tests/README: Fix filename [reported by Bill Clementson]
 04 Jun 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * tests/README: Fix filename [reported by Bill Clementson]

+       * sql/transactions.lisp: Apply return value patch from
+       Edi Weitz for WITH-TRANSACTION

        
 03 Jun 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 2.11.5 released
        
 03 Jun 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 2.11.5 released

diff --git a/sql/transaction.lisp b/sql/transaction.lisp
index 201d7c015b63b1b5663d5c92b955a84678c42c26..bf368c007d8b8aaee8fbfe6fe47645d6876274db 100644 (file)
--- a/sql/transaction.lisp
+++ b/sql/transaction.lisp
@@ -82,9 +82,10 @@ back and otherwise the transaction is committed."
   (let ((db (gensym "db-")))
     `(let ((,db ,database))
       (unwind-protect
   (let ((db (gensym "db-")))
     `(let ((,db ,database))
       (unwind-protect

-           (progn
+           (prog2

              (database-start-transaction ,db)
              (database-start-transaction ,db)

-             ,@body
+             (progn
+               ,@body)

              (mark-transaction-committed ,db))
         (if (eq (transaction-status (transaction ,db)) :committed)
             (database-commit-transaction ,db)
              (mark-transaction-committed ,db))
         (if (eq (transaction-status (transaction ,db)) :committed)
             (database-commit-transaction ,db)