Merge enhancements and the ALTER TABLE bug fix from trunk.

FossilOrigin-Name: edfc2acfcd161d962996e2b4c74c6c6e6db1473d9e98ae8f533e26583d346248

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 20e203bb088eaad4053515005f31e074ff9b2e68,06972a00ce30536e9d5b12ed23db14a482a126e9..344a57758e59fbbadfbb402fae495e03b743726c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sthe\spre-3.26.0\sfixes\sfrom\strunk.
- D 2018-11-30T18:22:49.115
 -C Simplifications\sto\sthe\ssqlite3_normalized_sql()\simplementation.
 -D 2018-12-05T17:48:57.422
++C Merge\senhancements\sand\sthe\sALTER\sTABLE\sbug\sfix\sfrom\strunk.
++D 2018-12-05T18:28:17.509
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 738271772391d5c571420b38ae7edee6908c90a72a1d32d6ea095df735f2221f
 -F Makefile.in 68d0ba0f0b533d5bc84c78c13a6ce84ee81183a67014caa47a969e67f028fa1c
++F Makefile.in 40d332717dc64bc82596760a5f9354733922a89bb0f09add0346e0823cac850b
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 0d6831ff7951b302e888d86d4c469e2ec3c22f59eba4118b8c38d5a51d9e2d4f
+ F Makefile.msc b7d4a710fa3f0b8cfc532ff195b85dc1ba2a8ad34343cb3d67639f28f0a24306
  F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
  F VERSION 654da1d4053fb09ffc33a3910e6d427182a7dcdc67e934fa83de2849ac83fccb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -431,7 -429,7 +432,7 @@@ F ext/userauth/userauth.c f81aa5a3ecacf
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 8e144f0e3fef3b8eda11764d6bb43dcddb20d3216300fe41a1390632533a1470
 -F main.mk 55f94164ecc194b067d9c55e106f37fd3c9b39f9668e8b568c98f008b6f9ec90
++F main.mk d83e71893f66f0ad99a82db72cb73d1524e13318f9f84aed856d6310b90a4bf7
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -450,11 -448,11 +451,11 @@@ F src/auth.c 0fac71038875693a937e506bce
  F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c ba7c7eef4461790f37c309936bfc5d0d6ba9b194b02d3c8ff1fd53b420ea6d3b
 +F src/btree.c 35097c9e303aa3d2d7c9221e3449e75a9208e71143c540018ed02c5b739e08d8
  F src/btree.h febb2e817be499570b7a2e32a9bbb4b607a9234f6b84bb9ae84916d4806e96f2
 -F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
 +F src/btreeInt.h 5903b9a6710110a483a0501a708fd09975357e7cdc98300208a2071ad7d1750b
- F src/build.c 127d33ad57b455a9339e9fabff41284c8b030cc6247ca7a2a6c0ad7abfc1ce85
- F src/callback.c 789bd33d188146f66c0dd8306472a72d1c05f71924b24a91caf6bd45cf9aba73
+ F src/build.c fce47a9789704e65c63299b01be8153745faee7919f5137d3f29b7c3c0b549bd
+ F src/callback.c 25dda5e1c2334a367b94a64077b1d06b2553369f616261ca6783c48bcb6bda73
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
  F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
@@@ -470,10 -468,10 +471,10 @@@ F src/hash.c a12580e143f10301ed5166ea49
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 6b81aae27b196925d8ff78824f4bbd435d6a40cd38dc324685e21735bb402109
+ F src/insert.c f12f27eb606d601825be9a229a7390a8d64d40226697883f96de8e088d620055
 -F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
 +F src/legacy.c 83f4499122392b1f1527a5180b1e89951bf640611ce98768bde1a9f28f0f7dde
  F src/loadext.c 9050dd153b5583804184be9c9dee9ebb554178d6db1f8ac280899e8aad9060e6
- F src/main.c d6b6e142b6c18f41ce5090faca2a9a3befcad21c5d9ea629f3d39d818166b9f4
 -F src/main.c 5a94791735ddd51804b75b7ef4645c25cbe6fe1d0e8f25851b2ed1211ad3d076
++F src/main.c 34cfefe1f2f9ff0512e9dc8f54e449ff76012de5a076b17c625d44b4d10c5d16
  F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -493,29 -491,28 +494,29 @@@ F src/os.c 4c1e6111a933d8167f4b4f38d3b3
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c f6e91b8fd82af7afbfd073c4974ad6cdb8e62d9f65ceddb45167835a0567fdc0
 -F src/os_win.c 85d9e532d0444ab6c16d7431490c2e279e282aa0917b0e988996b1ae0de5c5a0
 +F src/os_unix.c 21faa3e6e4183c48756a8dab6f8f6d017b24e636c3266ebc3a973b64cc00734a
 +F src/os_win.c 340cb5909334c4ba748987dff2510498e3885bb24c2d9c7632794ed31279f0b5
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 75e0f3cfa3962c714f519f8a3d1e67ecca1c91de0e010a036b988e40ce9e4c73
 -F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3
 +F src/pager.c 9e977cf7e340cfc6a17a27de503bad377aa8952105990a2f0089bfbff63d8cb1
 +F src/pager.h 0acf77fd717a46c304f52405e19a550101a9efda29154af00d34eedcb7f1d50b
- F src/parse.y 6840fe7c0b5eb4dd25ee5d075213bc8255ed4c0678d71bfb6744d0520d91c179
+ F src/parse.y 5cf85c2b9dfac38ac4e2bf2776484705186ce2eda8631e65cc0b04bf566c1173
  F src/pcache.c 696a01f1a6370c1b50a09c15972bc3bee3333f8fcd1f2da8e9a76b1b062c59ee
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
- F src/pcache1.c 526fbd54dfef9744506c03308120bb3ec660b8ea17f8c01798fd386859657c69
 -F src/pcache1.c ad0ffc5b35b0280d045ac569d34d4b842e3e6a4a118f6396b320987a0957afcc
 -F src/pragma.c 4e056f042683b99c4ea0db395f68d051b1a95833ab40951c40d3ef7e1fee1354
++F src/pcache1.c 79fa98a1d15116ec977e8d1b502e856c92fe0db056ed46adc5bf24dbf1564cbc
 +F src/pragma.c cf832d9d6fa7699e1c6c18f73b847d3870f8089f8f16f64f3256da6f0911059a
  F src/pragma.h fdd03d78a7497f74a3f652909f945328480089189526841ae829ce7313d98d13
- F src/prepare.c f0cc0876b3f5573e2f9aa2089dc3bc73a32d75102ed4a8bc21344e4d010f2575
 -F src/prepare.c f77ebf812f46a174e805d939cec0017771904e79049d04edf66dbbb3ec25ad3e
++F src/prepare.c 2a17c1ffa1e7e5b4e1203083ac8ce43d95fc5cb82e0088d1a8797668bef507c7
  F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 4cfc44def0f0690ceaab8f6481f5d76284d7f9509aab6e218a679b4836a54614
+ F src/resolve.c 976e7879286a1eecdc71ceff64f6d1b3f58c8f8096537ba668b3dc0887f410c1
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
  F src/select.c 61e867a906f140b73baf4ce7a201ad6dcba30820969f5618ee40e9a0d32c6f5f
- F src/shell.c.in 482e23a370cbe5b0d4c73a0f0f5fce34f7caa08a14a8d75e12f0225c4e14915c
+ F src/shell.c.in 1f0819e69fb1ebd2eb44695530dc43936608bf9b752981a0ffd4e2e4a9e3883d
 -F src/sqlite.h.in cce9feede1c1c03923c091b4bbbd081dd77aaf92024cc2cdbf65f712c2f668c3
 +F src/sqlite.h.in 4eea81c4ffc0adeaca97249fc99a2ab6f85f3a7739a7f07ac6afe6ff0f44ee03
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
- F src/sqliteInt.h d740a15b9e6d1fcc8e0a3fcf32053c447a674027b67fc5195f695a82a85d7573
 -F src/sqliteInt.h e96520f27310016d0dabb496e13346244bbea83a6adc3134810e026f1d4a02b6
++F src/sqliteInt.h 5d9b564fee253249768ad32d4a9cd76b8db3afeed09a98be4a53fa5e96b1a0c6
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -581,11 -578,11 +582,11 @@@ F src/upsert.c 0dd81b40206841814d46942a
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
  F src/vacuum.c 836cadc922de866c849e23a75f93d344cdc143d388339305d09a3fed27e8798d
 -F src/vdbe.c 005e691ea4c7d51e6c1a69d9389aeb34700884c85f51681817ddea3fdc2fc39b
 +F src/vdbe.c 6659e80c5b83ecba5eb6f8e828606bc8205e6cd25006ccc6107f355e6e160437
  F src/vdbe.h 5081dcc497777efe5e9ebe7330d283a044a005e4bdda2e2e984f03bf89a0d907
  F src/vdbeInt.h 437e6c6af679fdf157867eb83a8adc6cf5145d6774453c2214cfd0bd01d92980
- F src/vdbeapi.c 373eebe4072c89790da638759c05e1c426edca3735c2f68ca1886dfd68ba1eb5
- F src/vdbeaux.c f547901b1aa9e2d81c63f06893f633648e434180666a827aacb547d7d6c8a601
 -F src/vdbeapi.c 9ac7e3946a2762b79c314922c84c7de30731e0ed1d7c94ac82266b795221d9d7
++F src/vdbeapi.c d9fafa56c8e2a20a941fe147d57fe2cdf0f2b2d74f15cd905ae75bd4746b8d61
+ F src/vdbeaux.c 8e2fe020824b743090025ff6f9ffeec3ca4624523ddb2d1af1b1f61abaab3db4
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
  F src/vdbemem.c 7b3305bc4a5139f4536ac9b5f61da0f915e49d2e3fdfa87dfdfa9d7aba8bc1e9
  F src/vdbesort.c 90aad5a92608f2dd771c96749beabdb562c9d881131a860a7a5bccf66dc3be7f
@@@ -1784,7 -1782,7 +1787,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 e8c20a88c14d496fc79dddcac5db0a47aa037598b3b65a07e4422f7df75cce2c 33576b12b450a37b467ba012e77b297eb80d7147b12a5b23302009bb32455720
- R b063a9d5e86fee2a41ce39f41ed77283
 -P f44bc7a8b3fac82aa5598e9bdaf65ea4dd3c331cf90c1d5ba26ff1698e92c230
 -R 14f7302635d9f1332de56d5fb4d8f1a4
++P 2c76ce4f42c486c7c2ead64a602ae02eaefcb1438ed1d401221a2e0ff6c9cf23 94ea6379178e3ff6a0d1d5819ca4ac558bdadb1ca8a3637c797079db7dc0cd61
++R 47bc5abfc858bc7dffd8b8adc10ae632
  U drh
- Z fdc6397dcf4f07e7e4d4a994dae2171f
 -Z b51bb6387d49f37b8a1232489a1c6ba3
++Z e0ff2b6056c228f5a80213a5b0742031

diff --cc manifest.uuid
index 40dbdd0b37af8ad4b65a77ec695be7bc74a7d655,6334ab25e4199092d2ae72eb5155a8aeb7c7a226..89ceed402feb5984c1fe9577649e9462979b1538
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2c76ce4f42c486c7c2ead64a602ae02eaefcb1438ed1d401221a2e0ff6c9cf23
 -94ea6379178e3ff6a0d1d5819ca4ac558bdadb1ca8a3637c797079db7dc0cd61
++edfc2acfcd161d962996e2b4c74c6c6e6db1473d9e98ae8f533e26583d346248

diff --cc src/main.c
Simple merge

diff --cc src/pcache1.c
Simple merge

diff --cc src/prepare.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge