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

[<di...@us...>]

Revision: 60313
          http://sourceforge.net/p/firebird/code/60313
Author:   dimitr
Date:     2014-11-30 16:00:19 +0000 (Sun, 30 Nov 2014)
Log Message:
-----------
Simplest possible fix for CORE-4618: Rollback doesn`t undo changes when MERGE statement updates the same target rows multiple times and PLAN MERGE is used. An alternative solution is being considered.

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

Modified: firebird/trunk/src/jrd/vio.cpp
===================================================================
--- firebird/trunk/src/jrd/vio.cpp	2014-11-30 15:50:00 UTC (rev 60312)
+++ firebird/trunk/src/jrd/vio.cpp	2014-11-30 16:00:19 UTC (rev 60313)
@@ -2753,7 +2753,7 @@
 	// We're about to modify the record. Post a refetch request
 	// to all the active cursors positioned at this record.
 
-	invalidate_cursor_records(transaction, org_rpb);
+	invalidate_cursor_records(transaction, new_rpb);
 
 	// hvlad: prepare_update() take EX lock on data page. Subsequent call of
 	// IDX_modify_flag_uk_modified() will read database - if relation's partners

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