fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2002-04-29 13:40 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>

Browse Source
This commit is contained in:
Alexander S.Kresin
2002-04-29 09:36:08 +00:00
parent 0cefd70e00
commit 1eb4ed2559
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -7,6 +7,11 @@
For example:
2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
* source/rdd/dbcmd.c
* Bug fixed, which caused GPF's while opening of additive index
2002-04-30 12:46 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
* include/hbrddntx.h
* source/rdd/dbfntx/dbfntx1.c
* Some changes, needed for custom indexes support

17
harbour/source/rdd/dbfntx/dbfntx1.c
View File

@@ -1512,7 +1512,7 @@ static void hb_ntxTagBalance( LPTAGINFO pTag, int level )
LPPAGEINFO pPage = hb_ntxPageLoad( pTag->Owner, pTag->stack[level].page );
LPPAGEINFO pPageParent = hb_ntxPageLoad( pTag->Owner, pTag->stack[level+1].page );
/* printf( "\nntxTagBalance - 0, %d %d %x %x",pTag->stackLevel,level,pPageParent->Page,pPage->Page ); */
/* printf( "\nntxTagBalance-1, %d %d %x %x",pTag->stackLevel,level,pPageParent->Page,pPage->Page ); */
thiskey = pairkey = pTag->stack[level+1].ikey;
do
pairkey ++;
@@ -1535,6 +1535,14 @@ static void hb_ntxTagBalance( LPTAGINFO pTag, int level )
else
{
pPagePair = hb_ntxPageLoad( pTag->Owner, KEYITEM( pPageParent, pairkey )->page );
if( pPageParent->uiKeys == 1 &&
( pPage->uiKeys + pPagePair->uiKeys ) > pTag->MaxKeys - 2 )
{
hb_ntxPageRelease( pPageParent );
hb_ntxPageRelease( pPagePair );
return;
}
if( pPagePair->uiKeys <= pTag->MaxKeys/2 )
{
/* printf( "\nntxTagBalance - 10, %d %d",thiskey,pairkey ); */
@@ -1558,6 +1566,13 @@ static void hb_ntxTagBalance( LPTAGINFO pTag, int level )
else
{
pPagePair = hb_ntxPageLoad( pTag->Owner, KEYITEM( pPageParent, pairkey )->page );
if( pPageParent->uiKeys == 1 &&
( pPage->uiKeys + pPagePair->uiKeys ) > pTag->MaxKeys - 2 )
{
hb_ntxPageRelease( pPageParent );
hb_ntxPageRelease( pPagePair );
return;
}
/* printf( "\nntxTagBalance - 3A %x %x %x %d",pPageParent->Page,pPage->Page,pPagePair->Page,pPagePair->uiKeys ); */
if( pPagePair->uiKeys <= pTag->MaxKeys/2 )
{