Fix a bug in the ".eqp" command of the shell that was introduced by the

recent sqlite3SelectTrace/SQLITE_TESTCTRL_TRACEFLAGS changes.

FossilOrigin-Name: fd02dffceb0e21cd85c99d5481ab8567110d01c30ea701178547f32299944302

diff --git a/manifest b/manifest
index 9796d20a4461fd4cdae1175eca7085a9ea73e471..1c834621f1584714cf9f01c969b0d1620c7091c2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sfts5\sfunction\smatchinfo()\sis\sregistered\sbefore\srunning\stests\sthat\suse\sit\sin\sfts5corrupt3.test.
-D 2020-12-04T16:49:25.140
+C Fix\sa\sbug\sin\sthe\s".eqp"\scommand\sof\sthe\sshell\sthat\swas\sintroduced\sby\sthe\nrecent\ssqlite3SelectTrace/SQLITE_TESTCTRL_TRACEFLAGS\schanges.
+D 2020-12-04T16:58:20.287
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -541,7 +541,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 1948a92ca9eab776632816b97e57c61d933474a78aad4f4ef835c916a83dbb1c
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c c9b68506e5d8cc8d0e4b307b97a9800b050ac37dada80ae9c66f680f8fac3e09
-F src/shell.c.in ccc9bd73a510238cfee1c306bae28d22651b70011fa58e6292e04f5f625538b8
+F src/shell.c.in e9f674ee4ec6c345679e8a5b16c869c6c59eb1540dd98ac69e4736ecddce0090
 F src/sqlite.h.in 0e2b4259e49a0eda54d9118eb18a04fcd60e0727a2fd2c81aade0bf57520e706
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
@@ -1887,7 +1887,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 4c5076fbe42cc6447c47bfc202501f945f78bd716cbe8e33599c67b7d0956611
-R 8d18d605e8483c2f8c8d19c49ca4aafe
-U dan
-Z 0f37f3e2444904cd3595dc4b87688ea8
+P 932e05e093192991589e70c2cbcc8a57fb3dcc6df1c2673962bfd06ba5cfdd97
+R 72c47bd3b237b1831a726f9d8517bab8
+U drh
+Z 9b9504ab938901a398e00c8416a51c09

diff --git a/manifest.uuid b/manifest.uuid
index 10f1bf43c34d43a66af82aeb9610e8c7d68efc75..16f50079046592c4820ee28b0dd2e62019ca6ded 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-932e05e093192991589e70c2cbcc8a57fb3dcc6df1c2673962bfd06ba5cfdd97
\ No newline at end of file
+fd02dffceb0e21cd85c99d5481ab8567110d01c30ea701178547f32299944302
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 523ee2c96a851699303b06a4dff987415d0104ef..dbdba271cd8197d643adbddf7cc9cdb96d54de93 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -2884,10 +2884,11 @@ static void explain_data_delete(ShellState *p){
 static unsigned int savedSelectTrace;
 static unsigned int savedWhereTrace;
 static void disable_debug_trace_modes(void){
+  unsigned int zero = 0;
   sqlite3_test_control(SQLITE_TESTCTRL_TRACEFLAGS, 0, &savedSelectTrace);
-  sqlite3_test_control(SQLITE_TESTCTRL_TRACEFLAGS, 1, 0);
+  sqlite3_test_control(SQLITE_TESTCTRL_TRACEFLAGS, 1, &zero);
   sqlite3_test_control(SQLITE_TESTCTRL_TRACEFLAGS, 2, &savedWhereTrace);
-  sqlite3_test_control(SQLITE_TESTCTRL_TRACEFLAGS, 3, 0);
+  sqlite3_test_control(SQLITE_TESTCTRL_TRACEFLAGS, 3, &zero);
 }
 static void restore_debug_trace_modes(void){
   sqlite3_test_control(SQLITE_TESTCTRL_TRACEFLAGS, 1, &savedSelectTrace);