Merge latest begin-concurrent changes into this branch.

FossilOrigin-Name: 76608f750ab13c0a165def9672759fee43cf4e9895df3bfa21765e08358b07a0

diff --cc manifest
index ea4acf9884245f23d000efdb18a73da2e5bd26f4,9f47a5e200a621c7237943f0a5b7b741c7fd8c0b..e89604258e36a2a0bc8b4aa9ab269c5484e4bd64
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
 -C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
 -D 2018-11-26T07:21:06.879
 +C Merge\slatest\sbegin-concurrent\schanges\sinto\sthis\sbranch.
- D 2018-09-28T21:11:12.916
++D 2018-11-26T07:34:33.644
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
+ F Makefile.in b730006b54c990461d864c5387f2e6f13aadb0236804555fb010ed6865a5f058
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc b946f8806a5d401a299453f61de80dfd1a9df14fa4902b299e6465e3c3134872
+ F Makefile.msc 071853dfc2148aadaeb7a153b9986cc9d71b7f256874f79b119f97a4c89453f5
  F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
  F VERSION 654da1d4053fb09ffc33a3910e6d427182a7dcdc67e934fa83de2849ac83fccb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -448,18 -451,18 +451,18 @@@ F src/auth.c 0fac71038875693a937e506bce
  F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
  F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c b53864f01a02c8cfd535766b2bc773a9af9dca2280093226aa0f22c82cac6178
 -F src/btree.c 4ad4c92bbd327b72cc7b3444de6b6d0f416e29ef0b21b2c3ec16165ba4070804
++F src/btree.c 4a2184be69d491d4b0228d4e397d67cb0802bbec06e7615b485ea1af69a131f6
  F src/btree.h 1ed41c71481a1196a520064f2282bc13d768bbd8ae2850e319a3048f8ee7cb3d
  F src/btreeInt.h 6c65e6c96f561596f6870c79a64d4706af81613881d7947e3f063e923f14115f
- F src/build.c a15d10c6c26ab15442549ea700c092b4176afc543a83cd9a291cc407c9b576f0
- F src/callback.c 36caff1e7eb7deb58572d59c41cee8f064a11d00297616995c5050ea0cfc1288
+ F src/build.c ce4de1bc5dc01a901c3d39b76a11f77f4d61ed49b9c66329facb995bcad599f7
+ F src/callback.c 789bd33d188146f66c0dd8306472a72d1c05f71924b24a91caf6bd45cf9aba73
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c b157b01081f92442f8b0218ddb93ddce8ebddad36dbddeecfdd771561dd4f387
+ F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
  F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
- F src/dbpage.c 4aa7f26198934dbd002e69418220eae3dbc71b010bbac32bd78faf86b52ce6c3
- F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91
- F src/delete.c 107e28d3ef8bd72fd11953374ca9107cd74e8b09c3ded076a6048742d26ce7d2
- F src/expr.c 5cee8fb79b1952689af80ed71ed16ad295f29d85de30c7592993b05cf1ec1e06
+ F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
+ F src/dbstat.c 3c8bd4e77f0244fd2bd7cc90acf116ad2f8e82d70e536637f35ac2bc99b726f9
+ F src/delete.c cec65c0e74be7492cafba1b77580732b0b1a41a4dbc4ac70909ac44b65b2a20b
+ F src/expr.c 9aacc0b72348ba90010b672dcbbbe2fa56e1182043bc917a3a147b2bc57a5497
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 972a4ba14296bef2303a0abbad1e3d82bc3c61f9e6ce4e8e9528bdee68748812
  F src/func.c 7c288b4ce309b5a8b8473514b88e1f8e69a80134509a8c0db8e39c858e367e7f
@@@ -491,28 -494,28 +494,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 b7299be2372ee16aae5964e96faadf21b457823597880a62d1f91b6cb028578e
- F src/os_win.c 070cdbb400097c6cda54aa005356095afdc2f3ee691d17192c54724ef146a971
+ F src/os_unix.c 86eca42c3d955bebea0082450f978e5633448235f03f86b27a02538bb26e7fff
+ F src/os_win.c 85d9e532d0444ab6c16d7431490c2e279e282aa0917b0e988996b1ae0de5c5a0
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 656b7561bdbf495da6c88e54db07d97efcf2731bbebccba5cbcf621785197cbe
- F src/pager.h e0adb223eb6cdf5bbe5352df117d31d6aef4888639fb14ed3f87c0b000f15d71
+ F src/pager.c 0d44fbfa5b28b692c443fc10b6231dca6eaff9265d5612828a23e451448750ab
+ F src/pager.h 18b019127aaba93fbc69274377816b80268d40c7233d0f7ee61d2ce3e842d223
  F src/parse.y 9e69c380ac16423a1f373cde66d1be0d14a789f93464705a48dcc812d04d9210
- F src/pcache.c 4196eb6ed3bbf00b80596c8e0b4f50e57eb7d890c19fb27a7354306abb7f983d
- F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
+ F src/pcache.c 696a01f1a6370c1b50a09c15972bc3bee3333f8fcd1f2da8e9a76b1b062c59ee
+ F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
- F src/pragma.c 79abc65c08d2754048efee3ba99fe91863dfeab0ba699a4439fa5053ec87cf36
- F src/pragma.h 2a1aa93fe929659e9ba6da224b27e24c119d1f5246d903b4b632f8c7c4862eca
- F src/prepare.c f8e260d940a0e08494c0f30744521b2f832d7263eca9d02b050cea0ba144b097
+ F src/pragma.c a2eab23fbf7c70c28f3a22629de2662d052c22853649430be302b910719574de
 -F src/pragma.h fdd03d78a7497f74a3f652909f945328480089189526841ae829ce7313d98d13
++F src/pragma.h 7003ea8e45e5da0a7cd6d35846214f9ae9ecf5be66b268415ceea5855324af11
+ F src/prepare.c f81f8d707e583192c28fea0b2e19385415b7d188123b23f49b038076408d7a69
  F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  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/select.c 61e867a906f140b73baf4ce7a201ad6dcba30820969f5618ee40e9a0d32c6f5f
+ F src/shell.c.in 6a9d8a56700d136addc14d1cd25863b8112e5c12e1877f373750bda476ff6314
+ F src/sqlite.h.in 41dfd60cf62d4f8756991517c1a9d2ff4977ca04f7798c10b0c16dcf884cbc7e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 305adca1b5da4a33ce2db5bd236935768e951d5651bfe5560ed55cfcdbce6a63
- F src/sqliteInt.h da33706d4a9a832eb5b91365de056fa7ad7ad51879f4ce48a5d85d6774509bb6
+ F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
 -F src/sqliteInt.h 55a16ddcfa4afd0f0256f56fc324dd3c96d33d98241d0f401627c6d70a21e00a
++F src/sqliteInt.h b9f89d79c047df09c1efe2dfe054512cf956780af468daef9d368b319dc68aa7
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -570,10 -573,10 +573,10 @@@ F src/test_windirent.h 90dfbe95442c9762
  F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394ba3f
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c 9f55961518f77793edd56eee860ecf035d4370ebbb0726ad2f6cada6637fd16b
- F src/treeview.c 0ef7dc77d6fe03172ba65dddfd3b3c557b7b7e217ca1963b7665beb266a0e2c0
+ F src/tokenize.c 9e781e1ca80eefe7b5d6a9e2cd5c678c847da55fd6f093781fad7950934d4c83
+ F src/treeview.c 7b12ac059de54c939b6eb0dbffc9410c29c80d2470cee5cbe07d5ff9ea2d9253
  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
@@@ -1182,12 -1188,12 +1190,12 @@@ F test/pagesize.test 5769fc62d8c890a83a
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test f7b795d607076f364ce1da75fc079c24aaa9e0781d1f64057543d97affcb1674
 -F test/permutations.test cf0b4e498db1d0143c19641d4420df7cc27fab2c95ed0abd2c7c5753beab25b8
++F test/permutations.test 4a991666f8840fe1c7cbf20d29ea75cdc76f4a6fc6b647a760924f8eb2f4e88b
  F test/pg_common.tcl 301ac19c1a52fd55166d26db929b3b89165c634d52b5f8ad76ea8cb06960db30
- F test/pragma.test 7c8cfc328a1717a95663cf8edb06c52ddfeaf97bb0aee69ae7457132e8d39e7d
+ F test/pragma.test c267bf02742c823a191960895b3d52933cebd7beee26757d1ed694f213fcd867
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
- F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
- F test/pragma4.test 3046501bee2f652dc2a4f9c87781e2741361d6864439c8381aba6c3b774b335c
+ F test/pragma3.test 8300aa9c63cff1027006ca34bf413a148abbd6dcd471fa9a1ded322fe18c0df9
+ F test/pragma4.test 12d0088e52d4e193f57eb0271d194ec1d7bc2031d874f915541f1b0ff80bb407
  F test/pragma5.test 824ce6ced5d6b7ec71abe37fc6005ff836fe39d638273dc5192b39864b9ee983
  F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
  F test/printf.test a3e559bc9d922e7fe44e9d05c6965fee34fe3bc28300a4248c6a063425246ffd
@@@ -1716,7 -1722,7 +1724,7 @@@ F tool/mkmsvcmin.tcl cad0c7b54d7dd92bc8
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl 352a4319c0ad869eb26442bf7c3b015aa15594c21f1cce5a6420dbe999367c21
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
- F tool/mkpragmatab.tcl c9c20b94ea941af9402237b05cd1de855d4ae41bd9d0704b104f51b39405dce3
 -F tool/mkpragmatab.tcl a1334e70a08fdf5de32cd0093613212bb11ac8f880487540987175c536ac335f
++F tool/mkpragmatab.tcl d5112b04ad7bd35a09a16fda9d968292fd00e11b0a5b32b0664ff6e444a5a9b3
  F tool/mkshellc.tcl 1f45770aea226ac093a9c72f718efbb88a2a2833409ec2e1c4cecae4202626f5
  F tool/mksourceid.c d458f9004c837bee87a6382228ac20d3eae3c49ea3b0a5aace936f8b60748d3b
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@@ -1783,7 -1789,7 +1791,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 d33527d2231db9eda53124d3e11582a6b2eefa994eb7d9435fb349d3d8522ed7 86750c927cb5ba36acad33d5279629699c42b598e70fdc4887b40a1a16771ff6
- R 0e5381830f238a73f1e9176f90f32f44
 -P 86750c927cb5ba36acad33d5279629699c42b598e70fdc4887b40a1a16771ff6 773c5c1d9c0ec40c51949c38c9dc17e778086f3f92791cca9b85288de0076dab
 -R 5fcb16e04646c97b4775efdbb6230b3e
++P 6f3dd9809fdef7d6195f1f93428a662d5a8c01dba9815daa22d1b94059a2eb43 28a615a2e0f48b0fee3eaf7841ff902e069fa6c221df6ad9a57b8709c88561fb
++R c73a7474a8ba36fb4e79620530d56018
  U dan
- Z 69dedca77b9459b14cb1272fada18500
 -Z c7ffab1d14e56238122250d4de0089ab
++Z 4a9121244def783d11e1880a226f98cc

diff --cc manifest.uuid
index 50c0353befceb113c6bd86563b2b0262eb3c7e2b,f4e00feddce471211089ef721d523327cc2983de..04bacb7327fe4dd8e7c840a052356af7c4030602
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6f3dd9809fdef7d6195f1f93428a662d5a8c01dba9815daa22d1b94059a2eb43
 -28a615a2e0f48b0fee3eaf7841ff902e069fa6c221df6ad9a57b8709c88561fb
++76608f750ab13c0a165def9672759fee43cf4e9895df3bfa21765e08358b07a0

diff --cc src/btree.c
Simple merge

diff --cc src/pragma.h
Simple merge

diff --cc src/sqliteInt.h
index a55372209297373d8fd8cf6f0f47f6bd06691ea5,b8adb59ae049f837f582c203c97cfdd6d33e91fa..12a9f38867b88d1010d0f984531de13e609a1404
--- 1/src/sqliteInt.h
--- 2/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@@ -1538,15 -1540,17 +1540,18 @@@ struct sqlite3 
  #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_NoSchemaError  0x08000000  /* Do not report schema parse errors*/
+ #define SQLITE_Defensive      0x10000000  /* Input SQL is likely hostile */
  
 +#define SQLITE_NoopUpdate     0x01000000  /* UPDATE operations are no-ops */
  /* Flags used only if debugging */
+ #define HI(X)  ((u64)(X)<<32)
  #ifdef SQLITE_DEBUG
- #define SQLITE_SqlTrace       0x08000000  /* Debug print SQL as it executes */
- #define SQLITE_VdbeListing    0x10000000  /* Debug listings of VDBE programs */
- #define SQLITE_VdbeTrace      0x20000000  /* True to trace VDBE execution */
- #define SQLITE_VdbeAddopTrace 0x40000000  /* Trace sqlite3VdbeAddOp() calls */
- #define SQLITE_VdbeEQP        0x80000000  /* Debug EXPLAIN QUERY PLAN */
+ #define SQLITE_SqlTrace       HI(0x0001)  /* Debug print SQL as it executes */
+ #define SQLITE_VdbeListing    HI(0x0002)  /* Debug listings of VDBE progs */
+ #define SQLITE_VdbeTrace      HI(0x0004)  /* True to trace VDBE execution */
+ #define SQLITE_VdbeAddopTrace HI(0x0008)  /* Trace sqlite3VdbeAddOp() calls */
+ #define SQLITE_VdbeEQP        HI(0x0010)  /* Debug EXPLAIN QUERY PLAN */
  #endif
  
  /*

diff --cc test/permutations.test
Simple merge

diff --cc tool/mkpragmatab.tcl
Simple merge