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

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

Revision: 58595
          http://sourceforge.net/p/firebird/code/58595
Author:   hvlad
Date:     2013-09-10 14:30:42 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Fixed bug CORE-4212 : Dropping FK on GTT crashes server

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

Modified: firebird/trunk/src/jrd/vio.cpp
===================================================================
--- firebird/trunk/src/jrd/vio.cpp	2013-09-10 11:39:54 UTC (rev 58594)
+++ firebird/trunk/src/jrd/vio.cpp	2013-09-10 14:30:42 UTC (rev 58595)
@@ -1439,7 +1439,7 @@
 					jrd_rel *partner;
 					index_desc idx;
 
-					if ((BTR_lookup(tdbb, r2, id - 1, &idx, r2->getPages(tdbb)) == FB_SUCCESS) &&
+					if ((BTR_lookup(tdbb, r2, id - 1, &idx, r2->getBasePages()) == FB_SUCCESS) &&
 						MET_lookup_partner(tdbb, r2, &idx, index_name.nullStr()) &&
 						(partner = MET_lookup_relation_id(tdbb, idx.idx_primary_relation, false)) )
 					{

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



From hv...@us... Tue Sep 10 14:35:53 2013
Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191]
	helo=mx.sourceforge.net)
	by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76)
	(envelope-from <hv...@us...>) id 1VJP2n-0006v8-9v
	for fir...@li...;
	Tue, 10 Sep 2013 14:35:53 +0000
X-ACL-Warn: 
Received: from sfp-scm-3.v30.ch3.sourceforge.com ([172.29.30.33])
	by sog-mx-1.v43.ch3.sourceforge.com with smtp (Exim 4.76)
	id 1VJP2l-0005Aw-8Q for fir...@li...;
	Tue, 10 Sep 2013 14:35:53 +0000
Received: by sfp-scm-3.v30.ch3.sourceforge.com (sSMTP sendmail emulation);
	Tue, 10 Sep 2013 14:35:51 +0000
Date: Tue, 10 Sep 2013 14:35:51 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.80: http://search.cpan.org/dist/SVN-Notify/
From: hv...@us...
Errors-To: hv...@us...
To: fir...@li...
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Firebird-checkins] SF.net SVN: firebird:[58596]
 firebird/branches/B2_5_Release/src/jrd/dyn_def .epp
X-BeenThere: fir...@li...
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: <firebird-checkins.lists.sourceforge.net>
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/firebird-checkins>,
	<mailto:fir...@li...?subject=unsubscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=firebird-checkins>
List-Post: <mailto:fir...@li...>
List-Help: <mailto:fir...@li...?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/firebird-checkins>,
	<mailto:fir...@li...?subject=subscribe>
X-List-Received-Date: Tue, 10 Sep 2013 14:35:53 -0000

Revision: 58596
          http://sourceforge.net/p/firebird/code/58596
Author:   hvlad
Date:     2013-09-10 14:35:50 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Fixed bug CORE-4214 : GTT should not reference permanent relation

Modified Paths:
--------------
    firebird/branches/B2_5_Release/src/jrd/dyn_def.epp

Modified: firebird/branches/B2_5_Release/src/jrd/dyn_def.epp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/dyn_def.epp	2013-09-10 14:30:42 UTC (rev 58595)
+++ firebird/branches/B2_5_Release/src/jrd/dyn_def.epp	2013-09-10 14:35:50 UTC (rev 58596)
@@ -5052,6 +5052,9 @@
 
 			make_relation_scope_name(REL_M.RDB$RELATION_NAME, master_type, sMaster);
 			make_relation_scope_name(REL_C.RDB$RELATION_NAME, child_type, sChild);
+			
+			EXE_unwind(tdbb, request);
+			break;
 		}
 	END_FOR;
 
@@ -5121,6 +5124,9 @@
 
 			make_relation_scope_name(REL_M.RDB$RELATION_NAME, master_type, sMaster);
 			make_relation_scope_name(child_rel_name, child_type, sChild);
+
+			EXE_unwind(tdbb, request);
+			break;
 		}
 	END_FOR;
 

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