Merge in the latest trunk changes, including partial indexes, the MAX_PATH

fix in os_win.c, and the sqlite3_cancel_auto_extension() API.

FossilOrigin-Name: 7e1acb390770d1bd189fac7a3a7f96106f96e3a4

diff --cc Makefile.msc
index 8ec9cf5b05feba6abc1a0ddf58edcc6df970ac42,23c5b17f086588be0a95c25b57453748ede69b6e..71fb5bdd07732c79145a3e97b1db1489eb4510ff
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -489,12 -485,11 +489,12 @@@ LIBOBJS0 = vdbe.lo parse.lo alter.lo an
           memjournal.lo \
           mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
           notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
-          pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
+          pager.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
 -         random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
 +         random.lo resolve.lo rowset.lo rtree.lo \
 +         sqlite3session.lo select.lo status.lo \
           table.lo tokenize.lo trigger.lo \
           update.lo util.lo vacuum.lo \
-          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
+          vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
           vdbetrace.lo wal.lo walker.lo where.lo utf.lo vtab.lo
  
  # Object files for the amalgamation.

diff --cc main.mk
Simple merge

diff --cc manifest
index 6a85c4db62511611717aca70cf9963fa10a17d62,0bcd68c98d1861c32643570d689dc047d849e935..e61876303286cbad74c0ca821e8a33f6013629a4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\strunk\schanges\s(such\sas\sthe\squery_only\sPRAGMA,\sthe\ndefer_foreign_keys\sPRAGMA,\sand\sthe\sSQLITE_DBSTATUS_DEFERRED_FKS\sparameter\nto\ssqlite3_db_status())\sinto\sthe\ssessions\sbranch.
- D 2013-07-11T15:31:57.120
 -C Add\sNEVER()\sand\sALWAYS()\smacros\son\ssome\sunreachable\syet\sprudent\sbranches.
 -D 2013-08-02T20:11:19.665
++C Merge\sin\sthe\slatest\strunk\schanges,\sincluding\spartial\sindexes,\sthe\sMAX_PATH\nfix\sin\sos_win.c,\sand\sthe\ssqlite3_cancel_auto_extension()\sAPI.
++D 2013-08-02T20:44:48.965
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 +F Makefile.in aff38bc64c582dd147f18739532198372587b0f0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc ea294496193d9ed30137730b42ec2fc07ca5f544
 -F Makefile.msc e9f41f89111627baaabd95cab4988b8d1c3e47c9
++F Makefile.msc e5cc521bbc9fb09f032f7fef563542da7ac5544a
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION f135b651727f978b7191bd6fa12c7fc1e13e13ac
@@@ -152,7 -139,7 +152,7 @@@ F ext/session/test_session.c 12053e9190
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt f2b23a6bde8f1c6e86b957e4d94eab0add520b0d
- F main.mk f045701c66fec66208bc35d79de372340916e81e
 -F main.mk a10f1925ae3bb545a045d1f1867506f49bee972f
++F main.mk 332db7908f776f4f31da6f83228b0703673eb394
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh d2a981497b404d6498f5ff3e3b1f3816bdfcb338
@@@ -184,8 -171,8 +184,8 @@@ F src/callback.c d7e46f40c3cf53c43550b7
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c 39a770e9729b1acd2de347f8f614584841d0083e
- F src/expr.c 2b47ae9da6c9f34eff6736962ea2e102c6c4a755
 -F src/delete.c 2317c814866d9aa71fea16b3faf4fdd4d6a49b94
++F src/delete.c 30ed4bc76a1a32c55bf17ac1528c5867aa5502c0
+ F src/expr.c 2068a7c17e45f8bee6e44205b059aa30acbc71c5
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb
  F src/func.c 5c50c1ea31fd864b0fe921fe1a8d4c55acd609ef
@@@ -193,12 -180,12 +193,12 @@@ F src/global.c 5caf4deab621abb45b4c607a
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 02f8a1867088cb654eb756f98389f10441a65216
 -F src/insert.c a66bcdc956145369c1a876709f47f69476973e15
++F src/insert.c 54ec6fd4d3d08438f4d9a6b87ca422de94501d37
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
- F src/loadext.c c48f7f3f170e502fe0cc20748e03c6e0b5a016c2
- F src/main.c e974ea9db6214a5f7cb4c1765b49d3aba1e3409f
+ F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
 -F src/main.c b2592b4119f9b34d20861d1a73a44f07d061508c
++F src/main.c e3ce4cb4a9d0634ce74b9711bd800405ae470954
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -223,18 -210,18 +223,18 @@@ F src/parse.y 599bc6338f3a6a7e1d656669a
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c d23d07716de96c7c0c2503ec5051a4384c3fb938
- F src/pragma.c 2790c5175bc3f95d2a0cf39283d144b9b012fec7
- F src/prepare.c 2306be166bbeddf454e18bf8b21dba8388d05328
+ F src/pragma.c 590c75750d93ec5a1f903e4bb0dc6d2a0845bf8b
+ F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
  F src/printf.c 41c49dac366a3a411190001a8ab495fa8887974e
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 89f9003e8316ee3a172795459efc2a0274e1d5a8
+ F src/resolve.c 17e670996729ac41aadf6a31f57b4e6f29b3d819
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 91b62654caf8dfe292fb8882715e575d34ad3874
- F src/shell.c c8cd06e6b66250a3ea0149c4edec30de14f57b6f
- F src/sqlite.h.in 17c84f6a2296a33a16141f4cff4b176278f3d1cc
+ F src/select.c 20369c82dc38eb4a77b458c8f6e353ef550580c9
+ F src/shell.c 52f975eae87c8338c4dfbf4c2842d2a0971f01fd
 -F src/sqlite.h.in 442c109e0c3447c34b1794971ecdb673ce08a843
++F src/sqlite.h.in 9dbc04c103f297d2bd26c7e323f0bdb9aaf0dc8a
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h b25c57bb70c098aa05548ecde1948f4106cba472
 -F src/sqliteInt.h 7c6ad474ce49ed18393c027be65c9532b7c9168f
++F src/sqliteInt.h 717511de3ce0129f9e02f98427b6a5991bbe64e4
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -249,10 -236,10 +249,10 @@@ F src/test7.c 126b886b53f0358b92aba9b81
  F src/test8.c 7ee77ea522ae34aa691dfe407139dec80d4fc039
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
- F src/test_autoext.c 5c95b5d435eaa09d6c0e7d90371c5ca8cd567701
+ F src/test_autoext.c 32cff3d01cdd3202486e623c3f8103ed04cb57fa
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
  F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
 -F src/test_config.c 95bb33e9dcaa340a296c0bf0e0ba3d1a1c8004c0
 +F src/test_config.c 6b614c603cb4db1c996f1b192ca0a46ef0d152cd
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c 8f786bfd0ad48030cf2a06fb1f050e9c60a150d7
@@@ -286,16 -273,16 +286,16 @@@ F src/test_vfstrace.c 34b544e80ba7fb77b
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c e0e8fd3cb90a88451f6b6425726c84747b6b20d7
  F src/trigger.c 5c0ea9b8755e7c5e1a700f3e27ac4f8d92dd221e
- F src/update.c 19daebf6a0a67af5524913e93498d08388792128
 -F src/update.c 7f3fe64d8f3b44c44a1eac293f0f85f87c355b7a
++F src/update.c e3668141dd9701023681239265e001388f182236
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
  F src/vacuum.c d9c5759f4c5a438bb43c2086f72c5d2edabc36c8
- F src/vdbe.c 4a9d00a91da42f6540203fc4e694235fd21347c9
- F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
- F src/vdbeInt.h 11feb11eb49d8b312741011d30d91c9c50b59de0
- F src/vdbeapi.c bca51b6ea254af3a1bbfd2a58522f6d6db214334
- F src/vdbeaux.c 35846cedd64e90b83f498786775c69c2c6b6c8b1
 -F src/vdbe.c d6048a720c197db2f0e7d618e918bd2e2eff0322
 -F src/vdbe.h 4f554b5627f26710c4c36d919110a3fc611ca5c4
 -F src/vdbeInt.h e9b7c6b165a31a4715c5aa97223d20d265515231
 -F src/vdbeapi.c 4d13580bd058b39623e8fcfc233b7df4b8191e8b
 -F src/vdbeaux.c 4389b3692969b4415fcfd00de36818a02f84df28
 -F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
++F src/vdbe.c 619306bc26158896392c84eb3c593e9bff35c49a
++F src/vdbe.h 7aa3ab6210a68471c8490dedfc9aa4ef5684b9a0
++F src/vdbeInt.h cc1974b94efa98ecaec6fa14a2584d7c1e82eadf
++F src/vdbeapi.c c8c433043d14b5e00e2ed6f7e44543bcc92d1594
++F src/vdbeaux.c ef37cae69147a3680f6b1927b99f79a89c8ff53c
 +F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642
  F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
  F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
  F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
@@@ -1117,7 -1105,7 +1119,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P d39e65fe702a2e11477f2d996f77404f45763368 6557c407983b067449deb76bc4c5248de64e07dc
- R a7fbb947af42ffbd616de92443f86cbe
 -P 478113f18b1d28606b107b5a0bed04cb90a82cf2
 -R 0448265d2d2404edbe8ef2a70f660350
++P 8dfc0b78c38e519b64a796243ff7c0aff688ff36 c5c0a8ab6c222185d5f9d4321e64d9f93cd36b7d
++R 6bd6d033a187336743a83e4c58485278
  U drh
- Z a9673e579f51d102bcb297135146bef6
 -Z 563793828301249458f36eed7f3789e7
++Z 807175c2ca92264cb8fa0f2650b5caad

diff --cc manifest.uuid
index 8073d518def65cbf67a3181cdf1dc1cc01efd37a,06ed0f16cf1217efd4e310d132d33db7a4107e13..e2f6ff0beab801fd6367b285e9e2c62037de1211
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8dfc0b78c38e519b64a796243ff7c0aff688ff36
 -c5c0a8ab6c222185d5f9d4321e64d9f93cd36b7d
++7e1acb390770d1bd189fac7a3a7f96106f96e3a4

diff --cc src/delete.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/update.c
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/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge