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

Misc

Browse Source
This commit is contained in:
asfernandes 2009-10-21 01:01:04 +00:00
parent 98539155cd
commit 19fac12314
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/posix/prefix.darwin_i386
View File

@ -20,7 +20,7 @@
# Instructions if running MacOSX 10.6
# 1. edit configure.in so that MAKEFILE_PREFIX=darwin_i386
# 2. dnl the CPU_TYPE
# 3. exit extern/icu/source/config and set the right 32bit flags (-arch i386)
# 3. edit extern/icu/source/config and set the right 32bit flags (-arch i386)
# 4. for CFLAGS, CXXFLAGS. LDFLAGS export '-m32 -arch i386'
# 5. export MACOSX_DEPLOYMENT_TARGET=10.4

9
src/jrd/btr.cpp
View File

@ -5055,17 +5055,16 @@ static contents garbage_collect(thread_db* tdbb, WIN* window, SLONG parent_numbe
// left sibling
WIN left_window(pageSpaceID, left_number);
btree_page* left_page = (btree_page*) CCH_FETCH(tdbb, &left_window, LCK_write, pag_undefined);
if ((left_page->btr_header.pag_type != pag_index) ||
(left_page->btr_relation != relation_number) ||
(left_page->btr_id != (UCHAR)(index_id % 256)) ||
(left_page->btr_level != index_level))
if (left_page->btr_header.pag_type != pag_index ||
left_page->btr_relation != relation_number ||
left_page->btr_id != UCHAR(index_id % 256) ||
left_page->btr_level != index_level)
{
CCH_RELEASE(tdbb, &parent_window);
CCH_RELEASE(tdbb, &left_window);
return contents_above_threshold;
}
while (left_page->btr_sibling != window->win_page.getPageNum())
{
#ifdef DEBUG_BTR