Merge in all recent changes from trunk, and especially the automatic index

enhancements.

FossilOrigin-Name: 0e1b73496f861bd497f92f1ead936b2d94aa52d5

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 3a2589ab469e2f8bd798fae3002b19db1d0b715f,e6ed1d11b81339771cfaa8eb2b842c2557ab156e..fa19de4da14c6117b7ea0207b4b6bfaa34626bd6
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Bring\sthe\sthreads\sbranch\sup-to-date\swith\sthe\s3.8.5\srelease.
- D 2014-06-05T13:22:52.195
 -C Prevent\san\sautomatic\sindex\sfrom\staking\sthe\splace\sof\sa\sdeclared\sindex.
 -D 2014-06-18T15:11:54.897
++C Merge\sin\sall\srecent\schanges\sfrom\strunk,\sand\sespecially\sthe\sautomatic\sindex\nenhancements.
++D 2014-06-18T15:18:12.521
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in de92112472618cb869d27249966bad1783e4a853
 -F Makefile.in ed5e4aae4799f724699d5509fac2977786414dbb
++F Makefile.in 0a3830965158ca1c9ec2998c9b95a1b052b0f378
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc f64754550a1272b7f840e8594a8b40c0b46792b4
 -F Makefile.msc b5ff082a24cd1e0694a0001891e13e3b56c8ef31
++F Makefile.msc 5c7513a1e829a33271d1469c6483d7150d6a64a9
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -143,8 -145,8 +145,8 @@@ F ext/rtree/tkt3363.test 142ab96eded44a
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F magic.txt f439556c5ce01ced70987e5ee86549a45165d9ff
- F main.mk df24b84a07746deb55dbec8ac62c849636c8049d
+ F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
 -F main.mk 0cb97ec3285474651736053ee741145ef8c5185f
++F main.mk ec69ae867a105e5dcae7acdeb7643ee368e45144
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -177,8 -179,8 +179,8 @@@ F src/delete.c bcf8f72126cea80fc3d5bc54
  F src/expr.c 4f9e497c66e2f25a4d139357a778c84d5713207c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
- F src/func.c 2e16316ec3a6365a0dc3e553c586f91b20f7f6c8
+ F src/func.c 3bc223ea36cd29a91c481485343d0ee4257ab8dc
 -F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
 +F src/global.c 77ec119d6f6453039c2820336af8e8f804f20acf
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
@@@ -205,8 -207,8 +207,8 @@@ F src/os.c 1b147e4cf7cc39e618115c14a086
  F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f
+ F src/os_unix.c 9a97268f1ea97ddea17f1c392f7c76197ac4cea9
 -F src/os_win.c 8dbf6c11780fe2eb96c1f289e664d0c7b2911d37
 +F src/os_win.c 5f8c5568cc749d6ab44006124e7701f463559223
  F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
  F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
@@@ -218,19 -220,19 +220,19 @@@ F src/pragma.c 810ef31ccfaa233201dcf100
  F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
  F src/printf.c af06f66927919730f03479fed6ae9854f73419f4
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
- F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
+ F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 -F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
 -F src/shell.c 058940e8a7198ea15ae90f60ffb0e2d67287b46c
 -F src/sqlite.h.in a98eb3e8c86c934ea6f5bcfc6b69653dde2f4ed4
 +F src/select.c 2657f35be771d14f56402e4aa8a7e26562415ae6
- F src/shell.c c431e19b27f89740ed37d73b11fe7d273dc3d411
++F src/shell.c 3ac174189f52b149a30b0021c4e8428c877d90d1
 +F src/sqlite.h.in faf9dadad407b0d5dd9e5bea26c021e1e31813b1
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h fccdc735c27b3dc12322fec7cdad8bc76be8d00b
 +F src/sqliteInt.h 00cd3cf7be9ea28b963773de165eeb800c94d17c
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
- F src/test1.c 79a39c0f32872fce62779b8a3030b7b41ad50a06
 -F src/test1.c 3c8bc491d2f8de5adbbf306533cefc343c733927
++F src/test1.c 74a6b2cc032e88543bf22c60f71173603761de66
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -282,20 -283,20 +284,20 @@@ F src/update.c 01564b3c430f6c7b0a35afaf
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
 -F src/vdbe.c 9bfe6becfc094382ae213656fbe511055ad83a54
 +F src/vdbe.c 1dff86d8a861b24a7636a2f586953ceb483b445f
  F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
 -F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
 +F src/vdbeInt.h c78ace64dc37495806dd50596eded1f6cd2b5a64
  F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3
 +F src/vdbeaux.c 44d4d1f5711f71eaf0d624de5c3e4976fe4e180b
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
 -F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
 +F src/vdbesort.c e2784e2e1f1819a55ce6f22c6ab22eca576ae6d8
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
- F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
+ F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c a7d59dd5d5bf6d6ab905fb549567a0a11376de25
+ F src/where.c 7b9e13cff91a2f14ac61e6a1bc3a83b5113e6298
  F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1178,7 -1179,8 +1184,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 416cb091267de91b9cadee9f7453b8627570b7d3 7123bb2605216396f65db5d156431b3613f313b5
- R d113ee04571f0b7cf0adf33015212cb5
 -P b500f2a09721b49c95a69c47a0205bc2375af2cd 4ece839d445ff578a449a339ab579a32e64c9d28
 -R 1a9a8498bcd344a9075e008919374ef9
 -T +closed 4ece839d445ff578a449a339ab579a32e64c9d28
++P e4b01676d7e7ac14f5120ca3a618cc34dbf5dab2 0a52bddd9db49b2b79fc24888b50023d0fe74f7b
++R 577e5bd1b61fe7b4ae68cf3df66c1682
  U drh
- Z f5daccd6a06b1139036d97ee038b8b45
 -Z c3c3ed7d30575f073ff51d887a334d78
++Z d5db82952ebf5e7f1ce903e5ad76fefc

diff --cc manifest.uuid
index 315b55c6e21d62b9167e2e6b76131c07897bd215,585f15924138be948827a2a3f2964203a3b70e40..c221d630f7d92efc8f738c7a34d5e07a9700360a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e4b01676d7e7ac14f5120ca3a618cc34dbf5dab2
 -0a52bddd9db49b2b79fc24888b50023d0fe74f7b
++0e1b73496f861bd497f92f1ead936b2d94aa52d5

diff --cc src/shell.c
Simple merge

diff --cc src/test1.c
Simple merge