Merge ALTER TABLE and sqlite3_normalized_sql() bug fixes from trunk.

FossilOrigin-Name: 3793e5d5d60f909480c83bc2a6473d27e414d69b0c0e3289413c9bfd2f15bb08

diff --cc manifest
index 666b467b8bba8f25a37a8641aeaa1fa83dcf57cd,35793a687bb359c085744799de4baf7bc0f58c5d..a466a3074dc8fcc516073b939f80c5b5db0e8d31
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\senhancements\sfrom\strunk,\sespecially\sthe\ssqlite3_normalized_sql()\nenhancement.
- D 2018-12-05T13:49:23.731
 -C Merge\sALTER\sTABLE\sand\ssqlite3_normalized_sql()\sfixes\sfrom\strunk.
 -D 2018-12-06T00:05:18.923
++C Merge\sALTER\sTABLE\sand\ssqlite3_normalized_sql()\sbug\sfixes\sfrom\strunk.
++D 2018-12-06T00:08:48.697
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 68d0ba0f0b533d5bc84c78c13a6ce84ee81183a67014caa47a969e67f028fa1c
@@@ -463,13 -463,13 +463,13 @@@ F src/date.c ebe1dc7c8a347117bb02570f1a
  F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
  F src/dbstat.c 3c8bd4e77f0244fd2bd7cc90acf116ad2f8e82d70e536637f35ac2bc99b726f9
  F src/delete.c f7938125847e8ef485448db5fbad29acb2991381a02887dd854c1617315ab9fb
- F src/expr.c 9aacc0b72348ba90010b672dcbbbe2fa56e1182043bc917a3a147b2bc57a5497
+ F src/expr.c a3e90131d7f92b77a6a6ae2e71f0d2882237041ed11dbe3c914e5e278ddc2d24
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 972a4ba14296bef2303a0abbad1e3d82bc3c61f9e6ce4e8e9528bdee68748812
 -F src/func.c 7c288b4ce309b5a8b8473514b88e1f8e69a80134509a8c0db8e39c858e367e7f
 +F src/func.c 8efa2c813b3f6a831a070311b5bcbc97993b79cbcd274bdb49bde56ccd3d37bc
  F src/global.c 8291eee0782b83124de14ec0389ec9fd6ae1873358a6b0d9469fe17a46ad803b
- F src/hash.c 6d2f67276469384fb8784fb8e962deeaae6832955626468325d705a01b999594
- F src/hash.h eebf2250e56b5d5353b873406557e373d2888cf51f111e28917666456d479e85
+ F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a
+ F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c f12f27eb606d601825be9a229a7390a8d64d40226697883f96de8e088d620055
@@@ -505,18 -505,18 +505,18 @@@ F src/pcache.c 696a01f1a6370c1b50a09c15
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c ad0ffc5b35b0280d045ac569d34d4b842e3e6a4a118f6396b320987a0957afcc
  F src/pragma.c 4e056f042683b99c4ea0db395f68d051b1a95833ab40951c40d3ef7e1fee1354
 -F src/pragma.h fdd03d78a7497f74a3f652909f945328480089189526841ae829ce7313d98d13
 +F src/pragma.h 7003ea8e45e5da0a7cd6d35846214f9ae9ecf5be66b268415ceea5855324af11
- F src/prepare.c 277c8af17124bd4f67ae6e1a8e795a91f12bf7ce3a4b344c7eac46d360250c20
+ F src/prepare.c 66b5f9791a3ef57131cbba58c33104ebea814a70a5cfcafabf5aed5a3e3858fe
  F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381
 -F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 +F src/random.c f27af4099afaea7284ade5c206224dcfdb2334cfd119d018b470d46356b3f27d
  F src/resolve.c 976e7879286a1eecdc71ceff64f6d1b3f58c8f8096537ba668b3dc0887f410c1
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 -F src/select.c 61e867a906f140b73baf4ce7a201ad6dcba30820969f5618ee40e9a0d32c6f5f
 +F src/select.c e1cad752987c476a9d1d053682558caec048ea799ef7ba1b6e38e2266451010d
  F src/shell.c.in 1f0819e69fb1ebd2eb44695530dc43936608bf9b752981a0ffd4e2e4a9e3883d
  F src/sqlite.h.in 0880d9e366c2b0e1cbc40d32c2671e67c7bc7e9cb7f7298956c254ca8845c702
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
- F src/sqliteInt.h 399dc79d2fd00a060294d2d637c5065da511f552c26c274136a6b1d653dec07d
 -F src/sqliteInt.h 047518350096c8661599cf47dbf8582e77f6680c2ca7c1df16be528b243d532a
++F src/sqliteInt.h 6710aa71135f8d16bd616f62a901c887df882d892df152a502b5ccc94b7ef619
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1795,7 -1795,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 85fd92c71fd5b29bd45bb1717a5be761600fc23bed12eaff9eed708701a0fdf7 47b73f6bfee8c5e41c408fb70dff0e4596c0a3eb0aeba40ad232a6cb1fe75532
- R f5c4a734b93f0cfb5050e78ecedd5cc2
 -P 47b73f6bfee8c5e41c408fb70dff0e4596c0a3eb0aeba40ad232a6cb1fe75532 272dc74fd0304d6a28aaa8798d13e2f950c1a24d92d17519e3c32aef86714586
 -R a30346ad445bd4b3c872d0608edad37a
++P 342c9538d9c6a993ac0acaa6f74ad58886bcef7bb53783d053f9b24c131aec5d acf10b3f8d6675ddf787f7db55a9ff0ec5729adb6fa70b48b13d2cd71862cffd
++R f29cb469f2c6a9da9643ab919de7b25e
  U drh
- Z 9ac2790769c3800c64245b58c8bae081
 -Z a9e804540ce5cd2c79b5ce88d89da2d3
++Z 271adff7c8392a332960561b0b6094cc

diff --cc manifest.uuid
index ecb1c1ee6322527d2bd8dd1b35d4dc1eae588249,2ddf4300c954a4ea4d9d2918459bff54399815a5..f022b88c707e0010ecef398b3598928bf72fad3b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 342c9538d9c6a993ac0acaa6f74ad58886bcef7bb53783d053f9b24c131aec5d
 -acf10b3f8d6675ddf787f7db55a9ff0ec5729adb6fa70b48b13d2cd71862cffd
++3793e5d5d60f909480c83bc2a6473d27e414d69b0c0e3289413c9bfd2f15bb08

diff --cc src/sqliteInt.h
Simple merge