Merge the skip-scan optimization into the sessions branch.

FossilOrigin-Name: 7596d1bf8040f7cefc7b22c5e609acc5d66820bf

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 1df6ff0fe4af746dcc353514d9b5c33e86ce471f,efb3c6127d30c97b9c635ba2fc4006432fbc9d47..1659cb588098e520c8a63c5dddfcda1f98407c57
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Import\srecent\sbug\sfixes\sfrom\strunk.
- D 2013-11-12T15:39:01.279
 -C Simplification\sto\sthe\sprogress\scallback\scheck.\sOn\sbranch\sremoved.
 -D 2013-11-14T00:09:48.126
++C Merge\sthe\sskip-scan\soptimization\sinto\sthe\ssessions\sbranch.
++D 2013-11-14T19:18:39.185
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in bb787d5227c6aa95915ff04e9634a0a469297ea4
 -F Makefile.in 8a07bebafbfda0eb67728f4bd15a36201662d1a1
++F Makefile.in 0c169e6029407371c6951ae77f96049990eb522d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc ec33274b488575929601e26d7e815e340ded812c
 -F Makefile.msc 19243469fcd1073319ea5b7db97609c1cfb3b1c0
++F Makefile.msc cd32b587a359ab6d87f3e6ff84168c79b8d97aba
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 52f7e22bfcec71a462e34194b4ae1671380fde59
@@@ -156,7 -142,7 +156,7 @@@ F ext/session/test_session.c d38968307c
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt f439556c5ce01ced70987e5ee86549a45165d9ff
- F main.mk 384a11414a17c25a5df667174050ec50181f46a9
 -F main.mk f57b51e64f50e9924b3f14df3c2e8b66893a8ce5
++F main.mk df62cb5cde201a3efacba236fdb74432863554f6
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh d2a981497b404d6498f5ff3e3b1f3816bdfcb338
@@@ -202,10 -188,10 +202,10 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
 -F src/main.c 32bf1e6e164a6fa0ddf1bf2616c6eafbefd6e9b0
 +F src/main.c d802034d4a145e440b651dc67c590355f41c64b5
  F src/malloc.c 543a8eb5508eaf4cadf55a9b503379eba2088128
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
+ F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
  F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c 0025308a93838022bd5696cf9627ff4e40b19918
@@@ -234,11 -220,11 +234,11 @@@ F src/random.c 0b2dbc37fdfbfa6bd455b091
  F src/resolve.c fc4673cc49b116e51e7f12de074c0acf8f2388f9
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 7317406831ecced390edba972818f3c5f82238c0
- F src/shell.c 03d8d9b4052430343ff30d646334621f980f1202
+ F src/shell.c 6ccc22b717afe4f6d7d3c8b6baa02e3b99a5fdf0
 -F src/sqlite.h.in 4dedcab5b32358bf7a596badffe7363be1f1a82d
 +F src/sqlite.h.in 7bdef2ad0d798aa6bdeb5408493e9da62e3083d3
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 4d218f4480af7672cff22bb4ef589410f5415f68
 -F src/sqliteInt.h 2ec1d71220307fa5ee85a918a6240cf0b4635b0e
++F src/sqliteInt.h a14cf06840ecc21f272b56f72d717cd2d55b5662
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -294,12 -280,12 +294,12 @@@ F src/update.c faee30d7aa32a1196b9eb751
  F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
  F src/util.c 2fa6c821d28bbdbeec1b2a7b091a281c9ef8f918
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 8b6b4fcea067e9ea3736538378765098018284f8
- F src/vdbe.h c7aa561dea0070486c49a3aab6d550bb84728bda
- F src/vdbeInt.h fe226d7290e8c1eb2d334dadfeb3f3285b3f2d14
 -F src/vdbe.c f9a4e08114f97e453a5f13a62c31a357301137cc
 -F src/vdbe.h c06f0813f853566457ce9cfb1a4a4bc39a5da644
 -F src/vdbeInt.h 62eb680327011f3a4b0336642b0ca9d6ecc6eb91
 -F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed
 -F src/vdbeaux.c dd0f6ab9dc159911facfc0a7a2164af44779bdda
 -F src/vdbeblob.c ff60adf2953e0ffc1d59541b3101c9886b03a3de
++F src/vdbe.c b1939060ddf3ff9039dd2c6896ed79f4e51e103a
++F src/vdbe.h b7bfa7b468fcad2cf1890969fe7459325da00385
++F src/vdbeInt.h 40461ecbac26fa15160320e45a38dc935058e752
 +F src/vdbeapi.c 8ade912f7023a3b35ee64497a94718ddbd7269c3
- F src/vdbeaux.c f2905bb192c946ee0e223b5eca9411592eaa7976
++F src/vdbeaux.c eade21d57ce118e433bbdc0ac9ff06c75cdb7675
 +F src/vdbeblob.c 0ab871fa7466efaef05877f06d650f0f7401cbe0
  F src/vdbemem.c cc529bbf4f13e4e181bdb446bf6e6962ab030b4b
  F src/vdbesort.c 9d83601f9d6243fe70dd0169a2820c5ddfd48147
  F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
@@@ -745,7 -733,7 +747,7 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test 08dbc6b0f4afbdffd701346ffae2998bb612c335
 -F test/permutations.test af3278cbea3a19e025d5169be8193ff48dc3f862
++F test/permutations.test 79927c8175c4dc889f30486388490dae229b3b11
  F test/pragma.test e882183ecd21d064cec5c7aaea174fbd36293429
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -848,7 -836,7 +851,7 @@@ F test/tclsqlite.test a7308276aad2e6c0b
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 0a48d94222d50e6e50d72ac103606c4f8e7cbb81
- F test/tester.tcl 1da66c6775f76be7dda05007125af7f79b815d9d
 -F test/tester.tcl bce6b929932498383ce92431da6a96432c690bf7
++F test/tester.tcl a0f63e910f954acd367a5951e3a4f3ef9c32067a
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1118,11 -1106,11 +1121,11 @@@ F tool/logest.c 7ad625cac3d54012b27d468
  F tool/mkautoconfamal.sh f8d8dbf7d62f409ebed5134998bf5b51d7266383
  F tool/mkkeywordhash.c 189d76644e373c7d0864c628deb8ce7b4f403591
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 17d40faae6c4b865633bfc5763821402a1cbefc3
+ F tool/mkpragmatab.tcl 78a77b2c554d534c6f2dc903130186ed15715460
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
- F tool/mksqlite3c.tcl cfc3838294137f89be9abe05fcc967524f1a2618
 -F tool/mksqlite3c.tcl e2ba20d3f690990079d17f3e5a7417dfb7ada543
 -F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
++F tool/mksqlite3c.tcl 5b63710413fa8604cdb1af8562b4fbf934870d45
 +F tool/mksqlite3h.tcl 2d0f1b3768f8d000b7881217d5fd4c776eb27467
  F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
  F tool/mkvsix.tcl 6477fb9dab838b7eea1eed50658ff1cda04850b5
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1151,7 -1139,7 +1154,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 129e2b69178147d04ee27fce66c17b39f8654da3 0f924c6ef6cf2ac5a61aafa8dd8e3309b3970499
- R 62e8cb7022fe8084fd35a1524fde4875
 -P 21f59b04f74738d08ebad693646bbaea24dc45ef
 -R 5afe90b6493eb21de1d0af561cfa69c0
++P 20eeee4cd34a9bffe6bf65962126ddf8ca04eb3e 24ef16548eebcdb9d8b40308f6a16dabf8f8d474
++R 7c88b1c3df374bef8148611e14f79210
  U drh
- Z 1a520bb92f053e22297ab0364aa517fb
 -Z d0339b99c91e151f95c1864799fb36e8
++Z 1904213259af66fd28163fe87df8620f

diff --cc manifest.uuid
index 4f58009d9b01bc0cb095489057892bf7047531bc,56997654db69ab23859b12e05771b49495e9ae06..bd2ba610ddab38560d1368c4f7b259a593d291c8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 20eeee4cd34a9bffe6bf65962126ddf8ca04eb3e
 -24ef16548eebcdb9d8b40308f6a16dabf8f8d474
++7596d1bf8040f7cefc7b22c5e609acc5d66820bf

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge