database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-11 01:42:22 +03:00
Code Activity

Remove an unreachable branch from the VACUUM logic.

Browse Source 
FossilOrigin-Name: 65ace4b062d9454a296c5a1aa7ea7316b1507ad4
This commit is contained in:
drh
2015-04-13 14:03:54 +00:00
parent 4a614e9013
commit ab06b0e5be
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Remove\san\sunreachable\sbranch\sfrom\sthe\svdbeSorterCompareInt()\sroutine. C Remove\san\sunreachable\sbranch\sfrom\sthe\sVACUUM\slogic.
D 2015-04-13T12:45:58.929 D 2015-04-13T14:03:54.116
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
@@ -190,7 +190,7 @@ F src/global.c 4f77cadbc5427d00139ba43d0f3979804cbb700e
F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5 F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094 F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
F src/insert.c 1cc9dc4e939b5dd4a74ac4a3222b89e66b074210 F src/insert.c 305dd3f9539d0affa4bf1c14cc7dffb34867e040
F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
@@ -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 bd2cfa1d72368db91064bace298df3d77d9963e6 P f666ef06869f4fb655c43daacf5034c17575d951
R b8f08800d49097dd7ac4eb07d7ead02a R 13ae6f8a2a03926d32aaccc1e7fe4f0a
U drh U drh
Z b7397c89c618aad1f80f88c7af5c800c Z 18a3bd532998a4429c86c5536067680b

2
manifest.uuid
View File

@@ -1 +1 @@
f666ef06869f4fb655c43daacf5034c17575d951 65ace4b062d9454a296c5a1aa7ea7316b1507ad4

3
src/insert.c
View File

@@ -2024,7 +2024,8 @@ static int xferOptimization(
int i; int i;
for(i=0; i<pSrcIdx->nColumn; i++){ for(i=0; i<pSrcIdx->nColumn; i++){
char *zColl = pSrcIdx->azColl[i]; char *zColl = pSrcIdx->azColl[i];
if( zColl && sqlite3_stricmp("BINARY", zColl) ) break; assert( zColl!=0 );
if( sqlite3_stricmp("BINARY", zColl) ) break;
} }
if( i==pSrcIdx->nColumn ){ if( i==pSrcIdx->nColumn ){
useSeekResult = OPFLAG_USESEEKRESULT; useSeekResult = OPFLAG_USESEEKRESULT;