Merge latest begin-concurrent changes into this branch.

FossilOrigin-Name: 6f3dd9809fdef7d6195f1f93428a662d5a8c01dba9815daa22d1b94059a2eb43

diff --cc manifest
index 1dc8453b378eb49b765bf2c748002562306c0244,696666ee06cd8987dc74d9d23cd13ace810a436e..ea4acf9884245f23d000efdb18a73da2e5bd26f4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\slatest\sbegin-concurrent\schanges\swith\sthis\sbranch.
- D 2018-07-12T19:39:45.369
 -C Merge\slatest\strunk\sinto\sthis\sbranch.
 -D 2018-09-28T20:58:10.531
++C Merge\slatest\sbegin-concurrent\schanges\sinto\sthis\sbranch.
++D 2018-09-28T21:11:12.916
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
+ F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc c1646e8f86c30ea63e56176deacef192ac87c663ce2c9083f459c45a7268934f
- F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
- F VERSION d3e3afdec1165a5e593dcdfffd8e0f33a2b0186067eb51a073ef6c4aec34923d
+ F Makefile.msc b946f8806a5d401a299453f61de80dfd1a9df14fa4902b299e6465e3c3134872
+ F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
+ F VERSION 654da1d4053fb09ffc33a3910e6d427182a7dcdc67e934fa83de2849ac83fccb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -440,13 -448,13 +448,13 @@@ F src/auth.c 32a5bbe3b755169ab6c66311c5
  F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
  F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 9e56cdf2776ae7405d2a498da0691acffbb9d75d110ca82685e3ab4b9aea0242
 -F src/btree.c e642eb712464ec89d9fe736faac6c10504c75a206555a4ea52ddfc084d2fc2b9
++F src/btree.c b53864f01a02c8cfd535766b2bc773a9af9dca2280093226aa0f22c82cac6178
  F src/btree.h 1ed41c71481a1196a520064f2282bc13d768bbd8ae2850e319a3048f8ee7cb3d
  F src/btreeInt.h 6c65e6c96f561596f6870c79a64d4706af81613881d7947e3f063e923f14115f
- F src/build.c da448a48fc8f4020a9ddcdea0ded1d35513f95e0fca7fdd28beef5b349e88110
+ F src/build.c a15d10c6c26ab15442549ea700c092b4176afc543a83cd9a291cc407c9b576f0
  F src/callback.c 36caff1e7eb7deb58572d59c41cee8f064a11d00297616995c5050ea0cfc1288
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 849d4cebe008cfc6e4799b034a172b4eaf8856b100739632a852732ba66eee48
+ F src/ctime.c b157b01081f92442f8b0218ddb93ddce8ebddad36dbddeecfdd771561dd4f387
  F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
  F src/dbpage.c 4aa7f26198934dbd002e69418220eae3dbc71b010bbac32bd78faf86b52ce6c3
  F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91
@@@ -483,28 -491,28 +491,28 @@@ F src/os.c 8aeb0b0f40f8f5b0da03fe497066
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c 2c6a5a60cd4009863bb56bcb12a60d48c63e27b60809989dc4f5f71ef88e1a7f
- F src/os_win.c ac29c25cde4cfb4adacc59cdec4aa45698ca0e29164ea127859585ccd9faa354
+ F src/os_unix.c b7299be2372ee16aae5964e96faadf21b457823597880a62d1f91b6cb028578e
+ F src/os_win.c 070cdbb400097c6cda54aa005356095afdc2f3ee691d17192c54724ef146a971
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 5feea9c9e681f9150fd1735c003825b32185df0bfa517870d69d4bacd51c4104
- F src/pager.h abf96ba73094af7095f45495734f162642542d841ca563998795fc9447a01e1f
- F src/parse.y 70e577a1b8d580c840ddfef40191d76282d60b224fdbfaa39320c69bec2f4f2d
- F src/pcache.c 135ef0bc6fb2e3b7178d49ab5c9176254c8a691832c1bceb1156b2fbdd0869bd
+ F src/pager.c 656b7561bdbf495da6c88e54db07d97efcf2731bbebccba5cbcf621785197cbe
+ F src/pager.h e0adb223eb6cdf5bbe5352df117d31d6aef4888639fb14ed3f87c0b000f15d71
+ F src/parse.y 9e69c380ac16423a1f373cde66d1be0d14a789f93464705a48dcc812d04d9210
+ F src/pcache.c 4196eb6ed3bbf00b80596c8e0b4f50e57eb7d890c19fb27a7354306abb7f983d
  F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
  F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
- F src/pragma.c 71c585f1d26e14b931fa4573f587933d6dfddecd9d9001b0f126f74f7306bf87
- F src/pragma.h ce41efb7d4cdafca499839f29014d9b1d9534c8f503eeceb88310920c62d6097
- F src/prepare.c e966ecc97c3671ff0e96227c8c877b83f2d33ea371ee190bbf1698b36b5605c0
- F src/printf.c 7f6f3cba8e0c49c19e30a1ff4e9aeda6e06814dcbad4b664a69e1b6cb6e7e365
+ F src/pragma.c 79abc65c08d2754048efee3ba99fe91863dfeab0ba699a4439fa5053ec87cf36
 -F src/pragma.h fb46b1e663128f6827979ad8ebddb55be2a0276ea923c47adeac02144207a682
++F src/pragma.h 2a1aa93fe929659e9ba6da224b27e24c119d1f5246d903b4b632f8c7c4862eca
+ F src/prepare.c f8e260d940a0e08494c0f30744521b2f832d7263eca9d02b050cea0ba144b097
+ F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 797088662ed61102485e3070ba3b3f7828bd5ef6a588223ba6865d77d52f6cea
- F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 2e9661d4424f43ccf595c4a7b4acdf32db523c0f6b31cbd62e6e5a2f43118981
- F src/shell.c.in f1c79c537117ee61317a5ed85cdbcb854998cd690eb34ab803779358a2ace780
- F src/sqlite.h.in 3818a7a023edbca14c433d85ca098e423120b403c89db7179a7dd47748054f31
+ F src/resolve.c bc8c79e56439b111e7d9415e44940951f7087e9466c3a9d664558ef0faf31073
+ F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
+ F src/select.c 33aacf1c17c64a00788c779b23d0875dd0d90eb4c08f867ebc31139ef3a67c95
+ F src/shell.c.in 2162b1dc99b806298207c9c202aa7b49ac8553b8b1e73bb28cd80d5a1861df39
+ F src/sqlite.h.in a680570355022e30f42948a53e0967972b0490e5375bbdb39e4be6e061e62b5c
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 9887b27e69c01e79c2cbe74ef73bf01af5b5703d6a7f0a4371e386d7249cb1c7
- F src/sqliteInt.h 24e6aaa22d7e35c2f5ad2cd3ba3fc6f8a961c0fe95f88e1b08fbd6fd9d668f10
+ F src/sqlite3ext.h 305adca1b5da4a33ce2db5bd236935768e951d5651bfe5560ed55cfcdbce6a63
 -F src/sqliteInt.h 0512c7fc38a2f14f883b427038e38f056ba9ff0ef7c8112d8a21a652207d1c7d
++F src/sqliteInt.h da33706d4a9a832eb5b91365de056fa7ad7ad51879f4ce48a5d85d6774509bb6
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -559,14 -567,14 +567,14 @@@ F src/test_vfs.c 112f1f9271c33c211812e0
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_windirent.c a895e2c068a06644eef91a7f0a32182445a893b9a0f33d0cdb4283dca2486ac1
  F src/test_windirent.h 90dfbe95442c9762357fe128dc7ae3dc199d006de93eb33ba3972e0a90484215
- F src/test_window.c 0d19b33e7a262d3b55e85bc0fb84a70f503686cbd769939176162fe866ce7f9e
+ F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394ba3f
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c 01e96d1b639c3eb0b9ef90616e766d453935c554f1f7aa86b6db937b79554b97
- F src/treeview.c 462346b82a892316a62291791c77e3dd5f1927745fe4a44b846ab4fd16eb28c3
- F src/trigger.c 4ace6d1d5ba9a89822deb287317f33c810440526eafe185c2d8a48c31df1e995
- F src/update.c baabeae51e6af89eeb18548b333b2c28d0a6164ce50093702668ccd6b9bdc488
- F src/upsert.c 47edd408cc73f8d3c00a140550d1ad180b407c146285947969dd09874802bf88
+ F src/tokenize.c 9f55961518f77793edd56eee860ecf035d4370ebbb0726ad2f6cada6637fd16b
+ F src/treeview.c 0ef7dc77d6fe03172ba65dddfd3b3c557b7b7e217ca1963b7665beb266a0e2c0
+ F src/trigger.c d3d78568f37fb2e6cdcc2d1e7b60156f15b0b600adec55b83c5d42f6cad250bd
 -F src/update.c 1816d56c1bca1ba4e0ef98cac2f49be62858e9df1dc08844c7067eb41cc44274
++F src/update.c 31d5208f7c8b129a355ce797bdd2fd70511d18ca6883c77aa816eb4fe486b687
+ F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
  F src/vacuum.c 4879e47105cea12bae7731d353cdee6cba6834e83f1f649483c34719750656ed
@@@ -1162,7 -1180,7 +1182,7 @@@ F test/pagesize.test 5769fc62d8c890a83a
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 012ab6c80d77d8bbae2ac986990a570b0ace565cb7d80a3f160ab973b42ed88c
 -F test/permutations.test 8749e292c8f7e98072049543da8c0fe60e1625f0a9f49068623060984c176bbf
++F test/permutations.test f7b795d607076f364ce1da75fc079c24aaa9e0781d1f64057543d97affcb1674
  F test/pg_common.tcl 301ac19c1a52fd55166d26db929b3b89165c634d52b5f8ad76ea8cb06960db30
  F test/pragma.test 7c8cfc328a1717a95663cf8edb06c52ddfeaf97bb0aee69ae7457132e8d39e7d
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
@@@ -1690,9 -1712,9 +1714,9 @@@ F tool/mkctimec.tcl dd183b73ae1c2824966
  F tool/mkkeywordhash.c 1e5cfcf4cd692ae21e7555604218097a1ee79dad3e366496e5236876255bfcc1
  F tool/mkmsvcmin.tcl cad0c7b54d7dd92bc87d59f36d4cc4f070eb2e625f14159dc2f5c4204e6a13ea
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
- F tool/mkopcodeh.tcl 17d1ccc05a926e19e3a9679ea3e4d1aaa15ba753e2fa7363e6e81c80e0ef8b86
+ F tool/mkopcodeh.tcl 352a4319c0ad869eb26442bf7c3b015aa15594c21f1cce5a6420dbe999367c21
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
- F tool/mkpragmatab.tcl 0d67312ad1a6db29e85215c87e3f5c0cd3a9bf9e32784bf3a02e5ebaf1faadb0
 -F tool/mkpragmatab.tcl 8b9b448b5eb7222d4e3f7afb3c678596784180d319eb4e01c842887ed8213b85
++F tool/mkpragmatab.tcl c9c20b94ea941af9402237b05cd1de855d4ae41bd9d0704b104f51b39405dce3
  F tool/mkshellc.tcl 1f45770aea226ac093a9c72f718efbb88a2a2833409ec2e1c4cecae4202626f5
  F tool/mksourceid.c d458f9004c837bee87a6382228ac20d3eae3c49ea3b0a5aace936f8b60748d3b
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@@ -1759,7 -1781,7 +1783,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 af17432eb135895f9a55115c0eb364745715bb2dc14da01cbb2dc498e61c1853 6a00a34e198408d69d638a25763f64b8a5beec61a60affb4d344426a2e232d72
- R 6e09885c0de4b0f2a7c55adab7598e51
 -P 6a00a34e198408d69d638a25763f64b8a5beec61a60affb4d344426a2e232d72 8467c31aa0bf24e597f680748460a99f425c49f5ab741c3574c339aa56857146
 -R 1919ef646ecc166c430f00d9e3576bab
++P d33527d2231db9eda53124d3e11582a6b2eefa994eb7d9435fb349d3d8522ed7 86750c927cb5ba36acad33d5279629699c42b598e70fdc4887b40a1a16771ff6
++R 0e5381830f238a73f1e9176f90f32f44
  U dan
- Z 722fc0fcd9e8e63a4a855d1ff336c5e5
 -Z 13572c3871d4c12ba67fe966cc0f973b
++Z 69dedca77b9459b14cb1272fada18500

diff --cc manifest.uuid
index 3e7325d06dc923d41c72b35e1688e662173b6abb,6155cd967dcdcf426804991ebc3b0b49f8ca13ab..50c0353befceb113c6bd86563b2b0262eb3c7e2b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d33527d2231db9eda53124d3e11582a6b2eefa994eb7d9435fb349d3d8522ed7
 -86750c927cb5ba36acad33d5279629699c42b598e70fdc4887b40a1a16771ff6
++6f3dd9809fdef7d6195f1f93428a662d5a8c01dba9815daa22d1b94059a2eb43

diff --cc src/btree.c
Simple merge

diff --cc src/pragma.h
Simple merge

diff --cc src/sqliteInt.h
index 254681d3ff39aa6a2c75e070b51a19e584f0529b,5bd4ec24303699b03cc2f4690c38e14c96a042cd..a55372209297373d8fd8cf6f0f47f6bd06691ea5
--- 1/src/sqliteInt.h
--- 2/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@@ -1546,8 -1537,8 +1537,9 @@@ struct sqlite3 
  #define SQLITE_EnableQPSG     0x00800000  /* Query Planner Stability Guarantee*/
  #define SQLITE_TriggerEQP     0x01000000  /* Show trigger EXPLAIN QUERY PLAN */
  #define SQLITE_ResetDatabase  0x02000000  /* Reset the database */
+ #define SQLITE_LegacyAlter    0x04000000  /* Legacy ALTER TABLE behaviour */
  
 +#define SQLITE_NoopUpdate     0x01000000  /* UPDATE operations are no-ops */
  /* Flags used only if debugging */
  #ifdef SQLITE_DEBUG
  #define SQLITE_SqlTrace       0x08000000  /* Debug print SQL as it executes */

diff --cc src/update.c
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc tool/mkpragmatab.tcl
Simple merge