From: drh <> Date: Fri, 23 Jan 2026 17:06:54 +0000 (+0000) Subject: Fix a minor EXPLAIN QUERY PLAN formatting problem. Remove a NEVER() that is X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=447fd1bf2909142c022f336d980412b523dc7801;p=thirdparty%2Fsqlite.git Fix a minor EXPLAIN QUERY PLAN formatting problem. Remove a NEVER() that is reachable. FossilOrigin-Name: 423173079ee0911f86a76c9b905d98328f7aae45d43a38a13957c5c510f87670 --- diff --git a/manifest b/manifest index e42e6f6938..64d5cf0295 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\scode\sthat\sis\sno\slonger\sused. -D 2026-01-23T16:07:51.599 +C Fix\sa\sminor\sEXPLAIN\sQUERY\sPLAN\sformatting\sproblem.\s\sRemove\sa\sNEVER()\sthat\sis\nreachable. +D 2026-01-23T17:06:54.075 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -738,7 +738,7 @@ F src/printf.c b1b29b5e58e1530d5daeee5963d3c318d8ab2d7e38437580e28755753e0c1ded F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 47aa7fdc9ec4c19b103ac5e79d7887d30119b5675309facf5eed1118391c868b F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 -F src/select.c 584a8669fad6bd2494333fb9c24206d95839155732da53a5d34b1fe0034b991f +F src/select.c b7fdfc6076f2677c04eb7381aaa03e5c8e20767f00719d2f45685928782d0b35 F src/shell.c.in e8818572acd50464bc00426fe0d755e98239f73d531437c3dc7721d1fecb1231 F src/sqlite.h.in d463dcdd67d4865991cd62dc8d3f678086b38365593861f77c09c3401551d59f F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 @@ -2193,8 +2193,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 94bf43634bbb1fd8e67235b8be0d9744cca1e364ab3cceecca4528e7b78780d1 -R 2a55fd7d366f0f4038cb2fcdad2f4726 +P 8d7f91e07b0c7573f94fddd64f39671e608969764615bd7f5c060e7ee7540bc6 +R 29ce8c0e341b3726724b5fc2e2978e03 U drh -Z 4d98cdeeda3f34de774c8063318689f1 +Z 976c554e7f30a277d55ef36e626c9c94 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index e52384c47e..50daf60307 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8d7f91e07b0c7573f94fddd64f39671e608969764615bd7f5c060e7ee7540bc6 +423173079ee0911f86a76c9b905d98328f7aae45d43a38a13957c5c510f87670 diff --git a/src/select.c b/src/select.c index 72bcb29a78..68ea379e67 100644 --- a/src/select.c +++ b/src/select.c @@ -3014,12 +3014,12 @@ static int multiSelect( if( addr ){ sqlite3VdbeJumpHere(v, addr); } - } #ifndef SQLITE_OMIT_EXPLAIN - if( p->pNext==0 ){ - ExplainQueryPlanPop(pParse); - } + if( p->pNext==0 ){ + ExplainQueryPlanPop(pParse); + } #endif + } if( pParse->nErr ) goto multi_select_end; /* Compute collating sequences used by @@ -3269,7 +3269,7 @@ static int generateOutputSubroutine( r1 = sqlite3GetTempReg(pParse); r2 = sqlite3GetTempRange(pParse, nKey+2); r3 = r2+nKey+1; - if( NEVER(pDest->eDest==SRT_DistQueue) ){ + if( pDest->eDest==SRT_DistQueue ){ /* If the destination is DistQueue, then cursor (iParm+1) is open ** on a second ephemeral index that holds all values every previously ** added to the queue. */