firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 02:03:04 +01:00
Code Issues

Correction for recent patch for CORE-5422.

Browse Source 
I was a bit wrong - DPM_fetch should not change rpb_prior
This commit is contained in:
hvlad 2017-01-06 16:21:13 +02:00
parent 10c6a14a04
commit 835c78cb35
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jrd/dpm.epp
View File

@ -1103,8 +1103,6 @@ bool DPM_fetch(thread_db* tdbb, record_param* rpb, USHORT lock)
rpb->rpb_f_line, rpb->rpb_flags);
#endif
rpb->rpb_number = number;
if (!(rpb->rpb_flags & rpb_chained))
rpb->rpb_prior = NULL;
return true;
}

5
src/jrd/vio.cpp
View File

@ -1303,10 +1303,7 @@ void VIO_data(thread_db* tdbb, record_param* rpb, MemoryPool* pool)
const UCHAR* tail_end;
UCHAR differences[MAX_DIFFERENCES];
// If the record is a primary version, prior should be NULL.
if (!(rpb->rpb_flags & rpb_chained))
fb_assert(rpb->rpb_prior == NULL);
// Primary record version not uses prior version
Record* prior = (rpb->rpb_flags & rpb_chained) ? rpb->rpb_prior : NULL;
if (prior)