From 2b44fd94baa4f9934c646eacf1a5be56760eb146 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 17 Feb 2017 01:43:51 +0000 Subject: [PATCH] Enable the ".wheretrace" and ".selecttrace" extensions in the command-line shell when compiled on Windows using DEBUG=3 or higher. Fix a harmless warning in the shell that comes up when compiled this way. FossilOrigin-Name: 8a03be1dc42737ba0712d33f639ea26dc243b20e --- Makefile.msc | 1 + manifest | 14 +++++++------- manifest.uuid | 2 +- src/shell.c | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile.msc b/Makefile.msc index 8b98fe4cac..317f68fa9b 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -745,6 +745,7 @@ RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR=1 !IF $(DEBUG)>2 TCC = $(TCC) -DSQLITE_DEBUG=1 +TCC = $(TCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE RCC = $(RCC) -DSQLITE_DEBUG=1 !ENDIF diff --git a/manifest b/manifest index 4ce84926b2..d52e7b226a 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -C Change\sthe\sname\sof\sWhereInfo.pDistinctSet\sto\spResultSet,\ssince\sit\sis\snow\nused\sfor\smore\sthan\sjust\sDISTINCT\sprocessing. -D 2017-02-16T20:52:52.517 +C Enable\sthe\s".wheretrace"\sand\s".selecttrace"\sextensions\sin\sthe\scommand-line\nshell\swhen\scompiled\son\sWindows\susing\sDEBUG=3\sor\shigher.\s\sFix\sa\sharmless\nwarning\sin\sthe\sshell\sthat\scomes\sup\swhen\scompiled\sthis\sway. +D 2017-02-17T01:43:51.171 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 -F Makefile.msc 067a6766f800cc8d72845ab61f8de4ffe8f3fc99 +F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7 F VERSION 3605fa447e4623f5ff4a6adc97b1fde9a257b8f2 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@ -395,7 +395,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c f9bc0de45a30a450da47b3766de00be89bf9be79 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac F src/select.c d12f3539f80db38b09015561b569e0eb1c4b6c5f -F src/shell.c a661e7ccd202b16cb5321999354699e5ee018fb2 +F src/shell.c bb8e20789499aec921a01d8744c616b81b8214f1 F src/sqlite.h.in 751ff125eb159c8f92c182b8df980a5e4f50e966 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae @@ -1556,7 +1556,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 ff5e733cbffd73faa4046e0f1c7f24bb6e131738 -R 771ea12d7c4097594afa32049854d91e +P 9fc5cd505fe6ab043519d68e999d2285e22452af +R f90eded334f732494d0503ad2f56a8b5 U drh -Z f13a633082a8173e1922e71dbb49e7e9 +Z 4e5822b5948bc4c5b310214a2902dbfe diff --git a/manifest.uuid b/manifest.uuid index fe9afd07d4..2379d6ab79 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9fc5cd505fe6ab043519d68e999d2285e22452af \ No newline at end of file +8a03be1dc42737ba0712d33f639ea26dc243b20e \ No newline at end of file diff --git a/src/shell.c b/src/shell.c index fe62bfc8a1..fbbbea9d79 100644 --- a/src/shell.c +++ b/src/shell.c @@ -4614,7 +4614,7 @@ static int do_meta_command(char *zLine, ShellState *p){ #if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE) if( c=='s' && n==11 && strncmp(azArg[0], "selecttrace", n)==0 ){ - sqlite3SelectTrace = integerValue(azArg[1]); + sqlite3SelectTrace = (int)integerValue(azArg[1]); }else #endif