Update this branch with the latest changes from trunk.

FossilOrigin-Name: 380a7b7a458b212b0463c8e128c289cc70f2fdb9b9a63b91fc7542c120eb9c10

diff --cc manifest
index 98bbf4396664e9b612e9d5581555cd9e5ce2e5ab,514232a7c7e64d2ed595bc54088506544090473a..f2e203fee2f6b262cbe4808d4fc181d7c1ad40f8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Enhance\sthis\sbranch\sto\ssupport\spage-level-locking\s(without\sMVCC)\sfor\nmulti-process\sdeployments.
- D 2017-08-16T16:52:14.156
 -C Remove\san\sunnecessary\slocal\svariable\sfrom\sOP_Column,\sfor\sa\ssmall\ssize\nreduction\sand\sperformance\sincrease.
 -D 2017-08-16T14:16:19.879
++C Update\sthis\sbranch\swith\sthe\slatest\schanges\sfrom\strunk.
++D 2017-08-16T17:06:42.450
  F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@@ -398,10 -397,10 +398,10 @@@ F src/auth.c 79f96c6f33bf0e5da8d1c282ce
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c f96286765cdeff388816e1cc1a20628735d5f453040cc949eb7ccadf58799e65
 -F src/btree.c d2f5f347e56f8b7ed1bb798087045a3b98cd63f45fde7675fd24b9e88b61304d
 -F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca
++F src/btree.c 70fcdba84b91ee55bf1a98134f2b7f9813597a5bc14dc79f6d43cccd75fc43f6
 +F src/btree.h d1f64c5683e9ade8afa968b49abeb108acd430fc33f2cae2a62a2cfc601087d8
- F src/btreeInt.h 97700795edf8a43245720414798b7b29d8e465aef46bf301ffacd431910c0da1
+ F src/btreeInt.h f78671f594dafd88cf9a81253da04db81272b382d2dc074bb983d348b95d9d2d
 -F src/build.c f8a85d2ad14c2201e10c2fe7185e1cb3f1db8b0c90d40d1fb99c20b135ab71bc
 +F src/build.c 045e3f469ec2535eb09d7fdc9d509014c1db4a0b8dcb6164c45b65022f13a56d
  F src/callback.c 930648a084a3adc741c6471adfbdc50ba47ba3542421cb80a26f259f467de65e
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c ff1be3eed7bdd75aaca61ca8dc848f7c9f850ef2fb9cb56f2734e922a098f9c0
@@@ -455,15 -454,13 +455,15 @@@ F src/printf.c 439c145d71ff9e0328ec26b7
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c ea8921065512650a9df3f5bf9a9b531c6ef4fb193c0d57e09d7a479ef9b13992
+ F src/select.c c9b3d8444bbf6f167d84f41ca6f3672e2521cb163a8c706b19058dc82fffe9b8
 +F src/server.c e8d1c1a0e39d508c75e11eafa9a20edc85f5b619b27f7218950f3a77431f5a71
 +F src/server.h cf1ede28aaa07a30550228582f211327b5ebe5517d2334e35ec09d00fd6d230d
  F src/shell.c bd6a37cbe8bf64ef6a6a74fdc50f067d3148149b4ce2b4d03154663e66ded55f
  F src/shell.c.in b5725acacba95ccefa57b6d068f710e29ba8239c3aa704628a1902a1f729c175
- F src/sqlite.h.in 9dacf9a0959630bf5d286c0fbdaf2bb4bf408a9477f6d61db8edab3a859714d7
 -F src/sqlite.h.in f0bd1abf5e27bd22b3bcaae2a861c1efc4ab7e752bf7eb102355135617eb8199
++F src/sqlite.h.in 29317515594eb3db2800a21fe8b568e502d76899fc64cc3b685f90c4a1ebe214
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a1fd3aa82f967da436164e0728a7d6841651fd0c6e27b9044e0eb9f6c8462e47
- F src/sqliteInt.h eaa2c5e52a29da629bd50521a6b67cce7f952128a95ba4f20aac62c78d41b04d
 -F src/sqliteInt.h 854a122ff0ebde410a66d4f967e9923de9002f73965c6c9fa0db544bf7e657d1
++F src/sqliteInt.h b95aa37138366b9e631caf2aaa1062740165e5e141ffba921e8fe07645104240
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -525,7 -522,7 +525,7 @@@ F src/update.c 5404be9e840717323a692091
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23
  F src/vacuum.c 90839322fd5f00df9617eb21b68beda9b6e2a2937576b0d65985e4aeb1c53739
- F src/vdbe.c d410ca56e272b8e5734f68bce1281942dc7dd5843d7cb3e450e074f35c49a35d
 -F src/vdbe.c c8e7bec8764b26b8e80fadffab2b9c18e8ed5ab2e92d1be5a7aebeed18ca8be5
++F src/vdbe.c 0db0d75f514e8e2d9f31d47c09a8924e022ee778570578a48abc1f054ff8dbb9
  F src/vdbe.h d50cadf12bcf9fb99117ef392ce1ea283aa429270481426b6e8b0280c101fd97
  F src/vdbeInt.h ff2b7db0968d20e6184aee256d2e535d565f5a172e3588a78adb166a41fc4911
  F src/vdbeapi.c 05d6b14ab73952db0d73f6452d6960216997bd966a710266b2fe051f25326abc
@@@ -1657,7 -1647,7 +1657,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 8e1b28ed3e83eba0b2113316a40ed1165e0e051220b68863cb70734c95a82c2a
- R 0a18526bebbb88ed2fe197ff12475de8
 -P dc98a92f32511ee322b0207bd286e967248a8e59b418f11168eb31e34b0fa0fa
 -R 8dc9658e95fe266a68d077704d4afe1a
 -U drh
 -Z 4fdaa02107e5a271b3b6d501790c7a7c
++P 04e0cb571dbed00e269a890a755e252d7e8204d6d2ed5a7cfdb3d78d990a2876 39543903282409ad3f139f8a0bb376661e7595a33af4f647945b1513a028ccb4
++R 57d1fe32a9abbe4cff206d1840c9818b
 +U dan
- Z 121a6646ee66bffdec0d5750ccf213ab
++Z 63f3cfe0c27f676329bb592352b611d7

diff --cc manifest.uuid
index 521845bf4e43952078af4c7e5b2ef8472c4ce8e4,e7180c426793d3c7f125e808d1a7581380043953..b82571434ef655d130b96cc7c0d720e2d9b22464
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 04e0cb571dbed00e269a890a755e252d7e8204d6d2ed5a7cfdb3d78d990a2876
 -39543903282409ad3f139f8a0bb376661e7595a33af4f647945b1513a028ccb4
++380a7b7a458b212b0463c8e128c289cc70f2fdb9b9a63b91fc7542c120eb9c10

diff --cc src/btree.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge