For the shell, changed the output of the errors on lines 2910 and 2914 to goto

stderr.  I left the timer values going to stdout as all of the other interactive
shell commands (startup banner, help, etc.) go to stdout and I felt this was more
consistent.  Ticket 43db771bb2.

FossilOrigin-Name: 8a8eeb0c5af4bbeafd9864b03557eb9cd32f09ce

diff --git a/manifest b/manifest
index d244da507050fedd7e896251eab63c3a7a67bd4b..2c2af408fbb3e7db020a5804be9c83c4aef80dc1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C For\sWindows\sversion\sof\sshell,\sadd\ssupport\sfor\s.timer\scommand\nusing\sthe\sGetProcessTimes()\sAPI\sif\savailable\s(in\sthe\ssame\sway\ngetrusage()\sis\sused\son\sUNIX.)\sTicket\s89668ca167.
-D 2009-10-21T03:42:58
+C For\sthe\sshell,\schanged\sthe\soutput\sof\sthe\serrors\son\slines\s2910\sand\s2914\sto\sgoto\nstderr.\s\sI\sleft\sthe\stimer\svalues\sgoing\sto\sstdout\sas\sall\sof\sthe\sother\sinteractive\nshell\scommands\s(startup\sbanner,\shelp,\setc.)\sgo\sto\sstdout\sand\sI\sfelt\sthis\swas\smore\nconsistent.\s\sTicket\s43db771bb2.
+D 2009-10-21T03:56:55
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4ca3f1dd6efa2075bcb27f4dc43eef749877740d
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -161,7 +161,7 @@ F src/random.c 676b9d7ac820fe81e6fb2394ac8c10cff7f38628
 F src/resolve.c 3ac31c7181fab03732125fdedf7c2091a5c07f1b
 F src/rowset.c c64dafba1f9fd876836c8db8682966b9d197eb1f
 F src/select.c cbe366a0ce114856e66f5daf0f848d7c48a88298
-F src/shell.c 40364daed1653851fa727baa38c4afdbc8d17801
+F src/shell.c 98ce80c6d9c616d4da9638dc1c6c3b9e0c08dd39
 F src/sqlite.h.in 2643b0946d2564a05088e656e0740863d55a02ea
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
 F src/sqliteInt.h 3b00a3ce79e60c5a47c342b738c8b75013f3ec84
@@ -761,7 +761,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 761396f8cb79be34853ba698a65af54874c3c10e
-R 58a677fbffcf3d33e3376183088659ba
+P 83216fbe904425f5b15d1ae689cea9d13670e979
+R d76b467197b5de2ca9c970e1c850fdb8
 U shane
-Z 2462a974d1dd735a6b5e18b16e693806
+Z ce1fa5a1eb9780100a302b8cc488b1f6

diff --git a/manifest.uuid b/manifest.uuid
index 277a595e6b9c7f7b2ae407a8019af59a626a05a0..eca5796f2f61fcbea0b8f417bbd9449300706d6a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-83216fbe904425f5b15d1ae689cea9d13670e979
\ No newline at end of file
+8a8eeb0c5af4bbeafd9864b03557eb9cd32f09ce
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 93cd8a7c25037e0af78c285c83f29128f8ba9ead..f689832f2971c469047400bb4988bb6acd73c0f5 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -2907,11 +2907,11 @@ static int process_input(struct callback_data *p, FILE *in){
           sqlite3_snprintf(sizeof(zPrefix), zPrefix, "SQL error:");
         }
         if( zErrMsg!=0 ){
-          printf("%s %s\n", zPrefix, zErrMsg);
+          fprintf(stderr, "%s %s\n", zPrefix, zErrMsg);
           sqlite3_free(zErrMsg);
           zErrMsg = 0;
         }else{
-          printf("%s %s\n", zPrefix, sqlite3_errmsg(p->db));
+          fprintf(stderr, "%s %s\n", zPrefix, sqlite3_errmsg(p->db));
         }
         errCnt++;
       }