Fix the ".testctrl imposter" command in the command-line shell to be

consistent in error reporting and results with the other .testctrl
commands.

FossilOrigin-Name: 0ec08ba8a0fa188146b071a489908332693ba59a

diff --git a/manifest b/manifest
index 3a717ccebbe788da34cfe0921606a69285f65b09..ddfb25e98be7e741d6caf2556021421ca0d016c3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Using\sMSVC,\sget\sthe\ssqlite3IoTrace\svariable\sworking\swith\sthe\sUSE_STDCALL\sand/or\sDYNAMIC_SHELL\soptions.
-D 2015-03-27T00:21:52.785
+C Fix\sthe\s".testctrl\simposter"\scommand\sin\sthe\scommand-line\sshell\sto\sbe\nconsistent\sin\serror\sreporting\sand\sresults\swith\sthe\sother\s.testctrl\ncommands.
+D 2015-03-27T02:27:20.756
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -231,7 +231,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5
-F src/shell.c f21e91ab78e7b681e5c3c8d7f7a5b92f5583ed7a
+F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa
 F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
@@ -1247,7 +1247,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 25b46a9c7e03a84bee2ffddc6d7fd6ae280e9d7b
-R a3ab1f66556079c5bd7cf506cd3f9f92
-U mistachkin
-Z 0ec554b2258cca84ae33b3fc6f4637d7
+P fe976c9130f6eecfa0a10347ee3f800f32051b89
+R 13326ac5b127e703532d322e93f2a662
+U drh
+Z b2f8062e547cfe60af29856c986c54f4

diff --git a/manifest.uuid b/manifest.uuid
index 88bef69794a68946cf0ba902f7bb34d341160a38..980d7d833a315c700deb9e73f85a44d3b7338d44 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fe976c9130f6eecfa0a10347ee3f800f32051b89
\ No newline at end of file
+0ec08ba8a0fa188146b071a489908332693ba59a
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 14ac9bc72dc7be93d9cd8035e2eadc088e736a3d..7ff3eb6cb078fdde845c4a39a4d9d2824c16ae65 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -3803,9 +3803,9 @@ static int do_meta_command(char *zLine, ShellState *p){
                           azArg[2],
                           integerValue(azArg[3]),
                           integerValue(azArg[4]));
+            fprintf(p->out, "%d (0x%08x)\n", rc, rc);
           }else{
-            fprintf(stderr,"Usage: .testctrl initmode dbName onoff tnum\n");
-            rc = 1;
+            fprintf(stderr,"Usage: .testctrl imposter dbName onoff tnum\n");
           }
           break;