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

Temporary disable suggested by me solution for request format check - needs better checks, as is breaks CREATE DATABASE

Browse Source
This commit is contained in:
alexpeshkoff 2010-10-13 13:35:40 +00:00
parent e05c1a825f
commit 250a808107
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/jrd/evl.cpp
View File

@ -410,14 +410,10 @@ dsc* EVL_expr(thread_db* tdbb, const jrd_nod* node)
// ASF: CORE-1432 - If the the record is not on the latest format, upgrade it.
// AP: for fields that are missing in original format use record's one.
if (compileFormat && record->rec_format->fmt_version != compileFormat->fmt_version)
{
if (record->rec_format->fmt_version > compileFormat->fmt_version)
{
ERR_post(Arg::Gds(isc_request_outdated) << rpb.rpb_relation->rel_name);
}
if (!DSC_EQUIV(&impure->vlu_desc, &compileFormat->fmt_desc[id], true))
if (compileFormat &&
record->rec_format->fmt_version != compileFormat->fmt_version &&
id < compileFormat->fmt_desc.getCount() &&
!DSC_EQUIV(&impure->vlu_desc, &compileFormat->fmt_desc[id], true))
{
dsc desc = impure->vlu_desc;
impure->vlu_desc = compileFormat->fmt_desc[id];
@ -447,7 +443,6 @@ dsc* EVL_expr(thread_db* tdbb, const jrd_nod* node)
MOV_move(tdbb, &desc, &impure->vlu_desc);
}
}
}
if (!relation || !(relation->rel_flags & REL_system))
{