database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Fix a problem with the previous commit.

Browse Source 
FossilOrigin-Name: 720a3ceafc35b81936ed2eb1f07a7187d104f0a0
This commit is contained in:
dan
2013-02-22 20:57:47 +00:00
parent 51f0b6d568
commit f38b65a85d
3 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
manifest
View File

@@ -1,5 +1,5 @@
C Avoid\smoving\spages\smore\sthan\sonce\sin\san\sincremental\svacuum\soperation. C Fix\sa\sproblem\swith\sthe\sprevious\scommit.
D 2013-02-22T20:16:34.273 D 2013-02-22T20:57:47.269
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282 F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -121,7 +121,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
F src/backup.c 32e35a3a4ea55b45c0e5f74eeb793aec71491517 F src/backup.c 32e35a3a4ea55b45c0e5f74eeb793aec71491517
F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
F src/btree.c 960274cb93c1d85e82bd106094e0890d89434ab8 F src/btree.c 76f063ffd70aba11b3f4701d216c157e1a81b51d
F src/btree.h 3ad7964d6c5b1c7bff569aab6adfa075f8bf06cd F src/btree.h 3ad7964d6c5b1c7bff569aab6adfa075f8bf06cd
F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
F src/build.c 73ca65f32938e4e0d94e831b61b5749b211b79be F src/build.c 73ca65f32938e4e0d94e831b61b5749b211b79be
@@ -1034,10 +1034,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
P 9bd9bd9cab8c804c1a51d472199459176044a633 P c3939d249119b47bd57baa11a5ed7cc6014fc795
R d336ad839cab7fc86035cb53790f3fce R f58494bafc2bb0d7737cf9b62d925506
T *branch * incr-vacuum-opt
T *sym-incr-vacuum-opt *
T -sym-trunk *
U dan U dan
Z cd58f1fbd68ec5de5d0f48d285a49284 Z 7eeaf98ba8f2d987bdc515914ba34037

2
manifest.uuid
View File

@@ -1 +1 @@
c3939d249119b47bd57baa11a5ed7cc6014fc795 720a3ceafc35b81936ed2eb1f07a7187d104f0a0

24
src/btree.c
View File

@@ -5061,14 +5061,24 @@ static int allocateBtreePage(
unsigned char *aData = pTrunk->aData; unsigned char *aData = pTrunk->aData;
if( nearby>0 ){ if( nearby>0 ){
u32 i; u32 i;
int dist;
closest = 0; closest = 0;
dist = sqlite3AbsInt32(get4byte(&aData[8]) - nearby); if( eMode==BTALLOC_LE ){
for(i=1; i<k; i++){ for(i=0; i<k; i++){
int d2 = sqlite3AbsInt32(get4byte(&aData[8+i*4]) - nearby); iPage = get4byte(&aData[8+i*4]);
if( d2<dist ){ if( iPage<nearby ){
closest = i; closest = i;
dist = d2; break;
}
}
}else{
int dist;
dist = sqlite3AbsInt32(get4byte(&aData[8]) - nearby);
for(i=1; i<k; i++){
int d2 = sqlite3AbsInt32(get4byte(&aData[8+i*4]) - nearby);
if( d2<dist ){
closest = i;
dist = d2;
}
} }
} }
}else{ }else{