Merge latest trunk changes, including the follow-symlinks functionality and 3.9.2...

FossilOrigin-Name: 447521d747d94fa3028348bc48b897592fd8021c

diff --cc manifest
index 35348db06aadb2784c2976b23caffb66849f3917,b6295df2c182e759377407232f3a480265f29ce5..eeb44b970f659c63209e4fcdfe92ea5367357d5d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\sthe\s3.10.0\sversion\snumber\supdate\sfrom\strunk.
- D 2015-10-30T16:37:44.655
 -C On\sunix,\sif\sa\sfile\sis\sopened\svia\sa\ssymlink,\screate,\sread\sand\swrite\sjournal\sand\swal\sfiles\sbased\son\sthe\sname\sof\sthe\sactual\sdb\sfile,\snot\sthe\ssymlink.
 -D 2015-11-02T15:08:56.877
 -F Makefile.in 4469ed8b02a9934fea9503d791165367d19db2f7
++C Merge\slatest\strunk\schanges,\sincluding\sthe\sfollow-symlinks\sfunctionality\sand\s3.9.2\sbugfixes,\sinto\sthis\sbranch.
++D 2015-11-02T15:10:48.109
 +F Makefile.in 3f4e9157bfb231338d7625610806599e4beb31b7
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -285,10 -282,10 +285,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 -F src/btree.c 77343aac89c50bb5e06cbca3ace8c057c14de57c
 +F src/btree.c 35af7ace61d9db9c93b6608fa635c3929bc28dae
  F src/btree.h b512723e4f27d7ba16b4b985cdecdb82c0f6d0c0
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
- F src/build.c d6162335d690396dfc5c4bd59e8b2b0c14ba6285
+ F src/build.c ca574d33ffb1763cfd2979383f4d507095bfbe19
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 509ef9c64d1321f42448f111da86400b1799218a
@@@ -327,11 -324,11 +327,11 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 5d735a657897109af9fffb6e5144de2d091b96f0
 -F src/os_unix.c cf72e06e15839ebe7121e01d3eebf256c039b0ca
 -F src/os_win.c 1716291e5ec2dbfc5a1fe0b32182030f1f7d8acf
++F src/os_unix.c 93f3106e2a4f16d9c50fe4decaeddba8ad3d9fb4
 +F src/os_win.c 1666013b5b107c70f703abece20e0e2f2137d6bd
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 9c1eec0d88133484b165fa0b5284a411c24b964c
 -F src/pager.h 1c4fa826c330040c5659a384446c7cc6e8e4200c
 +F src/pager.c b35877e335c9bdf9974a752d638bbfa64ed0cf31
 +F src/pager.h 33a0e40fa4841096a8443d2337ca8151b6402ec5
  F src/parse.y 11078cd8e3af00f030505b6a86a06a4536cfdeaa
  F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
@@@ -354,9 -350,9 +354,9 @@@ F src/sqliteLimit.h 216557999cb45f2e357
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
 -F src/test1.c 9ac5cbfe3c859ab7518edc5109a2959d6bf7b059
 +F src/test1.c 620531c662fa0a35fab85d6e7f73091aaefd3c87
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
- F src/test3.c f7ae1d6a4aa07aac257de18a43800c1199b513fc
+ F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
  F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
@@@ -918,9 -913,9 +918,9 @@@ F test/orderby6.test 8b38138ab097258824
  F test/orderby7.test 3d1383d52ade5b9eb3a173b3147fdd296f0202da
  F test/orderby8.test 23ef1a5d72bd3adcc2f65561c654295d1b8047bd
  F test/orderby9.test 87fb9548debcc2cd141c5299002dd94672fa76a3
- F test/oserror.test 14fec2796c2b6fe431c7823750e8a18a761176d7
+ F test/oserror.test 361346396ae18462c7393c1ac5c3f17237bd89b2
  F test/ovfl.test 4f7ca651cba5c059a12d8c67dddd49bec5747799
 -F test/pager1.test 1acbdb14c5952a72dd43129cabdbf69aaa3ed1fa
 +F test/pager1.test 1c39b52a036afd0813fdd47c9d2ebc83dec8fd90
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -1050,9 -1045,10 +1050,10 @@@ F test/subquery2.test 438f8a7da1457277b
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
  F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
 -F test/superlock.test 1cde669f68d2dd37d6c9bd35eee1d95491ae3fc2
 +F test/superlock.test 2b27b4ae7c6b9d534b0412e0d99f989aa1f3b9cf
+ F test/symlink.test 2513f7c030df0f435c6415687ba8b739f3d312df
  F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
- F test/syscall.test d2fdaad713f103ac611fe7ef9b724c7b69f8149c
+ F test/syscall.test fba9ebdc6905d05bba6a835e691f20ed9ea2cc88
  F test/sysfault.test fa776e60bf46bdd3ae69f0b73e46ee3977a58ae6
  F test/tabfunc01.test 03c4ad422c6ab596cff6dcaf86dd061a9f039525
  F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
@@@ -1402,7 -1398,7 +1403,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 6e4306efaf5c0d34a1aead8ad1fe5aa836b61ca1 7565b046ff939e8310631397a4526fbd98b99aaf
- R c80645a3ee52a862fddca56bcf9c8084
- U drh
- Z 1e7700dd2866b342be95806c5138e481
 -P db319a035feeb6f8fcd04f90fb10cd4b06e68184 c7c8105099c0412ac6c605f98987092c10bde57c
 -R d67684ec76cb9980f2fad9cc50640002
++P 980d6207431abf8549bf8dd82d65d707872a2a31 6d5ce3ede4c7038c19a77268a5a7b9d5650933c2
++R fde5af0611dc784cf3991905e6210e7a
+ U dan
 -Z f0eb56e4c62ba83d5d97aac57baaa5e0
++Z 8e194ed9f95c627829ea2eb87bbc0fd8

diff --cc manifest.uuid
index db5b23255919c693befce81969073baa884c1571,75787377436265760bc0081bb71113795030c9f4..316f7c527d90e73081c7ac547bb0dcd1b7ccdc53
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 980d6207431abf8549bf8dd82d65d707872a2a31
 -6d5ce3ede4c7038c19a77268a5a7b9d5650933c2
++447521d747d94fa3028348bc48b897592fd8021c

diff --cc src/os_unix.c
Simple merge