From: drh <drh@noemail.net>
Date: Wed, 12 Jul 2006 00:18:40 +0000 (+0000)
Subject: Reset TCL results when onecolumn or eval methods have no reply.
X-Git-Tag: version-3.6.10~2836
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=050be3294aeff22d92b77b939c7452b35e01beed;p=thirdparty%2Fsqlite.git

Reset TCL results when onecolumn or eval methods have no reply.
Ticket #1887. (CVS 3331)

FossilOrigin-Name: 9c6090c609afa9906029ed4ba22375f5bee058c4
---

diff --git a/manifest b/manifest
index a583c0339d..5eae50ed78 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C By\sdefault,\snew\sdatabases\sare\snow\screated\sin\sthe\slegacy\sfile\sformat\s-\sthe\nformat\sthat\signores\sDESC\son\sindices.\s\sIf\syou\swant\sdescending\sindices,\syou\nmust\seither\srecompile\swith\s-DSQLITE_DEFAULT_FILE_FORMAT=4\sor\sissue\n"PRAGMA\slegacy_file_format=OFF"\sprior\sto\screating\sthe\sfirst\stable\sin\sthe\ndatabase.\s(CVS\s3330)
-D 2006-07-11T14:17:52
+C Reset\sTCL\sresults\swhen\sonecolumn\sor\seval\smethods\shave\sno\sreply.\nTicket\s#1887.\s(CVS\s3331)
+D 2006-07-12T00:18:41
 F Makefile.in 9c2a76055c305868cc5f5b73e29a252ff3632c0a
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -76,7 +76,7 @@ F src/sqlite.h.in 432848ac7f8d7e6fea727668acccec62bdd86cc4
 F src/sqlite3ext.h c611255287e9a11ce4f1fe6251c2a0b9d32a828b
 F src/sqliteInt.h a413094c83dd3e79f129afb9d453b5680651176b
 F src/table.c d8817f43a6c6bf139487db161760b9e1e02da3f1
-F src/tclsqlite.c 22ab598cfaa6fda50dec9035852687114286d06e
+F src/tclsqlite.c 64c4a41dac9dae0d2258b06c4229e995d5fa7cc4
 F src/test1.c 535294d7f21a4127082c4f7a57f225482df9cc36
 F src/test2.c ca74a1d8aeb7d9606e8f6b762c5daf85c1a3f92b
 F src/test3.c 833dc8346e431182ae6bd0648455c3d4cc65a19f
@@ -375,7 +375,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P b1f326e6959ef3be11f772e80f5ab6dd65b2d065
-R 58e2d2587eb65892cff29cb33e8999b9
+P 65b60f05ce49ff127bf5044f96db36caf1fa0106
+R c2fe2d2fef5276c6e646e7b15fa1fb09
 U drh
-Z 77fa0dc9a6a18dc5ba3c3f9cbd7ca1bb
+Z 97a143b73f2650c099952ed39c8d5956
diff --git a/manifest.uuid b/manifest.uuid
index f285292b8b..b9a4847b3f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-65b60f05ce49ff127bf5044f96db36caf1fa0106
\ No newline at end of file
+9c6090c609afa9906029ed4ba22375f5bee058c4
\ No newline at end of file
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index f780d9fac0..d660c4c53d 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.163 2006/07/10 21:15:52 drh Exp $
+** $Id: tclsqlite.c,v 1.164 2006/07/12 00:18:41 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -1568,6 +1568,8 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
         Tcl_SetObjResult(interp, pRet);
       }
       Tcl_DecrRefCount(pRet);
+    }else if( rc==TCL_OK ){
+      Tcl_ResetResult(interp);
     }
     break;
   }