Merge the pre-3.8.6 changes from trunk into the apple-osx branch.

FossilOrigin-Name: 08058df3af18d28c3fbd306527734f507c06f156

diff --cc manifest
index 689139e88b99953c6a994bfddb0fbe8ab981b9e2,a9e401b96b126ba207227926dc2ea907685b2a30..f8018cc7f5f56b34c4857fb3b9b3cc33a794a4ad
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\s3.8.6\sbeta\schanges\sin\sfrom\strunk.
- D 2014-08-06T01:51:19.484
 -C Fix\stypos\sin\scomments\sused\sto\shelp\sgenerate\sdocumentation.\s\sNo\schanges\sto\scode.
 -D 2014-08-14T13:06:25.245
++C Merge\sthe\spre-3.8.6\schanges\sfrom\strunk\sinto\sthe\sapple-osx\sbranch.
++D 2014-08-14T13:39:49.761
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in c1a047f376270fb6f201ca44640b43e690bc3db0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
@@@ -182,17 -179,17 +182,17 @@@ F src/delete.c bcf8f72126cea80fc3d5bc54
  F src/expr.c f749009cf4a8534efb5e0d5cd7c9fb1fb0f2836c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 8545f3b36da47473e10800ea4fb0810fd4062514
- F src/func.c fe7c04fe38ba36c83dea19f4a6d9b2697ad12637
 -F src/func.c bbb724b74ed96ca42675a7274646a71dd52bcda7
++F src/func.c 7a252bf7a52b4229462d2d89639d0f4f134dca40
  F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 991e4964e9295da3993e2c0f81c7faf642371848
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
- F src/legacy.c 17887cec559966b62ab3673a02c427338483b147
 -F src/legacy.c febc2a9e7ad6c1a6191c7b5b9170b325d263f343
++F src/legacy.c 3d9ac010a3170531ac459511f1b65822d39265c9
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c a7da7695351c02e3133dac77d4a84300e04e8872
 -F src/main.c 1cf92c5c6468f2b6ed99b638706781ccc9c60b42
++F src/main.c 57c02d6532a29609de214e753380444bf0625f32
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -210,28 -207,27 +210,28 @@@ 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 bc2bed8caed600bb76a0ab6573ae1bf3c303717f
- F src/os_win.c 6df6b5577c609a2d9312a3a2993099e5175e081f
 -F src/os_unix.c bd7df3094a60915c148517504c76df4fca24e542
 -F src/os_win.c 1c936c7b0659d0eb12b868e2cd710a570e78873e
++F src/os_unix.c cd50269688fd37b3ce0fe204b61e9be8ec2cfcc0
++F src/os_win.c 90d3fb97df7f5d5f52fae323337f7a3f1bee6c06
  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 d10ef67c4de79f78188b965b4b7988aff1d66f2e
 -F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
 +F src/pragma.c 0fc087e3b26808051805e147022d6e19603b9453
 +F src/prepare.c 954f80160f120ca715ffa5db5549c3262abb335e
  F src/printf.c af06f66927919730f03479fed6ae9854f73419f4
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
- F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
+ F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c c26fd6522829a0f9e9af248e9522c3365d370052
- F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
- F src/sqlite.h.in 7ada7e40ce547661b90230630af3bef1a862988a
- F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 -F src/select.c ea48e891406ccdf748f3eb02893e056d134a0fea
++F src/select.c 13588d2cb2b7193525185f1a040b85b5d50fc71d
+ F src/shell.c 75bb7bd2c80bb44861598f322a417c4bafe98fd7
 -F src/sqlite.h.in ed9d35990c61f0388ca6405706455c4095310553
++F src/sqlite.h.in bcae3b0cca0756a57e467500346cc6f2fa81d6c1
+ F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h 641f8fbb65ca2084c8df95b525f6f82c7a1e91ae
 +F src/sqliteInt.h e8916c78a36b88c6f00abd6783e5c76c622ac625
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -287,22 -283,22 +287,22 @@@ F src/update.c ea336ce7b8b3fc5e316ba8f0
  F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c bd3bc4d33347e87e14660be62cd746400e7edc1a
 -F src/vdbe.c f7f4066e4d6e3858878d76ce9288ea603e12ddf6
++F src/vdbe.c 91552c6f9799ad8dbb67686c5a1ff882b4899f31
  F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
  F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 -F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
 -F src/vdbeaux.c 25d62ef82cf1be2a1255eacac636fa0d943d8b3d
 +F src/vdbeapi.c 4606079c86aa9732b89b0ab6e16b6b776474a1cd
- F src/vdbeaux.c 34dcb2a012cc4acc7b59f3afa9606c6bb0e42538
++F src/vdbeaux.c 41a7b823f4537c07a12669fcae2094eeabcc253f
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
  F src/vdbesort.c f7f5563bf7d4695ca8f3203f3bf9de96d04ed0b3
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 -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 ce1b9a3a2573033cd15e0882719db7f211f21cdd
- F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
+ F src/where.c ab20f9c24a422ee8900831b343c3d1e5e7aca87b
+ F src/whereInt.h 923820bee9726033a501a08d2fc69b9c1ee4feb3
 -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
@@@ -615,12 -611,12 +615,12 @@@ F test/in4.test d2b38cba404bc4320f4fe1b
  F test/in5.test 99f9a40af01711b06d2d614ecfe96129f334fba3
  F test/incrblob.test e81846d214f3637622620fbde7cd526781cfe328
  F test/incrblob2.test bf4d549aa4a466d7fbe3e3a3693d3861263d5600
 -F test/incrblob3.test d8d036fde015d4a159cd3cbae9d29003b37227a4
 +F test/incrblob3.test 5fa6f2665ae37da05928bb16851d4f86515af78a
  F test/incrblob4.test f26502a5697893e5acea268c910f16478c2f0fab
- F test/incrblob_err.test d2562d2771ebffd4b3af89ef64c140dd44371597
+ F test/incrblob_err.test af1f12ba60d220c9752073ff2bda2ad59e88960d
  F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
  F test/incrvacuum.test d2a6ddf5e429720b5fe502766af747915ccf6c32
 -F test/incrvacuum2.test 379eeb8740b0ef60c372c439ad4cbea20b34bb9b
 +F test/incrvacuum2.test a1828b6165af6c248c4eb80aeaee2bcbb45768c1
  F test/incrvacuum3.test 75256fb1377e7c39ef2de62bfc42bbff67be295a
  F test/incrvacuum_ioerr.test 6ae2f783424e47a0033304808fe27789cf93e635
  F test/index.test 4d990005a67a36984e4f1a5f1bdccea8d08da4ee
@@@ -673,15 -669,14 +673,15 @@@ F test/lock.test 87af515b0c4cf928576d0f
  F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
  F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
  F test/lock4.test e175ae13865bc87680607563bafba21f31a26f12
 -F test/lock5.test 5ad6a1f536036ff1be915cfdd41481aeafda3273
 -F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
 +F test/lock5.test 71d0ba9cd23212b5ce1a433107c806203fa6d5f9
 +F test/lock6.test 83434ae8ca1d1c5e2eaf74d4e44aa24ab62b291c
  F test/lock7.test 49f1eaff1cdc491cc5dee3669f3c671d9f172431
  F test/lock_common.tcl 0c270b121d40959fa2f3add382200c27045b3d95
 +F test/lock_proxy.test 95be9c32d79be25cf643b4e41a0aa0e53aa21621
  F test/lookaside.test 93f07bac140c5bb1d49f3892d2684decafdc7af2
 -F test/main.test 39c4bb8a157f57298ed1659d6df89d9f35aaf2c8
 +F test/main.test 3991157c720c2b2b9ec27254d940f06ab81aab84
  F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
- F test/malloc.test fd368e31fe98d4779ed80442f311ed9f03bcd1f7
+ F test/malloc.test 4eb83876dfe4915766c179b687b8640437f14abf
  F test/malloc3.test e3b32c724b5a124b57cb0ed177f675249ad0c66a
  F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
  F test/malloc5.test fafce0aa9157060445cd1a56ad50fc79d82f28c3
@@@ -701,12 -696,13 +701,13 @@@ F test/mallocH.test 79b65aed612c9b3ed2d
  F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
  F test/mallocK.test 3cff7c0f64735f6883bacdd294e45a6ed5714817
- F test/malloc_common.tcl e0fbe63a9a0bb8c42fe8d3ebf502141f485acbc2
+ F test/mallocL.test 252ddc7eb4fbf75364eab17b938816085ff1fc17
 -F test/malloc_common.tcl 3663f9001ce3e29bbaa9677ffe15cd468e3ec7e3
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
++F test/malloc_common.tcl c34d5b7f337336a7f2e30a197f1cf2646dbe8e76
 +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
@@@ -1190,7 -1186,7 +1191,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 fa7912320fd92c957034164f51d993f86220cf36 717245d48714c08156c9b7636aaa6c3a402bad66
- R 13035e665b9a25b5fda627c7e765ea3f
 -P f5cce9db109a2bbe9a05b4c01b076a51d5fad8ba
 -R b4842944a4c3679f5b3af787e9b322df
++P b2e01080cce405de2bba7a5294001f9cc463a3c4 13a2d90a2869c53b79754de39045bbbdbc7688e3
++R db4ff9fa49b206f34cb01052bc7831eb
  U drh
- Z 9d38665213c2ce38d22f159bbbcce720
 -Z 52db703ea373cd617fd2c598672c0ab8
++Z 38e0ab5281238789a23f83493f5517d9

diff --cc manifest.uuid
index 5db7f1cd9dee30f4417ce9285e1fb768c9db3505,5d1e011162b95e63b0032a62820f40258101b571..8f472c8c1f63967dd47912c4b3d2dcf28a1b5d83
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b2e01080cce405de2bba7a5294001f9cc463a3c4
 -13a2d90a2869c53b79754de39045bbbdbc7688e3
++08058df3af18d28c3fbd306527734f507c06f156

diff --cc src/func.c
Simple merge

diff --cc src/legacy.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
index 221cef223798fe030e5ddcd91f10fab056555c4f,b1a0bedcff1d150dd2052e6b4a56128811728ccb..b2546bf7af5070bc0ac5e82a8be3ef01fbd055ae
--- 1/src/os_unix.c
--- 2/src/os_unix.c
+++ b/src/os_unix.c
@@@ -97,17 -94,11 +97,16 @@@
  #include <sys/time.h>
  #include <errno.h>
  #if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
- #include <sys/mman.h>
+ # include <sys/mman.h>
  #endif
  
- 
- #if SQLITE_ENABLE_LOCKING_STYLE
+ #if SQLITE_ENABLE_LOCKING_STYLE || OS_VXWORKS
  # include <sys/ioctl.h>
 +# include <uuid/uuid.h>
 +# if defined(__APPLE__) && ((__MAC_OS_X_VERSION_MIN_REQUIRED > 1050) || \
 +                            (__IPHONE_OS_VERSION_MIN_REQUIRED > 2000))
 +#  define HAVE_GETHOSTUUID 1
 +# endif
  # if OS_VXWORKS
  #  include <semaphore.h>
  #  include <limits.h>

diff --cc src/os_win.c
Simple merge

diff --cc src/select.c
Simple merge

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

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/malloc_common.tcl
Simple merge