Merge recent trunk fixes.

FossilOrigin-Name: 97657445860363f5bd62c37e6a565e782e7eb908

diff --cc manifest
index 78a7f9cda157342fe63f861da074a84d45c6f5a3,b3d969ce8706f7c4aeba6c7afce1f68e49263528..4a8ab43dc80a58827a8019aa1d8bffb9769782ed
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\sfixes\sto\ssqlite3_scrub_backup()\sfrom\strunk.
- D 2016-07-26T15:17:14.899
 -C Disable\sthe\sauthorizer\scallback\swhen\sreparsing\sthe\sschema.\s\sThis\savoids\nundesirable\sauthorization\sfailures\sfollowing\san\sALTER\sTABLE.
 -D 2016-07-28T18:38:13.187
 -F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
++C Merge\srecent\strunk\sfixes.
++D 2016-07-28T18:42:21.282
 +F Makefile.in 7ac1f34182d307765c6439c899bd3dac2af587bf
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -388,11 -385,10 +388,11 @@@ F src/resolve.c cca3aa77b95706df5d635a2
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
  F src/shell.c 9351fc6de11e1d908648c0a92d85627138e3dee5
 -F src/sqlite.h.in c6e68a4a47610631822a4f8f83a44c9f75339331
 +F src/sqlite.h.in 944ce442e0800b2ee6334d53a49be6aabfb7f74f
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 46f300b6e300e0fa916d7d58c44b53415b8471a9
- F src/sqliteInt.h 6e4e026581512bef8fbc4bb3ae11464813243cc7
 -F src/sqliteInt.h d25c18c1272a7811e2569c39bfc2fca96156eead
++F src/sqliteInt.h 5fa89170e0ad08605cfb87b771ad70bf5a089317
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -464,10 -460,10 +464,10 @@@ F src/vdbesort.c 91fda3909326860382b0ca
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c 948d2d4984219eee37a7bf427d6667e21e6eb92e
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
 -F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
 +F src/wal.c 25bc1cea2ab18a917548dd0a30c299c538878ef9
 +F src/wal.h f38853cd771ff42f448de4f908238f2e2966ac8f
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c 48eed8ebe319c6cbc7bf7682018f32af0f5189f5
+ F src/where.c 8ccc01f9227d41bfaf09360f108583be4a36d3b1
  F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
  F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
  F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563
@@@ -504,14 -500,14 +504,14 @@@ F test/async3.test d73a062002376d7edc1f
  F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
  F test/async5.test 383ab533fdb9f7ad228cc99ee66e1acb34cc0dc0
  F test/atof1.test ff0b0156fd705b67c506e1f2bfe9e26102bea9bd
 -F test/attach.test 437107943f14d131cf5efc2ae5305a94d7cb1d58
 +F test/attach.test 1e7275728d68631627ab3b81fa48d1fef22796ef
  F test/attach2.test 0ec5defa340363de6cd50fd595046465e9aaba2d
  F test/attach3.test 359eb65d00102cdfcef6fa4e81dc1648f8f80b27
 -F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
 +F test/attach4.test faaaf33fa51f986b414520cb03cecdc7999df108
  F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0
  F test/auth.test 872a122b3977c1d1bb9fd637dc20016e5c01880f
- F test/auth2.test 264c6af53cad9aba5218c68bbe18036e39007bfa
- F test/auth3.test 5cfa94ed90c6617c42b7ba4b133fd79678b251c7
+ F test/auth2.test 9eb7fce9f34bf1f50d3f366fb3e606be5a2000a1
+ F test/auth3.test b810826b193831929951c0d50783a200e5ef6b72
  F test/autoinc.test c58912526998a39e11f66b533e23cfabea7f25b7
  F test/autoindex1.test 14b63a9f1e405fe6d5bfc8c8d00249c2ebaf13ea
  F test/autoindex2.test 12ef578928102baaa0dc23ad397601a2f4ecb0df
@@@ -989,8 -985,8 +990,8 @@@ F test/pagerfault2.test caf4c7facb914fd
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
  F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0
  F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
- F test/parser1.test 222b5cbf3e2e659fec1bf7d723488c8b9c94f1d0
+ F test/parser1.test 391b9bf9a229547a129c61ac345ed1a6f5eb1854
 -F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 +F test/pcache.test 9a04fa260cb47dd4fdc5d13c5e97054e05931592
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test 544a2f317fc5045bc512ae432f89eae303c0d640
@@@ -1512,7 -1508,7 +1513,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 cc6bfdf814d5701591b69ba2d399d4a1f6f6cc98 483994a54dee3c7a3801e0e9d3c96fa9dbd8d2fd
- R e217bb197896d512771b3d30716a58a1
 -P 81f9cf86c48f3cd43755ded4dc97388ec650f8af
 -R ae8bfc7314166cec8de9b44e7e9859e8
++P 91e811f51e611a37372875e96a4c51bbed2dfdea 805d01cdabb48a69eb986a7f084e53eb25d76b7f
++R 1f1e8b1dc5bfb43f90c10984a7e1c85e
  U drh
- Z 0e458236bb0fbc79b94c4a82c5b8e052
 -Z 7b0f6930a62d02daa8f4147d6dafd3a6
++Z 3d02145717de05c1fec9768a8381adbd

diff --cc manifest.uuid
index 598e716c62c23d933d198a2957cdcfa586e5de2c,53827a11618ea6b38117a716b07366e4cd24c2d4..f387980271324f847a05ce8fdb81038faba7bbe4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 91e811f51e611a37372875e96a4c51bbed2dfdea
 -805d01cdabb48a69eb986a7f084e53eb25d76b7f
++97657445860363f5bd62c37e6a565e782e7eb908

diff --cc src/sqliteInt.h
Simple merge