Make a hard copy of the results of a subquery lest the result of the

subquery be referenced after a change to the table that generated the subquery
result.

FossilOrigin-Name: 9c0d80907b4dee8ee8f205c2ebdb759f5ba1d771

diff --git a/manifest b/manifest
index c5e17b3697dac73b2b7f2fe544c6ca48b5142a0b..88b0774ed34a8e04db033ee7ca2a2e377f294491 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sa\scomment.\s\sNo\schanges\sto\scode.
-D 2015-05-16T18:31:44.355
+C Make\sa\shard\scopy\sof\sthe\sresults\sof\sa\ssubquery\slest\sthe\sresult\sof\sthe\nsubquery\sbe\sreferenced\safter\sa\schange\sto\sthe\stable\sthat\sgenerated\sthe\ssubquery\nresult.
+D 2015-05-18T04:24:27.963
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -231,7 +231,7 @@ F src/printf.c 13ce37e5574f9b0682fa86dbcf9faf76b9d82a15
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
-F src/select.c 1b0bfc7d59e48c26b895a6b719157111a617d9e3
+F src/select.c 6d9d6ae899acb9bf148862e8cccdf16085514b26
 F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee
 F src/sqlite.h.in bf3fe5eba3a5142477b8dae3cfce627c3e971455
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@ -750,7 +750,7 @@ F test/minmax4.test 936941484ebdceb8adec7c86b6cd9b6e5e897c1f
 F test/misc1.test 783ba75743b2cf71e0f646bf540a6cef57264811
 F test/misc2.test 00d7de54eda90e237fc9a38b9e5ccc769ebf6d4d
 F test/misc3.test cf3dda47d5dda3e53fc5804a100d3c82be736c9d
-F test/misc4.test 21c3a52354c022d2388a40c5082e9348e041bef7
+F test/misc4.test 0d8be3466adf123a7791a66ba2bc8e8d229e87f3
 F test/misc5.test f96428ea95b3820aafc6f1c50cf48a09e4597ee1
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
 F test/misc7.test edd0b63e2ee29a256900b0514f6fff27e19e9bb2
@@ -1258,7 +1258,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 2c1039d454e359b0eec3db2d4201b4ba7e543052
-R c540749c837ccfa9e646ed2d9c9c0493
+P ee4b74250ad7a4061421d44b490cb79f649b3720
+R cec1b3be1402a8f9c8bcb82830e4cc3b
 U drh
-Z 98006a9bc56782e174c039d9f287e37a
+Z f5d245b9071d9cc745d677044b477f63

diff --git a/manifest.uuid b/manifest.uuid
index f6155d242b2d45aae24aba429f271cec5d81a450..33fd7e80151c14f67519199b575a41d29b22af33 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ee4b74250ad7a4061421d44b490cb79f649b3720
\ No newline at end of file
+9c0d80907b4dee8ee8f205c2ebdb759f5ba1d771
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index beb52c77e68bd2a4830d99c0364bbce43f54a7c3..e8d9fdd5ca1a91ac6d80101859fa9a3dd11fbe14 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -713,8 +713,13 @@ static void selectInnerLoop(
     /* If the destination is an EXISTS(...) expression, the actual
     ** values returned by the SELECT are not required.
     */
-    sqlite3ExprCodeExprList(pParse, pEList, regResult,
-                  (eDest==SRT_Output||eDest==SRT_Coroutine)?SQLITE_ECEL_DUP:0);
+    u8 ecelFlags;
+    if( eDest==SRT_Mem || eDest==SRT_Output || eDest==SRT_Coroutine ){
+      ecelFlags = SQLITE_ECEL_DUP;
+    }else{
+      ecelFlags = 0;
+    }
+    sqlite3ExprCodeExprList(pParse, pEList, regResult, ecelFlags);
   }
 
   /* If the DISTINCT keyword was present on the SELECT statement

diff --git a/test/misc4.test b/test/misc4.test
index 9b4376d7945ea9518209ed889240d4f2fa096d0e..79e756ec631bb111c31eab0f0e4a38be1e9fc758 100644 (file)
--- a/test/misc4.test
+++ b/test/misc4.test
@@ -219,4 +219,14 @@ do_catchsql_test misc4-7.1 {
   VACUUM;
 } {1 {unrecognized token: "[M%s%s%s%s%s%s%s%s%s%s%s%s%s"}}
 
+# 2015-05-18.  Use of ephermeral Mem content after the cursor that holds
+# the canonical content has moved on.
+#
+do_execsql_test misc4-7.2 {
+  CREATE TABLE t0(a,b);
+  INSERT INTO t0 VALUES(1,0),(2,0);
+  UPDATE t0 SET b=9 WHERE a AND (SELECT a FROM t0 WHERE a);
+  SELECT * FROM t0 ORDER BY +a;
+} {1 9 2 9}
+
 finish_test