Fix an off-by-one error that messes up the display of loop codes in the

".wheretrace" debugging output for queries with more than 62 candidate
loops when SQLITE_ENABLE_WHERETRACE is on.

FossilOrigin-Name: 0bbdaf2801e4102d952db65e53962e534b67b8b72e76fadb4ce404a6249129d9

diff --git a/manifest b/manifest
index 20adf389269499bee89fced5c785adac9da4ff98..7dc9f6e8ee1e9432a682e4f94b1f38a5edd4160d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sreusing\sa\smaterialized\sview,\smake\ssure\sthe\sestimated\snumber\sof\noutput\srows\sis\scorrectly\sinitialized\sto\savoid\sconfusing\sthe\squery\splanner.
-D 2017-06-11T19:51:36.949
+C Fix\san\soff-by-one\serror\sthat\smesses\sup\sthe\sdisplay\sof\sloop\scodes\sin\sthe\n".wheretrace"\sdebugging\soutput\sfor\squeries\swith\smore\sthan\s62\scandidate\nloops\swhen\sSQLITE_ENABLE_WHERETRACE\sis\son.
+D 2017-06-11T20:17:02.600
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -486,7 +486,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 F src/walker.c d46044e7a5842560dfe7122d93ff5145dd4a96f4d0bf5ba5910a7731b8c01e79
-F src/where.c 67f98714b07ec3c1d5e033a63d23c0fd70c24861b7b46b69b10700f22dca6ffe
+F src/where.c aa213e1b1c29eb8946a9f25108a18666a745ae5bac41b58d0be98730937a7785
 F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
 F src/wherecode.c 339ee802d9d311acf0cba8b5a9a092e167ef71c3a777d4b3e57de25d193251c7
 F src/whereexpr.c a2fe3811d45af45a5c6667caabc15e01054fe6228c64e86e1f7d2ba5ef5284f9
@@ -1582,7 +1582,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8f92b7a6223a69304dc8a6ab3b43a49cbb87f572a1e65d8a0c6dc09fca38e1a8
-R a9d0a03ba641ed87c89d84acdaf499c1
+P 87aceb417a813a2925b636cffa660fe25f3b7e3b3c84bb2108951bf0af644376
+R 5d137f03dd98c6947d396116cfd8bb62
 U drh
-Z 6f34a8996840968a8347834320cb43af
+Z 9a468aee323b8155a594f5ff05c91ea1

diff --git a/manifest.uuid b/manifest.uuid
index 6adf670bf5bd11d297c16eb20c2efe8816695b78..8abd922d2d29dfeb1afc7a80b7ebac0da58db8c4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-87aceb417a813a2925b636cffa660fe25f3b7e3b3c84bb2108951bf0af644376
\ No newline at end of file
+0bbdaf2801e4102d952db65e53962e534b67b8b72e76fadb4ce404a6249129d9
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 89c4edeb8c3b071b339440bb4f483d17da1f3ec6..99b0df4e5decbd509a61fbc113be62330b6ce437 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -4577,7 +4577,7 @@ WhereInfo *sqlite3WhereBegin(
       static const char zLabel[] = "0123456789abcdefghijklmnopqrstuvwyxz"
                                              "ABCDEFGHIJKLMNOPQRSTUVWYXZ";
       for(p=pWInfo->pLoops, i=0; p; p=p->pNextLoop, i++){
-        p->cId = zLabel[i%sizeof(zLabel)];
+        p->cId = zLabel[i%(sizeof(zLabel)-1)];
         whereLoopPrint(p, sWLB.pWC);
       }
     }