Fixed CORE-2038: New EXECUTE STATEMENT implementation asserts or thro…

…ws an error if used both before and after commin/rollback retaining.
FirebirdSQL · Aug 12, 2008 · 7c1fbc7 · 7c1fbc7
1 parent 3fd1d57
commit 7c1fbc7
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/jrd/extds/InternalDS.cpp b/src/jrd/extds/InternalDS.cpp
@@ -240,9 +240,11 @@ void InternalTransaction::doPrepare(ISC_STATUS* status, thread_db *tdbb,
 void InternalTransaction::doCommit(ISC_STATUS* status, thread_db *tdbb, bool retain)
 {
 	fb_assert(m_transaction);
-	
+
 	if (m_scope == traCommon && m_IntConnection.isCurrent()) {
-		m_transaction = 0;
+		if (!retain) {
+			m_transaction = 0;
+		}
 	}
 	else
 	{
@@ -259,7 +261,9 @@ void InternalTransaction::doRollback(ISC_STATUS* status, thread_db *tdbb, bool r
 	fb_assert(m_transaction);
 
 	if (m_scope == traCommon && m_IntConnection.isCurrent()) {
-		m_transaction = 0;
+		if (!retain) {
+			m_transaction = 0;
+		}
 	}
 	else
 	{