[Firebird-checkins] SF.net SVN: firebird:[53490] firebird/trunk/src/jrd/vio.cpp

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

Revision: 53490
          http://firebird.svn.sourceforge.net/firebird/?rev=53490&view=rev
Author:   hvlad
Date:     2011-09-29 12:34:07 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
Port forward fix for bug CORE-3610 : Can insert DUPLICATE keys in UNIQUE index

Modified Paths:
--------------
    firebird/trunk/src/jrd/vio.cpp

Modified: firebird/trunk/src/jrd/vio.cpp
===================================================================
--- firebird/trunk/src/jrd/vio.cpp	2011-09-29 08:01:32 UTC (rev 53489)
+++ firebird/trunk/src/jrd/vio.cpp	2011-09-29 12:34:07 UTC (rev 53490)
@@ -2162,11 +2162,13 @@
 			if (rpb->rpb_flags & rpb_deleted)
 				return !foreign_key;
 
-			if (rpb->rpb_flags & rpb_uk_modified)
-					return !foreign_key;
+			if (foreign_key)
+			{
+				// clear lock error from status vector
+				fb_utils::init_status(tdbb->tdbb_status_vector);
+				return !(rpb->rpb_flags & rpb_uk_modified);
+			}
 
-			// clear lock error from status vector
-			fb_utils::init_status(tdbb->tdbb_status_vector);
 			return true;
 
 		case tra_dead:

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