Merge the latest trunk changes into the apple-osx branch.

FossilOrigin-Name: f426876fe1cc9ebcda5a52f823f417a4db358517

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 46969213041ba6dfa7437094de756f8c3e60eeb8,d5d65422e575fcc00e0730141cb1229b297ab9c3..5b437e88c15d00ce733d5342cecb3834b22f1394
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sin\sthe\s3.8.5\srelease\schanges\sand\sthe\sFTS\sintegrity-check\sfix.
- D 2014-06-05T12:53:41.995
 -C Bump\sthe\sversion\snumber\sto\s3.8.6.
 -D 2014-06-30T19:28:57.595
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2014-06-30T19:57:04.276
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 444faa7b5c5b3189fa674ff42be94d87a37eba9d
 -F Makefile.in 1732320ecac3fee229d560d7ef2afa34681d1815
++F Makefile.in 5f7edcf144aa5c76391cfbbfd8920ad3550191c6
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 52911c6bfeaf9b40f47ef4615ab66d98ab0f2b3d
+ F Makefile.msc ad60c4d8be35f98fdcca614088b84a91612b2b4c
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
- F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
+ F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -141,13 -143,10 +143,13 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 83349d519fe5f518b3ea025d18dd1fe51b1684bd
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F magic.txt f439556c5ce01ced70987e5ee86549a45165d9ff
- F main.mk 8400550fd8065095031ba4ecadf355d184a81282
+ F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
 -F main.mk 7850d834ca7f3c772e2b0087631868d5bfdeabb9
++F main.mk 3d2a20e762126e4f0922c15ae8cc8690996f0c03
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -177,20 -176,20 +179,20 @@@ F src/complete.c dc1d136c0feee03c2f7550
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
  F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
- F src/expr.c 4f9e497c66e2f25a4d139357a778c84d5713207c
+ F src/expr.c 40d06d1543b1355aa02efa9666178f7642a96ed6
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
- F src/func.c 6ace0c0c0d5f0a23273a0c74b35b5f41113f09eb
 -F src/func.c 3bc223ea36cd29a91c481485343d0ee4257ab8dc
++F src/func.c fe7c04fe38ba36c83dea19f4a6d9b2697ad12637
  F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c a038daeadfb818aaadafa854f40f5623b6929d84
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
 +F src/legacy.c 17887cec559966b62ab3673a02c427338483b147
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c a0c13683598252e3d5edda0459e972cd52616b0b
 -F src/main.c 7c2c3cafdd6313c8f9319ebec1565782e624372e
++F src/main.c 7f7d3acc1e1a9803f85f4720fc06f327a6ebf1b1
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -208,33 -207,32 +210,33 @@@ F src/os.c 25df79baf4bec87f75a2c4e995d6
  F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 6a54dad9ffb25faaa81604a3eebedeb04da9b639
 -F src/os_unix.c a7baf1b30f3c58ba20b813e01aab23b18ae44f85
 -F src/os_win.c 8dbf6c11780fe2eb96c1f289e664d0c7b2911d37
++F src/os_unix.c bc2bed8caed600bb76a0ab6573ae1bf3c303717f
 +F src/os_win.c 43b075157eb17440a1813a14332fc8623d7c4554
  F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
 -F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
 -F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 +F src/pager.c d878c40eb8c75e9ae79b00cc80ad9710679f9a31
 +F src/pager.h 8feb18f845951ab37e1f65a319b2da24185173ac
  F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
  F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c
 -F src/pragma.c 810ef31ccfaa233201dcf100637a9777cc24e897
 -F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
 +F src/pragma.c 039578fb7d7cad90a5a2269651ad3b1ad98451cc
 +F src/prepare.c 954f80160f120ca715ffa5db5549c3262abb335e
  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/select.c a34db38f97bd8fe768d0bd9315397457c98be185
- F src/shell.c 98ce7f52445aa0c2eac3d4553a4cdcbb6402a670
+ F src/shell.c 56de2dfa3f25def4bf03098f7e2256fbb42f6e3c
 -F src/sqlite.h.in a98eb3e8c86c934ea6f5bcfc6b69653dde2f4ed4
 +F src/sqlite.h.in 69c7d92c615945a7053cb899c6ae6a6a0fc36cca
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 6b40bb90f547ef70d78cf43d9d1b4e5656e9eb1b
 -F src/sqliteInt.h e88614d7371b80ff69dbbb5e4b9813ee93dfd890
++F src/sqliteInt.h d8e721af078ab712d920823b5bac9ffea62481c7
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
- F src/test1.c f9d10a5bab1eb1b10f6f5049b68a2662a8986b6d
 -F src/test1.c 3c8bc491d2f8de5adbbf306533cefc343c733927
++F src/test1.c 1702277fbc7ae104ffd4ccd657b8282be5ebce4c
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -282,25 -280,25 +284,25 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
  F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
  F src/update.c 01564b3c430f6c7b0a35afaf7aba7987206fa3a5
- F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
+ F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
 -F src/vdbe.c 9bfe6becfc094382ae213656fbe511055ad83a54
 +F src/vdbe.c 9156499280d12b1afec8c59ef05ace8593295639
- F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
- F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
+ F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
+ F src/vdbeInt.h 5df5e9afe9b7839cd17256220fc4f7af84b8b1cd
 -F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c 8ce7dcdbb8c59e5c2194518ce3099b254ae94c15
 +F src/vdbeapi.c 32a443608642a93b77ca4b13e42e2a4d7b0fc123
- F src/vdbeaux.c a82cfad30a3b4c1758c28dcee2b4fc20a70cd121
++F src/vdbeaux.c f587cb9d1a20ddbd678723f0e386d4b18d6e22af
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
- F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
+ F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
  F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
- F src/wal.c 29854e652a9d7dc0d7a87ff1a9dbffac0aaf2e16
 -F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
++F src/wal.c 785b8a1fdd5600f2265b57691708329cae9acbad
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c a7d59dd5d5bf6d6ab905fb549567a0a11376de25
+ F src/where.c 6ff6f7e3b272fad66eea601af489777adea3cc1f
  F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -468,7 -468,8 +472,8 @@@ F test/exclusive2.test 32798111aae78a5d
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/exists.test 8f7b27b61c2fbe5822f0a1f899c715d14e416e30
  F test/expr.test 67c9fd6f8f829e239dc8b0f4a08a73c08b09196d
 -F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
+ F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
 +F test/fallocate.test fe52076a43ff99da8411990dbb4f374e81e88c85
  F test/filectrl.test 14fa712e42c4cb791e09dfd58a6a03efb47ef13a
  F test/filefmt.test cb34663f126cbc2d358af552dcaf5c72769b0146
  F test/fkey1.test e1d1fa84cde579185ea01358436839703e415a5b
@@@ -693,13 -693,13 +698,13 @@@ F test/mallocG.test 0ff91b65c50bdaba680
  F test/mallocH.test 79b65aed612c9b3ed2dcdaa727c85895fd1bfbdb
  F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
- F test/mallocK.test d79968641d1b70d88f6c01bdb9a7eb4a55582cc9
+ F test/mallocK.test 3cff7c0f64735f6883bacdd294e45a6ed5714817
 -F test/malloc_common.tcl 58e54229c4132ef882a11fab6419ec4cd3073589
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 +F test/malloc_common.tcl e0fbe63a9a0bb8c42fe8d3ebf502141f485acbc2
 +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 -F test/memdb.test fcb5297b321b562084fc79d64d5a12a1cd2b639b
 +F test/memdb.test da09b7f354f3dc0b74d992f5451ae03ebfb36920
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 -F test/memsubsys1.test f97cfd0b30e85c2f1ed16d642e7ac58006be84b2
 +F test/memsubsys1.test 04b6c76f91070bbb7cb8713cd51882d6e49f7530
  F test/memsubsys2.test 3a1c1a9de48e5726faa85108b02459fae8cb9ee9
  F test/minmax.test 42fbad0e81afaa6e0de41c960329f2b2c3526efd
  F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
@@@ -822,10 -822,10 +827,10 @@@ F test/shell1.test fb080d67c81e8a80a79e
  F test/shell2.test c57da3a381c099b02c813ba156298d5c2f5c93a3
  F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
  F test/shell4.test 8a9c08976291e6c6c808b4d718f4a8b299f339f5
- F test/shell5.test 6b1a53c49a4ff5c3bd0bad17a85ecba505608278
+ F test/shell5.test ef0c52952a4a96dc1d9ec3b1fa81ec897ca48154
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
 -F test/shrink.test 8c70f62b6e8eb4d54533de6d65bd06b1b9a17868
 +F test/shrink.test 41ab166b276af4812bcaf6f1b99c53fab4e706d0
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
  F test/skipscan1.test 28c7faa41a0d7265040ecb0a0abd90c0904270b2
  F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
@@@ -1178,7 -1182,7 +1187,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 b9fad4490c437a2c49cf86cc1c068433d6d2866b 7123bb2605216396f65db5d156431b3613f313b5
- R 2d60ed1c1f6422e4ada671a141ef9856
 -P d09ca6d5efad3e4cfa93a4dc711e6ba6079d4b4b
 -R 0b9fd011a99704759c36a48aebd29593
++P 2dbdfa51703bade30b66730191e4fb286edc500b f925e9baafea625f63105f8013abb3807b418379
++R f06a12db9c201ac4c82078210e92693a
  U drh
- Z ae31fcbcc5589199902d82aecc34d93c
 -Z 99f7c1257c18120424d63d4c4b9a073c
++Z c4e674b581a44b3ada94d9205edf2bc3

diff --cc manifest.uuid
index 5470adcc1a684ac1c8b4e1abcd74085cffb44ba8,708593f343348243d3958667794f0014fea6a807..511ad66731205acb44d11e4bda064e0168fc5aa1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2dbdfa51703bade30b66730191e4fb286edc500b
 -f925e9baafea625f63105f8013abb3807b418379
++f426876fe1cc9ebcda5a52f823f417a4db358517

diff --cc src/func.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wal.c
Simple merge