1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-19 21:43:15 +03:00

More intuitive labels on ".wheretrace" output.

FossilOrigin-Name: adcb3fed489b580221c7bf2692a60e24248b23a0
This commit is contained in:
drh
2014-10-08 00:08:08 +00:00
parent 722246e801
commit 9a7b41d74a
3 changed files with 11 additions and 11 deletions

View File

@@ -1,5 +1,5 @@
C Make\ssure\sthe\ssqlite3VdbeMemClearAndResize()\sroutine\sis\snever\scalled\swith\sa\nzero\ssize\sparameter,\ssince\sa\ssize\sof\szero\scould\slead\sto\seither\sa\smemory\sleak\nor\san\sassertion\sfault. C More\sintuitive\slabels\son\s".wheretrace"\soutput.
D 2014-10-07T23:02:24.724 D 2014-10-08T00:08:08.905
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -302,7 +302,7 @@ F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983 F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
F src/where.c 2f42fe0d19303e0f5ce29aff3afbd3e43cbd6efb F src/where.c 74e1f7e136bfb52c9c65a55909f8a24873b1edb5
F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1202,7 +1202,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 e405b9e4a9ef322d84b20e902234b4f6aa196b1b P f672a380e2e52bede95ff11a533fd9f7d412d494
R 59a3e15d0b7c925a5c413304ec5e314b R b98bb7ee2a60e85b3c67deaa06ee1000
U drh U drh
Z 1de6834c7b78df261ad24af6ce5dedbe Z 71a8e8f52b1016a5adbdd28eb6eb38bb

View File

@@ -1 +1 @@
f672a380e2e52bede95ff11a533fd9f7d412d494 adcb3fed489b580221c7bf2692a60e24248b23a0

View File

@@ -4139,7 +4139,7 @@ static int whereLoopInsert(WhereLoopBuilder *pBuilder, WhereLoop *pTemplate){
** than pTemplate, so just ignore pTemplate */ ** than pTemplate, so just ignore pTemplate */
#if WHERETRACE_ENABLED /* 0x8 */ #if WHERETRACE_ENABLED /* 0x8 */
if( sqlite3WhereTrace & 0x8 ){ if( sqlite3WhereTrace & 0x8 ){
sqlite3DebugPrintf("ins-noop: "); sqlite3DebugPrintf(" skip: ");
whereLoopPrint(pTemplate, pBuilder->pWC); whereLoopPrint(pTemplate, pBuilder->pWC);
} }
#endif #endif
@@ -4155,10 +4155,10 @@ static int whereLoopInsert(WhereLoopBuilder *pBuilder, WhereLoop *pTemplate){
#if WHERETRACE_ENABLED /* 0x8 */ #if WHERETRACE_ENABLED /* 0x8 */
if( sqlite3WhereTrace & 0x8 ){ if( sqlite3WhereTrace & 0x8 ){
if( p!=0 ){ if( p!=0 ){
sqlite3DebugPrintf("ins-del: "); sqlite3DebugPrintf("replace: ");
whereLoopPrint(p, pBuilder->pWC); whereLoopPrint(p, pBuilder->pWC);
} }
sqlite3DebugPrintf("ins-new: "); sqlite3DebugPrintf(" add: ");
whereLoopPrint(pTemplate, pBuilder->pWC); whereLoopPrint(pTemplate, pBuilder->pWC);
} }
#endif #endif
@@ -4182,7 +4182,7 @@ static int whereLoopInsert(WhereLoopBuilder *pBuilder, WhereLoop *pTemplate){
*ppTail = pToDel->pNextLoop; *ppTail = pToDel->pNextLoop;
#if WHERETRACE_ENABLED /* 0x8 */ #if WHERETRACE_ENABLED /* 0x8 */
if( sqlite3WhereTrace & 0x8 ){ if( sqlite3WhereTrace & 0x8 ){
sqlite3DebugPrintf("ins-del: "); sqlite3DebugPrintf(" delete: ");
whereLoopPrint(pToDel, pBuilder->pWC); whereLoopPrint(pToDel, pBuilder->pWC);
} }
#endif #endif