Merge updates from trunk.

FossilOrigin-Name: 94877e495c563f101b51cd8891ca7665c7aab87ff526157f1dc1781e0a2a5d87

diff --cc manifest
index 6a573c3c657f46ed44c9bfbc7354d085ae970b97,2c7add29f128bc9c1ea228bcc3237ac651391f64..ac68d1340d5b3b2f363761397f22adadd96f5427
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\s"PRAGMA\sreset_database=ON|OFF"\scommand.\s\sWhen\son,\sit\scauses\sthe\ndatabase\sto\sappear\sto\sbe\sempty,\scausing\sthe\snext\stransaction\sto\sreset\sit\sto\nan\sempty\sdatabase.
- D 2018-04-28T01:27:09.774
 -C Prevent\sdeep\srecursions\son\snested\sCOLLATE\soperators.
 -D 2018-04-28T04:16:43.197
++C Merge\supdates\sfrom\strunk.
++D 2018-04-28T11:22:53.232
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@@ -494,10 -494,10 +494,10 @@@ F src/resolve.c 6415381a0e9d22c0e7cba33
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c daf07d8defce3311f9e69f1280a874d78bc1d16c305f6aa689640f7afa02842f
  F src/shell.c.in d63f06c870ec1761ea98bd1cae651ff0ea6beadf8be892105dabd913f94cb3da
- F src/sqlite.h.in 8e70752a57597c08f64f3d49fc1fc46926b862d2e23b038b0d23b9cc748d88ea
+ F src/sqlite.h.in c3b1782d1a290253b37ebc999c42e894ff8aa9f76526b2938df2f8939d20de39
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
 -F src/sqliteInt.h c1deb023eb117b4437a69d8c5a753deb36581f1933015cd262ad32b45c4d8431
 +F src/sqliteInt.h 8ac0138eae10337b745b03dad0124fd63ae911c0503e795729503e7fc6234d57
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1725,10 -1725,7 +1725,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 576a8f69ae25883f752e58953624e9f7126db998bebaa1f07f7c2ec47aaecabe
- R 20267b33ec4093cbd8eada610413a5f9
- T *branch * reset-database
- T *sym-reset-database *
- T -sym-trunk *
 -P de508e831a43f02c3b354a24ea34798da03c163bae5521c852c9ddd252723739
 -R 8fd56e6836e3af3199f94071c5426607
++P 02e1a13c1f04bb72599b98f51240c78d0d050de264fef5808fd97db3f4c16dac 6e098ee415f1a530e17a942c9ba51d67c25a3ebff6b97377b7858d0b10bcec92
++R 64a2fea94a3cb75b3548d8498e78db38
  U drh
- Z 6b0d829800a54a9640942b2a1f1f52ea
 -Z 830b9867ea719a4d0d43e83e413c3907
++Z 4ef7f8352ba19719f819fb6bff3896fa

diff --cc manifest.uuid
index 429266b2c5ff59424243d5f075803c34d2d59216,e414a124824c7156f7fe89ff3272926b8264c9f9..a1012dd29079c3d6a42b9abd49958f154d8f62de
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 02e1a13c1f04bb72599b98f51240c78d0d050de264fef5808fd97db3f4c16dac
 -6e098ee415f1a530e17a942c9ba51d67c25a3ebff6b97377b7858d0b10bcec92
++94877e495c563f101b51cd8891ca7665c7aab87ff526157f1dc1781e0a2a5d87