Update this branch with latest trunk changes.

FossilOrigin-Name: 83b1e163ef6ac01d252268415f26a2a999670de583491becc091d294075980bc

diff --cc manifest
index e3c353b3af499c9614a041e2eee5cf69262b2d22,d87364e174d8613a5fe7ff494de579d96db63d12..067d529c6b5328d7b2f2031ec48c66c8d7eedbed
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Avoid\sreading\sthe\sfile-size\sbefore\spage\s1\sis\sread-locked.
- D 2017-04-29T15:48:32.290
 -C Enhance\s"PRAGMA\sintegrity_check"\sto\sdetect\sduplicate\srowids\swithin\sa\sleaf\npage.
 -D 2017-05-01T18:24:01.052
++C Update\sthis\sbranch\swith\slatest\strunk\schanges.
++D 2017-05-01T20:07:59.204
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 6a8c838220f7c00820e1fc0ac1bccaaa8e5676067e1dbfa1bafa7a4ffecf8ae6
@@@ -345,7 -345,7 +345,7 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 5bd5e1f17a74836e6d6273c1d04d406bb481a6c517f18f96db0a5de266797f4a
 -F src/btree.c 8c1fd4cfa2b0bf021386e0a1f4e30b64eea7a2c1bc2e0c3e5901a626b1ab6aa9
++F src/btree.c ca26f48d5c9f2f1e930b062bb1e550ea8d26c9b64522eb2003e10c226ecfc884
  F src/btree.h 80f518c0788be6cec8d9f8e13bd8e380df299d2b5e4ac340dc887b0642647cfc
  F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
  F src/build.c 4026a9c554b233e50c5e9ad46963e676cf54dd2306d952aa1eaa07a1bc9ce14f
@@@ -402,13 -402,12 +402,13 @@@ F src/printf.c 8757834f1b54dae512fb25eb
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c bf8ab605e49717c222136380453cfb7eda564f8e500d5ff6a01341ea59fefe80
+ F src/select.c 478e95d424bb86d34c7c95d20872cbd78df97af5f83c3fd7de55d5b2413f927d
 +F src/server.c ffeab1087cdae36f1454065b1feb49c61ce48db0088c6130e28197d6bfbc7545
  F src/shell.c 21b79c0e1b93f8e35fd7b4087d6ba438326c3d7e285d0dd51dfd741475f858a1
 -F src/sqlite.h.in 40233103e3e4e10f8a63523498d0259d232e42aba478e2d3fb914799185aced6
 +F src/sqlite.h.in f6e3734fee6d334a896cff8f43446ca2e47dcf7e39135b3e3a596bf23cdbbc97
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
 -F src/sqliteInt.h 9affb53bb405dcea1d86e85198ebaf6232a684cc2b2af6b3c181869f1c8f3e93
 +F src/sqliteInt.h 88b07d07c2fc9b8abe8e58b0b1a687ab0531265c76285998819402f25ba6aedb
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1580,7 -1577,7 +1581,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P a40b42c422a53aa99280eca7ba419a3937699e273efa3377e0fefe52582cbbd4
- R 9a85e5e4940ba5e8bd67cc7c6dfd6715
 -P a6727eef6d757a39ad23e5c8cbe960f5d909e5d37cb4e90bc3bdbb8bf58cd6f8
 -R 90aeb34d2a97f39322f1438c3090df25
++P f6b025bf632501f51e691a05d309225671fd78bc62c9a43dd916d35ba4cf6d0e adcad37b001d255299be716b16003b56ec1fba349ef73261ee0e543186c4f311
++R 1bed61f4e58db79868a35dfe4c038832
  U dan
- Z 5b549d7ff43521bff2f6a6a67d4b45a8
 -Z f3a1c9f94034eac95802b81d94d576ee
++Z 7c8b7b8a56c86eedcffe381967e739a0

diff --cc manifest.uuid
index 8be646eae030cc479cfa99011a14737337d604cf,0a84edf303f527ca31c85d7ea31a052c8ce53d32..8432bd7dfedd85325e717b0097484ae81e7eea22
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f6b025bf632501f51e691a05d309225671fd78bc62c9a43dd916d35ba4cf6d0e
 -adcad37b001d255299be716b16003b56ec1fba349ef73261ee0e543186c4f311
++83b1e163ef6ac01d252268415f26a2a999670de583491becc091d294075980bc

diff --cc src/btree.c
Simple merge