In the CLI, avoid extra .selecttrace and .wheretrace output when in ".eqp full"

mode.

FossilOrigin-Name: 427bbf318a28e827bf03d43c2912c8ad937dd52f829feaf7fe374093692ed61b

diff --git a/manifest b/manifest
index c7f460229b7fdfb90ece562a5396a83267042e8f..6e2f69705c9b14a46827e4dbff1ea466d6410540 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Closer\sreading\sof\sthe\ssqlite3_db_config()\sdocumentation\sshow\sthat\sit\sis\nsubtly\sincorrect.\s\sThis\scheck-in\sfixes\sthe\sproblem.\s\sNo\scode\schanges.
-D 2018-03-20T11:58:28.771
+C In\sthe\sCLI,\savoid\sextra\s.selecttrace\sand\s.wheretrace\soutput\swhen\sin\s".eqp\sfull"\nmode.
+D 2018-03-20T12:04:38.276
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -490,7 +490,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 66c73fcb7719b8ff0e841b58338f13604ff3e2b50a723f9b8f383595735262f6
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 0502980145d371c2e9ab31bdaef62c65355f4f815059324f8d764359cc1dcc21
-F src/shell.c.in 52b1b3f52159144391d598f43ef7ce13f58f35fcc18ae04df68e879695a1747f
+F src/shell.c.in 911b9e3bce40413c78fdba28efa28363e98183819bd4b300780bf57bacfc4b84
 F src/sqlite.h.in 19762b57baa1ade67531f254de94374428fb9c82452ef305017847945f9c2911
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
@@ -1712,7 +1712,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 8a439a6dda390d7486feb837f87a83e16abd283c882e81e637bd1235d2684379
-R 4a8d2973e82f63e78c33aea4d4a98f42
+P 44d90e7f4bc83680e8fbbf1a0423c6f5cc2cc2aed118b7af1c4c3d9e09b05dd7
+R 1f5ff659ead58dfc9d628c41aebcf2de
 U drh
-Z 941c6c30265726a1112c988a7aaa89dd
+Z c69f433226dc8ea5cb136d594ea65a55

diff --git a/manifest.uuid b/manifest.uuid
index 75a8262559ece25bbfdaef514cce461056059231..54628518342b480799e84a0df98187c029fc344e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-44d90e7f4bc83680e8fbbf1a0423c6f5cc2cc2aed118b7af1c4c3d9e09b05dd7
\ No newline at end of file
+427bbf318a28e827bf03d43c2912c8ad937dd52f829feaf7fe374093692ed61b
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 26e58aef3ac0e81449359d5b1cc0fc02a7235a00..a8342f5b1763565cce042169a141faf57a4e9552 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -2879,7 +2879,12 @@ static int shell_exec(
           sqlite3_finalize(pExplain);
           sqlite3_free(zEQP);
         }
-        sqlite3_db_config(db, SQLITE_DBCONFIG_TRIGGER_EQP, triggerEQP, 0);
+        if( pArg->autoEQP>=AUTOEQP_trigger && triggerEQP==0 ){
+          sqlite3_db_config(db, SQLITE_DBCONFIG_TRIGGER_EQP, 0, 0);
+          /* Reprepare pStmt before reactiving trace modes */
+          sqlite3_finalize(pStmt);
+          sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
+        }
         restore_debug_trace_modes();
       }