Merge ALTER TABLE and sqlite3_normalized_sql() fixes from trunk.

FossilOrigin-Name: acf10b3f8d6675ddf787f7db55a9ff0ec5729adb6fa70b48b13d2cd71862cffd

diff --cc manifest
index a5190097ed9cbbf31ff9913aa9db0e737a894da4,41eeb7cb19006fca119f5503c7a2c8c75ade4864..35793a687bb359c085744799de4baf7bc0f58c5d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\senhancements\sfrom\strunk,\sespecially\sthe\senhanced\nsqlite3_normalized_sql()\sinterface.
- D 2018-12-05T13:44:19.230
 -C Get\srid\sof\sthe\shash\stable\sused\sto\strack\sIN\soperators\sin\sthe\nsqlite3_normalized_sql()\simplementation.\s\sUse\ssimple\sinteger\svariables\ninstead.
 -D 2018-12-05T23:56:02.639
++C Merge\sALTER\sTABLE\sand\ssqlite3_normalized_sql()\sfixes\sfrom\strunk.
++D 2018-12-06T00:05:18.923
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 68d0ba0f0b533d5bc84c78c13a6ce84ee81183a67014caa47a969e67f028fa1c
@@@ -450,13 -446,13 +450,13 @@@ F src/analyze.c 3dc6b98cf007b005af89df1
  F src/attach.c 92b51739a885da8bd84bc9a05485f1e48148bce5c15432f059b45af98fff75cd
  F src/auth.c 0fac71038875693a937e506bceb492c5f136dd7b1249fbd4ae70b4e8da14f9df
  F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
 -F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 +F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c ba7c7eef4461790f37c309936bfc5d0d6ba9b194b02d3c8ff1fd53b420ea6d3b
 -F src/btree.h febb2e817be499570b7a2e32a9bbb4b607a9234f6b84bb9ae84916d4806e96f2
 -F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
 -F src/build.c fce47a9789704e65c63299b01be8153745faee7919f5137d3f29b7c3c0b549bd
 +F src/btree.c 4a2184be69d491d4b0228d4e397d67cb0802bbec06e7615b485ea1af69a131f6
 +F src/btree.h 1ed41c71481a1196a520064f2282bc13d768bbd8ae2850e319a3048f8ee7cb3d
 +F src/btreeInt.h 6c65e6c96f561596f6870c79a64d4706af81613881d7947e3f063e923f14115f
 +F src/build.c 7d86c455d226f5ccef7103c2a0c75ea71fe6cd6206311bd9d02d700c2b2c2565
- F src/callback.c 789bd33d188146f66c0dd8306472a72d1c05f71924b24a91caf6bd45cf9aba73
+ F src/callback.c 25dda5e1c2334a367b94a64077b1d06b2553369f616261ca6783c48bcb6bda73
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
  F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
@@@ -513,10 -509,10 +513,10 @@@ F src/resolve.c 976e7879286a1eecdc71cef
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
  F src/select.c 61e867a906f140b73baf4ce7a201ad6dcba30820969f5618ee40e9a0d32c6f5f
  F src/shell.c.in 1f0819e69fb1ebd2eb44695530dc43936608bf9b752981a0ffd4e2e4a9e3883d
 -F src/sqlite.h.in cce9feede1c1c03923c091b4bbbd081dd77aaf92024cc2cdbf65f712c2f668c3
 +F src/sqlite.h.in 0880d9e366c2b0e1cbc40d32c2671e67c7bc7e9cb7f7298956c254ca8845c702
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
- F src/sqliteInt.h 237ceb16e1baa81c3ce48a599066397143c2a11d252417c1faa825aa49347ed4
 -F src/sqliteInt.h 8a9a4c1cce0cfd95d0fa8527ee12dbba0e7e1ec9983109626d4932cd48c5d571
++F src/sqliteInt.h 047518350096c8661599cf47dbf8582e77f6680c2ca7c1df16be528b243d532a
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1795,7 -1782,7 +1795,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 ddb4a6fbf8619db058b5eb8fcd687084ed4b65a6f69810357e324158257a911f 7da617e97eb905cb009c47403786682b911e32a630f266e1c53ea72836fc88b5
- R 6f8dcd3c69f80b2e9c9d50e15cd3b5d7
 -P e8540377ec66fa5f9ae3c93bedb5c094057698199c37fc211f7ea95429e815e4
 -R d3461cbb797157ae329a2dd1a53cba4d
++P 47b73f6bfee8c5e41c408fb70dff0e4596c0a3eb0aeba40ad232a6cb1fe75532 272dc74fd0304d6a28aaa8798d13e2f950c1a24d92d17519e3c32aef86714586
++R a30346ad445bd4b3c872d0608edad37a
  U drh
- Z 1ab8d4c3d4f665beb11a279662fb11b4
 -Z ad7226daa41778e03500de0c126598a5
++Z a9e804540ce5cd2c79b5ce88d89da2d3

diff --cc manifest.uuid
index 3f53dbc1dbbefc4609079735fe10d765e2c5f044,41f2aab1d9d8db8147d6ecda5ca298f7413a816f..2ddf4300c954a4ea4d9d2918459bff54399815a5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 47b73f6bfee8c5e41c408fb70dff0e4596c0a3eb0aeba40ad232a6cb1fe75532
 -272dc74fd0304d6a28aaa8798d13e2f950c1a24d92d17519e3c32aef86714586
++acf10b3f8d6675ddf787f7db55a9ff0ec5729adb6fa70b48b13d2cd71862cffd

diff --cc src/sqliteInt.h
Simple merge