Merge 3.8.6 beta changes in from trunk.

FossilOrigin-Name: b2e01080cce405de2bba7a5294001f9cc463a3c4

diff --cc manifest
index b52fc257c4a016d63ceaf45a7a1ccf71383b46f2,a945d8dafc22e55deb90177a8a81ca9cf8597122..689139e88b99953c6a994bfddb0fbe8ab981b9e2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sin\sthe\sCREATE\sUNIQUE\sINDEX\sfix\sof\sticket\s[9a6daf340df99ba93c53bcf].
- D 2014-07-30T14:57:00.800
 -C Fix\stypos\sin\sthe\sopcode\sdocumentation.\s\sComment\schanges\sonly.\s\sNo\schanges\nto\scode.
 -D 2014-08-06T01:08:07.269
++C Merge\s3.8.6\sbeta\schanges\sin\sfrom\strunk.
++D 2014-08-06T01:51:19.484
  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
@@@ -170,29 -167,29 +170,29 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c ab2fad23fdbcdc3cdc6e687a9c62535e91eec263
 -F src/btree.c 99d162e57af6e72ffd7db5bf79568a134cd87d5b
++F src/btree.c cc753a6219d420e15f776905fdbbf8abd8b42e14
  F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
- F src/build.c 7ba21d8f0f5f1e8b5a0ed21aab9be2b39d1af516
- F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
+ F src/build.c 5abf794fe8a605f2005b422e98a3cedad9b9ef5b
+ F src/callback.c fcff28cf0df2403dd2f313bb8d1b8f31f6f3cd64
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
  F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
- F src/expr.c b989d07fc7c8780fff77365a4fc59881223e340c
+ F src/expr.c f749009cf4a8534efb5e0d5cd7c9fb1fb0f2836c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
+ F src/fkey.c 8545f3b36da47473e10800ea4fb0810fd4062514
 -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/insert.c 991e4964e9295da3993e2c0f81c7faf642371848
  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 bbf7f993843fc3fc496089747f6849272d77e824
 +F src/main.c a7da7695351c02e3133dac77d4a84300e04e8872
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -200,43 -197,42 +200,43 @@@ F src/mem2.c dce31758da87ec2cfa52ba4c5d
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c 74670012946c4adc8a6ad84d03acc80959c3e529
  F src/memjournal.c 0683aac6cab6ec2b5374c0db37c0deb2436a3785
- F src/mutex.c d3b66a569368015e0fcb1ac15f81c119f504d3bc
+ F src/mutex.c 84a073c9a23a8d7bdd2ea832522d1730df18812c
  F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
- F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
- F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
- F src/mutex_w32.c 45020ed78735a202ff14efcf19415d29f556f16d
+ F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1
+ F src/mutex_unix.c 1b10d5413dfc794364a8adf3eb3a192926b43fa3
+ F src/mutex_w32.c c50939b72368f1cfbddb58520372081a50558548
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 -F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 +F src/os.c 25df79baf4bec87f75a2c4e995d63361b66b918a
  F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c a7baf1b30f3c58ba20b813e01aab23b18ae44f85
 -F src/os_win.c e5f0fc446a682b70db3397d14cca9806d9a15d12
 +F src/os_unix.c bc2bed8caed600bb76a0ab6573ae1bf3c303717f
- F src/os_win.c 1414edcad576a39d323bab41019b872d5b1b666f
++F src/os_win.c 6df6b5577c609a2d9312a3a2993099e5175e081f
  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 b7758ec0bae1223155f4ccec295754f3922ce9d5
 -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/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c a34db38f97bd8fe768d0bd9315397457c98be185
 -F src/select.c 1529c49075464c5a95fde77314073612b1b8d595
++F src/select.c c26fd6522829a0f9e9af248e9522c3365d370052
  F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
- F src/sqlite.h.in 7ffe000f2b798a634d9fdb6092e053aca8d7079a
 -F src/sqlite.h.in 9bbc5815c73b0e77e68b5275481a5e3e7814a804
++F src/sqlite.h.in 7ada7e40ce547661b90230630af3bef1a862988a
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h cf62c8e9af197a3962d121230daade650e478f9a
 -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
  F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
- F src/test1.c 1702277fbc7ae104ffd4ccd657b8282be5ebce4c
 -F src/test1.c 14409a611e9c27c6c522c610bbff5561f05c1558
++F src/test1.c c0fb8033b1a2cf1de32bf02ed73bd7f99bbf162e
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -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 4faacd47f8dae8c950367f25e50da70efa103a34
 -F src/vdbe.c 2db817cf7c51fa775ecc68160352aefc3d9870f7
++F src/vdbe.c bd3bc4d33347e87e14660be62cd746400e7edc1a
  F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
  F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 -F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
 -F src/vdbeaux.c ac063f36c929f88bf6cecdbcc413000e272265bb
 +F src/vdbeapi.c 4606079c86aa9732b89b0ab6e16b6b776474a1cd
 +F src/vdbeaux.c 34dcb2a012cc4acc7b59f3afa9606c6bb0e42538
  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 4dfcd80380d154be434c4b51e890e17ce9754b3e
+ F src/where.c ce1b9a3a2573033cd15e0882719db7f211f21cdd
  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
@@@ -724,7 -719,7 +724,7 @@@ F test/mmap1.test 93d167b328255cbe6679f
  F test/mmap2.test 9d6dd9ddb4ad2379f29cc78f38ce1e63ed418022
  F test/mmap3.test c92273e16eb8d23c1d55c9815b446bb72ef0512e
  F test/mmapfault.test d4c9eff9cd8c2dc14bc43e71e042f175b0a26fe3
- F test/multiplex.test 85a4be2b23e7294d468b6e3a578ec00020723bee
 -F test/multiplex.test efd015ca0b5b4a57dc9535b8feb1273eebeadb60
++F test/multiplex.test 2ed4db53c3304b7eb7b8744206ee9271799a32eb
  F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a
  F test/multiplex3.test d228f59eac91839a977eac19f21d053f03e4d101
  F test/mutex1.test 78b2b9bb320e51d156c4efdb71b99b051e7a4b41
@@@ -759,7 -754,7 +759,7 @@@ F test/pcache.test 488061b5dd685df2234d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
  F test/permutations.test bc474bafb022cc5014ef3a9c3d5ab61d6d6f587c
- F test/pragma.test 8ee8929dd652a5753d9cd72dbcbcb9b152bd6fd8
 -F test/pragma.test 19d0241a007bcdd77fc2606ec60fc60357e7fc8b
++F test/pragma.test 5e4805a9535d46d5be677075c9663941fc40615a
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/printf2.test bed79b4c3e5da08ba88ad637c0bf62586843cfb1
@@@ -865,10 -860,10 +865,10 @@@ F test/table.test 2a1d2fa52c531de5915f2
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
  F test/tclsqlite.test 37a61c2da7e3bfe3b8c1a2867199f6b860df5d43
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 8c152084186b281f2d16aa4ef7cac35e71027adf
 -F test/tester.tcl b4ff83a8b069633f4aca788236d10a7086112a49
++F test/tester.tcl c1355a09c24c0588e8324b95283e8406d92048f2
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1190,7 -1185,7 +1190,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 654c6c658ba7557eb822b03264bb4d259c216c01 6b785e92f279cb65746834d5cd25594fd3333342
- R f27fc3bea7e487d84cab0fef0b2933cc
 -P 0ad1ed8ef0b5fb5d8db44479373b2b93d8fcfd66
 -R 1045cc0c95f68e0f0e2e47642b0ec158
++P fa7912320fd92c957034164f51d993f86220cf36 717245d48714c08156c9b7636aaa6c3a402bad66
++R 13035e665b9a25b5fda627c7e765ea3f
  U drh
- Z 74b9dc6bc0a8d88a6e962a4d326b8088
 -Z fecab6dfa8d111d2725130892a38124f
++Z 9d38665213c2ce38d22f159bbbcce720

diff --cc manifest.uuid
index db69463ff05a47c458f7ea15081cea7f919cae67,c81900087c1a3ac1bf0a884c918a1ee8b305ee47..5db7f1cd9dee30f4417ce9285e1fb768c9db3505
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fa7912320fd92c957034164f51d993f86220cf36
 -717245d48714c08156c9b7636aaa6c3a402bad66
++b2e01080cce405de2bba7a5294001f9cc463a3c4

diff --cc src/btree.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/select.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/multiplex.test
Simple merge

diff --cc test/pragma.test
Simple merge

diff --cc test/tester.tcl
Simple merge