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

Fix code coverage problems in where.c.

Browse Source 
FossilOrigin-Name: b04a52824971e8880e4bf0d9862db4eef8b607ab
This commit is contained in:
drh
2010-04-08 17:28:00 +00:00
parent c71b5f34c9
commit f12cde5637
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifest
View File

@@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE----- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1 Hash: SHA1
C Additional\sautomatic\sindex\stests. C Fix\scode\scoverage\sproblems\sin\swhere.c.
D 2010-04-08T16:30:39 D 2010-04-08T17:28:01
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -225,7 +225,7 @@ F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
F src/where.c 93621d17d920f88eddd1128c9d24a580d3d3186e F src/where.c 9472b11332699aff0f8926dbe6175f3fb0bb08a3
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45 F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@ -799,14 +799,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P e1aa48ace7e43c3805278120b8228ee597e2cee7 P 99d8e325e9eb8905631b06676206e6412f386d08
R 1ddd64c6b085dbc423616dd819df6a05 R f1d7ee9ef8e37ad34b630dd845eea9df
U drh U drh
Z f3ae6e61cec8452c9ef4d9b54b9c5c99 Z 45c9e44926fed27e2a7ea2a40b32f16e
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux) Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFLvgSyoxKgR168RlERAh81AJ9w9/1rTkO8H54lQWnY5JK4Kl9IAgCdFYMu iD8DBQFLvhIkoxKgR168RlERAsxoAJ9fzwA602W4t6jRdDC4i68NXXu6hwCcDnCg
h187VpM+yHCLSuWlqbUeVgs= erQMzyDr+InT0wqLY6GL/Sc=
=mli0 =LKdl
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
99d8e325e9eb8905631b06676206e6412f386d08 b04a52824971e8880e4bf0d9862db4eef8b607ab

8
src/where.c
View File

@@ -4350,7 +4350,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
if( !pWInfo->okOnePass && (ws & WHERE_IDX_ONLY)==0 ){ if( !pWInfo->okOnePass && (ws & WHERE_IDX_ONLY)==0 ){
sqlite3VdbeAddOp1(v, OP_Close, pTabItem->iCursor); sqlite3VdbeAddOp1(v, OP_Close, pTabItem->iCursor);
} }
if( (ws & (WHERE_INDEXED|WHERE_TEMP_INDEX)) == WHERE_INDEXED ){ if( (ws & WHERE_INDEXED)!=0 && (ws & WHERE_TEMP_INDEX)==0 ){
sqlite3VdbeAddOp1(v, OP_Close, pLevel->iIdxCur); sqlite3VdbeAddOp1(v, OP_Close, pLevel->iIdxCur);
} }
} }
@@ -4398,9 +4398,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
/* Final cleanup /* Final cleanup
*/ */
if( pWInfo ){ pParse->nQueryLoop = pWInfo->savedNQueryLoop;
pParse->nQueryLoop = pWInfo->savedNQueryLoop; whereInfoFree(db, pWInfo);
whereInfoFree(db, pWInfo);
}
return; return;
} }