[Firebird-checkins] SF.net SVN: firebird:[52551] firebird/branches/B2_5_Release/src/jrd/idx.cpp

[<hv...@us...>]

Revision: 52551
          http://firebird.svn.sourceforge.net/firebird/?rev=52551&view=rev
Author:   hvlad
Date:     2011-03-17 11:17:12 +0000 (Thu, 17 Mar 2011)

Log Message:
-----------
Fixed bug CORE-3394 : Failed attempt to violate unique constraint could leave unneeded "lock conflict" error in status-vector.
Backported more conservative version of patch

Modified Paths:
--------------
    firebird/branches/B2_5_Release/src/jrd/idx.cpp

Modified: firebird/branches/B2_5_Release/src/jrd/idx.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/idx.cpp	2011-03-17 11:13:30 UTC (rev 52550)
+++ firebird/branches/B2_5_Release/src/jrd/idx.cpp	2011-03-17 11:17:12 UTC (rev 52551)
@@ -1067,6 +1067,11 @@
 				tdbb->tdbb_status_vector[1] == isc_lock_timeout);
 			// the above errors are not thrown but returned silently
 
+			if (lock_error)
+			{
+				fb_utils::init_status(tdbb->tdbb_status_vector);
+			}
+
 			if (rpb.rpb_flags & rpb_deleted || lock_error)
 			{
 				result = idx_e_duplicate;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.