Merge fixes from the alter-table-rename-column branch that occurred after

this branch separated from that one.

FossilOrigin-Name: 22e785aa2bbce4ae0852bc3d127d4b12222a192eb6e3ee874bf8e5c8582d05f3

diff --cc manifest
index 7e98684089555eecba2d7628fde6f4b49505f998,d12fdc6e98bd5f2565fd0cec41ebf59bb16dfe08..a887bb1985368e96eecf0e8c51885c3936d5e40b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\sfixes\sand\senhancements\sfrom\strunk.
- D 2018-09-01T15:49:13.832
 -C Fix\sa\sminor\sissue\sin\sthe\saltercol.test\sscript\sso\sthat\sit\sruns\son\sWindows.
 -D 2018-08-25T16:22:33.294
++C Merge\sfixes\sfrom\sthe\salter-table-rename-column\sbranch\sthat\soccurred\safter\nthis\sbranch\sseparated\sfrom\sthat\sone.
++D 2018-09-01T15:55:44.527
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in 2729786d5d188974913f07ea63cc84cd42cb9cac5f4aac823c40105e68e22f63
 +F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 2e6eec0444dd80730b678b009cbe7fb9382dc3c5e8f45f554730203678cdd782
 -F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
 +F Makefile.msc d37bb24f0910744b555d77bea3d2f31e412caaf0c8ac6ec76a3d312cb3cf52ce
 +F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
  F VERSION d3e3afdec1165a5e593dcdfffd8e0f33a2b0186067eb51a073ef6c4aec34923d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -434,7 -432,7 +434,7 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 6fa0efb035dd6c1633c9b54425bbf65f89a402d131beffb93979686b21b7ec4e
 -F src/alter.c cd45c47c74347cf2d6da3e055f19b880fb7c9d3022230b4a46132b3055e71350
++F src/alter.c 245152daa14007b02ecbab086b73fc0a9e372b9aad24b4178b6e5b2f802554c5
  F src/analyze.c 3dc6b98cf007b005af89df165c966baaa48e8124f38c87b4d2b276fe7f0b9eb9
  F src/attach.c 4bd5b92633671d3e8ce431153ebb1893b50335818423b5373f3f27969f79769a
  F src/auth.c 32a5bbe3b755169ab6c66311c5225a3cd4f75a46c041f7fb117e0cbb68055114
@@@ -601,10 -599,9 +601,10 @@@ F test/alter.test 31b4e9128887457f1a7bd
  F test/alter2.test 7ea05c7d92ac99349a802ef7ada17294dd647060
  F test/alter3.test 4d79934d812eaeacc6f22781a080f8cfe012fdc3
  F test/alter4.test b6d7b86860111864f6cddb54af313f5862dda23b
- F test/altercol.test b89cd928c1e7513e569a18021f59754b164978860f5069bbebff703e4c7d2c50
 -F test/altercol.test 5636b8e579d6c8852a56c9fa56573205b420cab48f5f05a4d7b1cdb2bdbf6a91
++F test/altercol.test 42250da2cba6d94fdf21a4c39d79c733911d18a7c1453216ef0f48c6c118966d
  F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
  F test/altermalloc2.test 0231398534c494401a70a1d06a63d7849cb5b317fcc14228cbdb53039eba7eae
 +F test/altertab.test 8c9631e9daca782905207c3c728c89181320d5ff8bfe1dc10cced233446a017f
  F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
  F test/analyze.test b3a9c67d00e1df7588a5b7be9a0292899f94fe8cac1f94a017277474ca2e59df
  F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8
@@@ -1762,7 -1758,7 +1762,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 eac2aa7dce577f1998cc2078dd8ac384070f8acf1ceb565999a5cf719092024e c1aca7673ab04740bc8ad76af0a72a229c79a0cd51cf84d1c689a77424ff17c6
- R 34f28ccab2f7f9a4a506a2d90442b60b
 -P fc293bcb3402f049fb9e22aacfb4fdcd13f8609edf29c97d6cb95ce351363873
 -R 64ddfe692b05307d9b72b37e625688a1
++P 589186c083ff3af8d5a6d5ad34e1cefea57806ebf3831ea3bf5a48ef1e173140 62089c6daf9ea51be769c077c23d6fa881ba797255fa22d71baaac191a9c1ba7
++R 1d86d7939ae5916c3a0cbf5cee6b780f
  U drh
- Z 50f92f34e3d19f5b5187cc33c2a11ab3
 -Z 7ccfe8689358cb4f8c05a477c50e8895
++Z 720f2ed02ab0eac24853dcd860bc927c

diff --cc manifest.uuid
index 527fc6fe1930e3757423096a6ed6f1b7835b5222,b3366e12eb4be70da53bac4aeedfad9104f1403e..1fa397a6f4bc451ebd2aa5be215502c6547eb736
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 589186c083ff3af8d5a6d5ad34e1cefea57806ebf3831ea3bf5a48ef1e173140
 -62089c6daf9ea51be769c077c23d6fa881ba797255fa22d71baaac191a9c1ba7
++22e785aa2bbce4ae0852bc3d127d4b12222a192eb6e3ee874bf8e5c8582d05f3

diff --cc src/alter.c
Simple merge

diff --cc test/altercol.test
Simple merge