Remove references to temporary registers from the compiler column-cache when such...

FossilOrigin-Name: f099d6773a837dbe4ba85a8fda818e2d9466e743

diff --git a/manifest b/manifest
index 0e81398c2a52e4db731734afb1d86453a586a87e..5acd84b928ec7d03c802f67b5d2853b01785706e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C fts3\sfunctions\sfor\stesting\sscripts.\s\sThese\sare\sa\sfirst\sstep\stowards\nbeing\sable\sto\swrite\stest\sscript\swhich\sverify\sthat\sfts3\sis\sinternally\nbuilding\sindices\sin\sthe\sexpected\sway.\s\sBoth\snew\sfunctions\sare\sonly\ndefined\sif\sfts3.c\sis\scompiled\swith\sSQLITE_TEST\sdefined,\sas\swhen\nbuilding\stestfixture.\s\sThese\sfunctions\sare\snot\sintended\sto\sbe\spart\sof\nthe\sexposed\sfts3\sAPI.\n\ndump_terms()\sgenerates\sa\sTEXT\sresult\sof\sall\sthe\sterms\sin\sthe\sindex\s(or\na\sspecified\ssegment),\ssorted\sand\sjoined\swith\sspaces.\n\ndump_doclist()\sgenerates\sa\sTEXT\srepresentation\sof\sthe\sdoclist\nassociated\swith\sa\sgiven\sterm\sin\sthe\sindex\s(or\sa\sspecified\ssegment).\s(CVS\s5340)
-D 2008-07-03T19:53:22
+C Remove\sreferences\sto\stemporary\sregisters\sfrom\sthe\scompiler\scolumn-cache\swhen\ssuch\sregisters\sare\sreleased.\sFix\sfor\s#3201.\s(CVS\s5341)
+D 2008-07-04T09:15:11
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 325dfac0a0dd1cb4d975f1ace6453157892e6042
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -103,7 +103,7 @@ F src/callback.c 3ba98ae46f60aa7c2c40eac7d18fe5ba9b706b83
 F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c
 F src/date.c e841168e5520bbbb2a1cbcdce7531d8b23017b4d
 F src/delete.c d3fc5987f2eb88f7b9549d58a5dfea079a83fe8b
-F src/expr.c 0e65125e99a25a293d569f094e4b182b220a4f22
+F src/expr.c 88737070caff1c85f3336c53c3dc7ca360b00da6
 F src/fault.c 3638519d1e0b82bccfafcb9f5ff491918b28f8e1
 F src/func.c 1e7d9569570134ac0771a00382d9d4b41c4aa052
 F src/global.c 2304cfa3288763bd2fed10caf8c6fbaa2b383f4e
@@ -526,6 +526,7 @@ F test/tkt2942.test c5c87d179799ca6d1fbe83c815510b87cd5ec7ce
 F test/tkt3080.test 31a02e87a4c80ed443831c2c5b0e8216ff95ac14
 F test/tkt3093.test fbdbc5b4969244ad11f540759003e361fcaf391f
 F test/tkt3121.test 9da9c57b75c9dbebae70eb19f458bbc616d04280
+F test/tkt3201.test f2a40b04bb769087b88acca9a17f5874254698f6
 F test/trace.test 951cd0f5f571e7f36bf7bfe04be70f90fb16fb00
 F test/trans.test 2fd24cd7aa0b879d49a224cbd647d698f1e7ac5c
 F test/trigger1.test 7c13f39ca36f529bf856e05c7d004fc0531d48b4
@@ -597,7 +598,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P cec4eba1a105396c5fd5d2b664456f6d6be3f215
-R 2994d09a5d3d78a35346e2b1b6bff7bc
-U shess
-Z 7b70c642c4bfeb309fc7899215c4dbcd
+P a48e3d95f7a656285e959cef595cbe6d53428ad9
+R 15ada11bb606ce47c95f2a4cfe32122e
+U danielk1977
+Z 51ba53ad7e27ba8ada3bf3fd25b9e527

diff --git a/manifest.uuid b/manifest.uuid
index a8f6b751cb338d40a0694df90856a68373e3a53a..8fb49b0132990a5478c8fb3c766befb48eda9275 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a48e3d95f7a656285e959cef595cbe6d53428ad9
\ No newline at end of file
+f099d6773a837dbe4ba85a8fda818e2d9466e743
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index e548d02cf599e6c1d6d9ecbc15c39e06c1df42e7..137a0d3a23469c46ed23c3573b4dcdc273b06f3b 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.381 2008/06/27 00:52:45 drh Exp $
+** $Id: expr.c,v 1.382 2008/07/04 09:15:11 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -3568,6 +3568,7 @@ int sqlite3GetTempReg(Parse *pParse){
 }
 void sqlite3ReleaseTempReg(Parse *pParse, int iReg){
   if( iReg && pParse->nTempReg<ArraySize(pParse->aTempReg) ){
+    sqlite3ExprWritableRegister(pParse, iReg, iReg);
     pParse->aTempReg[pParse->nTempReg++] = iReg;
   }
 }

diff --git a/test/tkt3201.test b/test/tkt3201.test
new file mode 100644 (file)
index 0000000..a388ff7
--- /dev/null
+++ b/test/tkt3201.test
@@ -0,0 +1,76 @@
+# 2008 July 4
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library. 
+# Specifically, it tests that bug #3201 has been fixed.
+#
+# $Id: tkt3201.test,v 1.1 2008/07/04 09:15:11 danielk1977 Exp $
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+do_test tkt3201-1 {
+  execsql {
+    CREATE TABLE t1(a INTEGER PRIMARY KEY, b TEXT);
+    INSERT INTO t1 VALUES(1, 'one');
+    INSERT INTO t1 VALUES(2, 'two');
+  }
+} {}
+
+do_test tkt3201-2 {
+  execsql {
+    SELECT l.a, r.a FROM t1 AS l, t1 AS r WHERE l.a < r.a;
+  }
+} {1 2}
+
+do_test tkt3201-3 {
+  execsql {
+    CREATE TABLE t2(a INTEGER PRIMARY KEY, b TEXT);
+    INSERT INTO t2 VALUES(2, 'two');
+  }
+  execsql {
+    SELECT l.a, r.a FROM t1 AS l, t2 AS r WHERE l.a < r.a;
+  }
+} {1 2}
+
+do_test tkt3201-4 {
+  execsql {
+    DELETE FROM t1 WHERE a = 2;
+  }
+  execsql {
+    SELECT l.a, r.a FROM t1 AS l, t2 AS r WHERE l.a < r.a;
+  }
+} {1 2}
+
+do_test tkt3201-5 {
+  execsql {
+    DELETE FROM t1 WHERE a = 2;
+  }
+  execsql {
+    SELECT t1.a, t1.b, t2.a, t2.b FROM t1, t2;
+  }
+} {1 one 2 two}
+
+do_test tkt3201-6 {
+  execsql {
+    CREATE TABLE t3(c INTEGER PRIMARY KEY, d TEXT);
+    INSERT INTO t3 VALUES(2, 'two');
+  }
+  execsql { SELECT a, b, c, d FROM t1, t3 }
+} {1 one 2 two}
+
+do_test tkt3201-7 {
+  explain { SELECT a, b, c, d FROM t1, t3 WHERE a < c }
+  execsql { SELECT a, b, c, d FROM t1, t3 WHERE a < c }
+} {1 one 2 two}
+
+finish_test
+
+