Avoid an extra seek when inserting records into the epheremal index used to ensure...

FossilOrigin-Name: 72c4b3f07a3faacb5b62d5bc374b4e125a0bd8b3

diff --git a/manifest b/manifest
index 54180510339f6fe579d36fedd877df7de3c471de..0452c399e9c054f8d4b67bbed9278021701b1c1c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings.
-D 2014-01-22T18:31:27.905
+C Avoid\san\sextra\sseek\swhen\sinserting\srecords\sinto\sthe\sepheremal\sindex\sused\sto\sensure\sthat\srows\sreturned\sby\sUNION\srecursive\squeries\sare\sunique.
+D 2014-01-22T19:23:30.685
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -219,7 +219,7 @@ F src/printf.c 85d07756e45d7496d19439dcae3e6e9e0090f269
 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
-F src/select.c a4ac380e9c07135b4613f9021c93e9252a1586d8
+F src/select.c 93764e0d81946c070e2c7f1127f35e21efabbcc3
 F src/shell.c 24722d24d4ea8ca93db35e44db7308de786767ca
 F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
@@ -1152,7 +1152,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P b6cea42006910d590373e8f9e296d7672edb114b
-R 1ba001345e8bb7e9c10a92447c5b79e1
-U drh
-Z 3fb7fa817c3bd22cb870eb237b846ff7
+P dea2ca6a159d5dcfd8deceedf1c2a73fb4ac1cfc
+R 94fca679783d65c2e2622ed1059ebe94
+U dan
+Z f354f4f3e5d1356fcb7db559f2782a7e

diff --git a/manifest.uuid b/manifest.uuid
index ef71cf8a80838b269e9efd1bf89b66fe41e47eaf..93493f97ebd08be6321447773a558ac6aeb9f341 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dea2ca6a159d5dcfd8deceedf1c2a73fb4ac1cfc
\ No newline at end of file
+72c4b3f07a3faacb5b62d5bc374b4e125a0bd8b3
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 0fb1cf8362c3ac0719f79d0d340ec2e2baf2eed3..98ed526e08ef711cf62cb6b9a45bb6f9b74366f1 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -814,6 +814,7 @@ static void selectInnerLoop(
         ** been added */
         addrTest = sqlite3VdbeAddOp4Int(v, OP_Found, iParm+1, 0, r3, 0);
         sqlite3VdbeAddOp2(v, OP_IdxInsert, iParm+1, r3);
+        sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT);
       }
       for(i=0; i<nKey; i++){
         sqlite3VdbeAddOp2(v, OP_SCopy,