Change the undocumented ".selecttrace" command in the shell to accept

an integer bitmask rather than a boolean.

FossilOrigin-Name: bd63bf882c5a925f921adc9cf7425d2e7950f0b2

diff --git a/manifest b/manifest
index 71f218ff4a00e295156bd35ae9599f8ac02823a6..b3404a8541bd7963c4db39e22c13a4b0ad294858 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassert()\sthat\smay\sfail\sfollowing\san\sOOM\serror.
-D 2015-01-21T17:00:57.118
+C Change\sthe\sundocumented\s".selecttrace"\scommand\sin\sthe\sshell\sto\saccept\nan\sinteger\sbitmask\srather\sthan\sa\sboolean.
+D 2015-01-22T11:29:25.197
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -230,7 +230,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c a4e8fda24c8eab2682a058bdda0d5d68cfe3919c
-F src/shell.c d2d3b46701e44369dd314bd6817541c60e2c39ea
+F src/shell.c acdf311a7a6ed5d84454f9b13488a76fd57dbb72
 F src/sqlite.h.in 9dfc99d6533d36d6a549c4f3f01cacc8be956ada
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
@@ -1237,7 +1237,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 78c2e62bb4c529595aaaf2e1f5f26387ad977b1b
-R fadddb94e3f078ed8e5664ef5ad11fc1
-U dan
-Z 211832fccf702756128a6ea4845193da
+P 5f592359d6d41708da3b3ac9d987a1631bfa3d88
+R 06bf50be530a04b67e63b7751053876a
+U drh
+Z 7005abb8b52570698504c401137e57e1

diff --git a/manifest.uuid b/manifest.uuid
index dfb1a44e742515888b119d7d41655487e518acf3..3b26c8f3c646d35e3321cf70b7e6f0db291a80e1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5f592359d6d41708da3b3ac9d987a1631bfa3d88
\ No newline at end of file
+bd63bf882c5a925f921adc9cf7425d2e7950f0b2
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 1d9c80798cdb734c4ee4ea2c267d841f17e8adbd..0603268cc633acb1aeb28724316662e1f52d2872 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -3329,7 +3329,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 ){
     extern int sqlite3SelectTrace;
-    sqlite3SelectTrace = nArg>=2 ? booleanValue(azArg[1]) : 0xff;
+    sqlite3SelectTrace = integerValue(azArg[1]);
   }else
 #endif