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

Remove a faulty assert() from the btree balancing logic.

Browse Source 
FossilOrigin-Name: d06669d968c8f6af8799fbfeabadaab68b9b8db8
This commit is contained in:
drh
2015-04-13 14:44:01 +00:00
parent 481ecd95d0
commit c01501a386
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Test\sthat\sif\sthe\sdefinition\sof\sa\scollation\ssequence\sis\schanged\sand\sVACUUM\srun,\sthe\snew\sdatabase\scontains\srecords\ssorted\sin\sthe\s(new)\scorrect\sorder. C Remove\sa\sfaulty\sassert()\sfrom\sthe\sbtree\sbalancing\slogic.
D 2015-04-13T14:08:27.490 D 2015-04-13T14:44:01.870
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -173,7 +173,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3 F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
F src/btree.c 2caf598165f3608fde8abac2b243826616ce54b7 F src/btree.c 67648f6532c2da79d3b3fb6853aa1a0c3ba0e1ad
F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4 F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
F src/build.c fa4795bc795077388aa4e746e1b25ef97bc10489 F src/build.c fa4795bc795077388aa4e746e1b25ef97bc10489
@@ -1250,7 +1250,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 65ace4b062d9454a296c5a1aa7ea7316b1507ad4 P ce6eaac10a190b26b87bfe75918e2ef58fd7a3f9
R 10297fb20a52d4dc7c571adcebaddc36 R bac46adba95b910001781f1715fe4531
U dan U drh
Z 0a6c3062817beaba9c93ab9bd5dcc5e3 Z 344080508147bb8eb54111c6b1e074c7

2
manifest.uuid
View File

@@ -1 +1 @@
ce6eaac10a190b26b87bfe75918e2ef58fd7a3f9 d06669d968c8f6af8799fbfeabadaab68b9b8db8

1
src/btree.c
View File

@@ -6735,7 +6735,6 @@ static int balance_nonroot(
}else if( iParentIdx==i ){ }else if( iParentIdx==i ){
nxDiv = i-2+bBulk; nxDiv = i-2+bBulk;
}else{ }else{
assert( bBulk==0 );
nxDiv = iParentIdx-1; nxDiv = iParentIdx-1;
} }
i = 2-bBulk; i = 2-bBulk;