This should fix bug #9081 : Error creating unique expression index

Author: hvlad

src/jrd/idx.cpp

@@ -314,11 +314,26 @@ class IndexCreateTask : public Task
 			}
 
 			FbLocalStatus status;
-			if (m_tra)
+			if (m_tra || m_idx.idx_expression_statement || m_idx.idx_condition_statement)
 			{
 				BackgroundContextHolder tdbb(att->att_database, att, &status, FB_FUNCTION);
-				TRA_commit(tdbb, m_tra, false);
+
+				if (m_tra)
+					TRA_commit(tdbb, m_tra, false);
+
+				if (m_idx.idx_expression_statement)
+				{
+					m_idx.idx_expression_statement->release(tdbb);
+					m_idx.idx_expression_statement = NULL;
+				}
+
+				if (m_idx.idx_condition_statement)
+				{
+					m_idx.idx_condition_statement->release(tdbb);
+					m_idx.idx_condition_statement = NULL;
+				}
 			}
+
 			WorkerAttachment::releaseAttachment(&status, m_attStable);
 		}
 
@@ -483,18 +498,6 @@ bool IndexCreateTask::handler(WorkItem& _item)
 	{
 		//fb_assert((scb->scb_flags & scb_sorted) == 0);
 
-		if (item->m_ownAttach && idx->idx_expression_statement)
-		{
-			idx->idx_expression_statement->release(tdbb);
-			idx->idx_expression_statement = NULL;
-		}
-
-		if (item->m_ownAttach && idx->idx_condition_statement)
-		{
-			idx->idx_condition_statement->release(tdbb);
-			idx->idx_condition_statement = NULL;
-		}
-
 		if (!m_stop && m_creation->duplicates.value() == 0)
 			scb->sort(tdbb);