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

Misc

Browse Source
This commit is contained in:
asfernandes 2007-08-05 19:56:27 +00:00
parent 4859f87579
commit 4cc5949028
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jrd/Relation.cpp
View File

@ -190,7 +190,7 @@ RelationPages* jrd_rel::getPagesInternal(thread_db* tdbb, SLONG tran, bool alloc
pool = JrdMemoryPool::createPool();
Jrd::ContextPoolHolder context(tdbb, pool);
IndexDescAlloc *indices = NULL;
IndexDescAlloc* indices = NULL;
// read indices from "base" index root page
tdbb->tdbb_flags |= TDBB_deferred;
USHORT idx_count = 0;
@ -203,7 +203,7 @@ RelationPages* jrd_rel::getPagesInternal(thread_db* tdbb, SLONG tran, bool alloc
}
tdbb->tdbb_flags &= ~TDBB_deferred;
index_desc *idx = indices->items, *const end = indices->items + idx_count;
index_desc* idx = indices->items, *const end = indices->items + idx_count;
for (; idx < end; idx++)
{
Firebird::MetaName idx_name;

4
src/jrd/btr.cpp
View File

@ -1880,7 +1880,7 @@ retry:
&& !(root_idx->irt_flags & irt_in_progress))
{
if (!use_idx_id ||
use_idx_id && ((root_idx - root->irt_rpt) == idx->idx_id))
(use_idx_id && ((root_idx - root->irt_rpt) == idx->idx_id)))
{
slot = root_idx;
}
@ -1905,7 +1905,7 @@ retry:
}
// If we didn't pick up an empty slot, allocate a new one
fb_assert(!use_idx_id || use_idx_id && slot);
fb_assert(!use_idx_id || (use_idx_id && slot));
if (!slot) {
slot = end;
root->irt_count++;