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

These checks are for ODS >= 11.1 (Thanks Dmitry for confirmation.)

Browse Source
This commit is contained in:
robocop 2009-11-20 10:19:45 +00:00
parent b48b2045e4
commit 82c89c7ce6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jrd/pag.cpp
View File

@ -552,7 +552,8 @@ PAG PAG_allocate(thread_db* tdbb, WIN* window)
// Starting from ODS 11.1 we store in pip_header.reserved number of pages // Starting from ODS 11.1 we store in pip_header.reserved number of pages
// allocated from this pointer page. There is intention to create dedicated // allocated from this pointer page. There is intention to create dedicated
// field at page_inv_page for this purpose in ODS 12. // field at page_inv_page for this purpose in ODS 12.
const bool isODS11_x = (dbb->dbb_ods_version == ODS_VERSION11 && dbb->dbb_minor_version >= 1); const bool isODS11_x = (dbb->dbb_ods_version == ODS_VERSION11 && dbb->dbb_minor_version >= 1) ||
dbb->dbb_ods_version > ODS_VERSION11;
// Find an allocation page with something on it // Find an allocation page with something on it
@ -2270,9 +2271,9 @@ ULONG PAG_page_count(Database* database, PageCountCallback* cb)
* *
*********************************************/ *********************************************/
fb_assert(cb); fb_assert(cb);
const bool isODS11_x = const bool isODS11_x =
(database->dbb_ods_version == ODS_VERSION11 && database->dbb_minor_version >= 1); (database->dbb_ods_version == ODS_VERSION11 && database->dbb_minor_version >= 1) ||
database->dbb_ods_version > ODS_VERSION11;
if (!isODS11_x) { if (!isODS11_x) {
return 0; return 0;
} }