Simplification to the sqlite3_stmt_explain() implementation.

FossilOrigin-Name: dd5eb4c7f71c658aff8c2f11ff163c5e79f0ebfd49fd13ca8e28381fe63cc82f

diff --git a/manifest b/manifest
index 30382b566cfc59c13d2638283a250d083ce0c42b..6986817d2d41b52c602506d399ce1ecc54a4937c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C SAHPoolUtil.importDb()\snow\saccepts\seither\sa\sbyte\sarray\sor\sArrayBuffer.
-D 2023-07-29T15:53:53.903
+C Simplification\sto\sthe\ssqlite3_stmt_explain()\simplementation.
+D 2023-07-29T17:05:35.577
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -716,7 +716,7 @@ F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
 F src/vdbe.c cd0396758da6a95e6c4e3bec7c3d6e767c3b39930c295c2425f83bb086cdc6ba
 F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
 F src/vdbeInt.h cd829ff67fc18aff2476fe3209262ba8671cb43d51cb6913de4a670e37d2fbe3
-F src/vdbeapi.c 9e2cf049520538d5b8c32fa02c6f86d7de071a0f64b91e7fbbc4be06e5d85d91
+F src/vdbeapi.c f37822f215740ede2a8fcae99bc13f2cc3a72dd0e1d22b81b9298c5ca67dbc38
 F src/vdbeaux.c a586f445945eef6ad1fcd7c94f700faa1baea93c0dbd446291c7cf65966c8470
 F src/vdbeblob.c 2516697b3ee8154eb8915f29466fb5d4f1ae39ee8b755ea909cefaf57ec5e2ce
 F src/vdbemem.c adb5877dc54330865e45e0fba50f6455c1d9d8b83434c59f0e3d2d2a0b9f0e58
@@ -2049,8 +2049,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P dc98ac6b6de27fc096a715e650067154a545709cf1eecd6c2722ab30a91c2d1d
-R 3e26d7f7d670cd4a8283ab0fe765ef37
-U stephan
-Z adbef7df6499ec1443cd0eb0845e21bc
+P 3848f04e542e2f0f8975e82632af598aac3b60312bd244b0472f7ddf1dda77df
+R e759fdc886a125e6d3d4d4dcc3b27f36
+U drh
+Z 8ab9c0b6287b81d079ea01ec27d5783d
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 048f970702b4d11d047859931d67de7cb8e89b48..7b9e2b1b5f6f9131a33456c999e17d8ba0fbc230 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3848f04e542e2f0f8975e82632af598aac3b60312bd244b0472f7ddf1dda77df
\ No newline at end of file
+dd5eb4c7f71c658aff8c2f11ff163c5e79f0ebfd49fd13ca8e28381fe63cc82f
\ No newline at end of file

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 0c45edea583ba867e5cb60523ccaf18e07788c3f..cc58e7a877ca200ca60b25d3a453cb60b3d2b377 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -1877,10 +1877,9 @@ int sqlite3_stmt_explain(sqlite3_stmt *pStmt, int eMode){
     v->explain = eMode;
     rc = SQLITE_OK;
   }else{
-    int haveEqpOps = v->explain==2 || v->haveEqpOps;
     v->explain = eMode;
     rc = sqlite3Reprepare(v);
-    v->haveEqpOps = haveEqpOps!=0;
+    v->haveEqpOps = eMode==2;
   }
   if( v->explain ){
     v->nResColumn = 12 - 4*v->explain;