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

Fixed bug in the ODS architecture checking logic.

Browse Source
This commit is contained in:
dimitr 2006-06-01 09:09:15 +00:00
parent 4c29d9df81
commit 09b0823d0f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/pag.cpp
View File

@ -1130,12 +1130,14 @@ void PAG_header(const TEXT* file_name, USHORT file_length, bool info)
file_length), 0);
}
const USHORT ods_version = header->hdr_ods_version & ~ODS_FIREBIRD_FLAG;
if (!Ods::isSupported(header->hdr_ods_version, header->hdr_ods_minor))
{
ERR_post(isc_wrong_ods,
isc_arg_cstring, file_length, ERR_string(file_name,
file_length),
isc_arg_number, (SLONG) (header->hdr_ods_version & ~ODS_FIREBIRD_FLAG),
isc_arg_number, (SLONG) ods_version,
isc_arg_number, (SLONG) header->hdr_ods_minor,
isc_arg_number, (SLONG) ODS_VERSION,
isc_arg_number, (SLONG) ODS_CURRENT,
@ -1159,7 +1161,7 @@ is accessed with engine built for another architecture. - Nickolay 9-Feb-2005
****/
if (header->hdr_implementation != CLASS &&
DECODE_ODS_MAJOR(header->hdr_ods_version) < ODS_VERSION11 ?
ods_version < ODS_VERSION11 ?
(header->hdr_implementation < 0 || header->hdr_implementation > CLASS_MAX10 ||
archMatrix10[header->hdr_implementation] == archUnknown ||
archMatrix10[header->hdr_implementation] != archMatrix10[CLASS])
@ -1190,7 +1192,7 @@ is accessed with engine built for another architecture. - Nickolay 9-Feb-2005
BUGCHECK(267); /* next transaction older than oldest transaction */
}
dbb->dbb_ods_version = header->hdr_ods_version & ~ODS_FIREBIRD_FLAG;
dbb->dbb_ods_version = ods_version;
dbb->dbb_minor_version = header->hdr_ods_minor;
dbb->dbb_minor_original = header->hdr_ods_minor_original;