Merge fixes and enhancements from trunk.

FossilOrigin-Name: dff0314b7e7ef2d04375ff21fbf89039bf5f64a9cdca53d7bc7120faacd92c06

diff --cc manifest
index a6919e095ca5125338fdd107ac6f436f06402b3c,63a45db0462f676db6749fc79b4f4987e8befff2..72afdf7ce86736382f51b4ada7559985ba178411
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sALTER\sTABLE\sRENAME\sCOLUMN\sin\scases\swhere\sthe\scolumn\sbeing\srenamed\sis\san\nIPK\sdeclared\swith\sa\sseparate\sPRIMARY\sKEY\sclause\s-\s"CREATE\sTABLE\sx(y\sINTEGER,\nPRIMARY\sKEY(y))".
- D 2018-08-14T16:18:19.678
 -C Fix\sUPSERT\sso\sthat\sit\schecks\sthe\starget-constraint\sfirst\sand\sfires\sthe\nDO\sUPDATE\sif\sthat\sconstraint\sis\sviolated\sregardless\sof\swhether\sor\snot\nother\sconstraints\sare\sin\sviolation.\s\sThis\saligns\sSQLite\sbehavior\swith\nwhat\sPostgreSQL\sdoes.\sFix\sfor\sticket\s[908f001483982c43cdb476dfb590a1a].
 -D 2018-08-14T15:12:52.710
++C Merge\sfixes\sand\senhancements\sfrom\strunk.
++D 2018-08-14T18:12:33.724
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@@ -569,11 -569,11 +569,11 @@@ F src/upsert.c 47edd408cc73f8d3c00a1405
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
  F src/vacuum.c 36e7d21a20c0bf6ef4ef7c399d192b5239410b7c4d3c1070fba4e30810d0b855
 -F src/vdbe.c b11baa48b293dc48fbd51c6a9029f88bdf4cd117c01225b2a2b5e90e5928a8a3
 +F src/vdbe.c a8dbb4cea2582818f8e253c904fec13ef1f1b6ff50517f7b8962a2ce9e5aad02
- F src/vdbe.h d93abdc8bc9295e0a256e582c19f548c545dc498319d108bbc9dd29de31c48a2
+ F src/vdbe.h 5081dcc497777efe5e9ebe7330d283a044a005e4bdda2e2e984f03bf89a0d907
  F src/vdbeInt.h 8ea493d994c6697cf7bccc60583a80a0222560490410f60f1113e90d36643ce0
  F src/vdbeapi.c 2ba821c5929a2769e4b217dd85843479c718b8989d414723ec8af0616a83d611
- F src/vdbeaux.c b610cef3d8d381c9287d02c2e61590acc0a1b4de1cc0188d560f5ef345527a24
+ F src/vdbeaux.c f03d4a1961ec282abaec5dbf7e5576ddb1eb01e6157335a232d8d9e57fd5eca1
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
  F src/vdbemem.c 720df42ad8e5c7cb883573de40a185afef4a214903098a16f2bb14b62b2399b7
  F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
@@@ -1756,7 -1754,7 +1756,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 87743ddef11749b4017d60abc297abfd673e02a26a2ae45ffec861327578aa30
- R cfb1823f0505ebc72c2b74bb80660032
- U dan
- Z a8c4b40af0e3c17c8355504f43b3338a
 -P e3ea43dabf099dc2954c23d348638e7b2a8b9122d2994154bc649a2c09260c46
 -R 57b28032d1f7240227e60efc94d5cf5d
++P 32ca8418df8735a6c53e53153f733579e514711f091e4e09ecce83db85fe4d85 529fb55e3d00472f13446117527b0896827b11e870b581af7fe7cbb7392ef3cd
++R 2c67676faf1011aaf8f4088cbadb8d35
+ U drh
 -Z f4b7118e2c3ed77a16d581f95e6f4881
++Z c8c52af61bbc60afb458a20b1e9575b7

diff --cc manifest.uuid
index 905c7c9f2f13691ee3388d84e564287f1492aaf2,4bf71e72d893045fda861669b2a4d3b9eab8906e..a2a9b298bb3099335138fb26df4bddb7ad9957b1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 32ca8418df8735a6c53e53153f733579e514711f091e4e09ecce83db85fe4d85
 -529fb55e3d00472f13446117527b0896827b11e870b581af7fe7cbb7392ef3cd
++dff0314b7e7ef2d04375ff21fbf89039bf5f64a9cdca53d7bc7120faacd92c06