In the "wheretrace" logic (disabled for normal builds) expand the print width

of the flags field to be wide enough for all 17 bits.

FossilOrigin-Name: 3181d2069a788adc719decf65dc1bd2e16650c87

diff --git a/manifest b/manifest
index e698ec3432a80cee161cec1d00cdaedf9e695f59..35f415f917393f54cacae92f79870e9b68cac314 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_UNLINK_AFTER_CLOSE\scompile-time\soption.\s\sIf\senabled,\sthe\nunlink\sof\stemporary\sfiles\son\sunix\sis\sdeferred\suntil\safter\sthe\sfile\sis\sclosed.
-D 2014-06-16T18:35:06.993
+C In\sthe\s"wheretrace"\slogic\s(disabled\sfor\snormal\sbuilds)\sexpand\sthe\sprint\swidth\nof\sthe\sflags\sfield\sto\sbe\swide\senough\sfor\sall\s17\sbits.
+D 2014-06-16T21:30:29.402
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ed5e4aae4799f724699d5509fac2977786414dbb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -296,7 +296,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c 778943263d3d6de375f9e983998d61d61810e9d5
+F src/where.c 5ee08882fdc1a4661766a6dae639bd79cabb28fa
 F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1177,7 +1177,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 837f6404230fc642e9084140c4b30cca1be43375
-R ecda5288cdc332685194aeb4a49d9a9a
+P e43a2f92b616ec885a1ee62911fa8f6991d277f7
+R ff2a1582a470d2ed61f9edf92dcfedf7
 U drh
-Z 0e0dd722026abbeb65bd76ad2a4f4176
+Z 5706b0908a4cefe3e401fd4592d23dda

diff --git a/manifest.uuid b/manifest.uuid
index 3ea2a9a55db413dfe1b5218aafb0388cdb45db38..8b422248185b79d5716f04a4a2f74eacffb81fae 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e43a2f92b616ec885a1ee62911fa8f6991d277f7
\ No newline at end of file
+3181d2069a788adc719decf65dc1bd2e16650c87
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 01d6b2a8f2233f08fd3b81513dd8a42f043b4ca1..8c6f4bbbe3f60da5a0400cca1bd471be270e3017 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3686,7 +3686,7 @@ static void whereLoopPrint(WhereLoop *p, WhereClause *pWC){
     sqlite3DebugPrintf(" %-19s", z);
     sqlite3_free(z);
   }
-  sqlite3DebugPrintf(" f %04x N %d", p->wsFlags, p->nLTerm);
+  sqlite3DebugPrintf(" f %05x N %d", p->wsFlags, p->nLTerm);
   sqlite3DebugPrintf(" cost %d,%d,%d\n", p->rSetup, p->rRun, p->nOut);
 #ifdef SQLITE_ENABLE_TREE_EXPLAIN
   /* If the 0x100 bit of wheretracing is set, then show all of the constraint