Merge the read-only shadow table and defensive mode enhancments from trunk.

FossilOrigin-Name: 977fc44e65f831d4c6184073f44708567081f358904dd76e8df5a82a17977469

diff --cc Makefile.in
Simple merge

diff --cc ext/rtree/rtree.c
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 4a5353941bdeda552459610a91465b008d297aad,f938831465eb12de015ea761073225a235f4a772..1d87d22c6bee4bdb9ac4ac0b35e21d650833e69d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sfixes\sfrom\strunk.
- D 2018-11-09T23:45:56.671
 -C Add\ssupport\sfor\sread-only\sshadow\stables\son\svirtual\stables.\s\sAdded\sthe\nSQLITE_DEFAULT_DEFENSIVE\scompile-time\soption\sthat\scan\sput\sSQLite\sin\s\ndefensive\smode\sby\sdefault.
 -D 2018-11-10T18:23:32.590
++C Merge\sthe\sread-only\sshadow\stable\sand\sdefensive\smode\senhancments\sfrom\strunk.
++D 2018-11-10T20:07:51.971
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 3a56f62536fe986f09ec6c856cf01ac684528b81db66405fe3661b6ea8598c31
 -F Makefile.in d298b31769d4c737887102462cd45684786b09f2a626a80b3e413790fb436219
++F Makefile.in e96b7177ec3bcb9d9da7115307ccdd286c8aa4e1be24d6c07a8b277b0403acbc
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 5402eae167757dae275cd99c21d21d77db2ec1877c58b4f790ef747a60b95c9f
+ F Makefile.msc 071853dfc2148aadaeb7a153b9986cc9d71b7f256874f79b119f97a4c89453f5
  F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
  F VERSION 654da1d4053fb09ffc33a3910e6d427182a7dcdc67e934fa83de2849ac83fccb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -358,11 -358,11 +358,11 @@@ F ext/repair/sqlite3_checker.c.in 4a5a3
  F ext/repair/sqlite3_checker.tcl a9a2caa9660567257c177a91124d8c0dccdfa341e25c51e6da7f1fd9e601eafa
  F ext/repair/test/README.md 34b2f542cf5be7bffe479242b33ee3492cea30711e447cc4a1a86cb5915f419e
  F ext/repair/test/checkfreelist01.test 3e8aa6aeb4007680c94a8d07b41c339aa635cc78249442da72ff3f8297398a69
- F ext/repair/test/checkindex01.test 6945d0ffc0c1dc993b2ce88036b26e0f5d6fcc65da70fc9df27c2647bb358b0f
+ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c335096108c12c01bddbadcec
  F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/geopoly.c 2464b3325fcc2878ed08458efeb995f830f4eef28bbf3da9757c4bd95e6f9549
- F ext/rtree/rtree.c b697b3824d5aa2c90da01c8166c8b38cd84cfc3d5960956ca3f5fb880fb0806c
+ F ext/rtree/geopoly.c 38ad90cab8dbd3dfba246d642f47366e40418e47fa55fe89f1078483d51b52c0
 -F ext/rtree/rtree.c 7125183bf6c37b8b8ee1a04d2b0fe258531fd31650fdd050ed041817f1943d17
++F ext/rtree/rtree.c 073289c3139481b5a0277a503c77e5744b6803c99ed62ffa7970f28caa76ac7f
  F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
  F ext/rtree/rtree1.test 309afc04d4287542b2cd74f933296832cc681c7b014d9405cb329b62053a5349
  F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2
@@@ -429,7 -428,7 +431,7 @@@ F ext/userauth/userauth.c f81aa5a3ecacf
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 23b63a68cd5d5d1f6968076ff1987889a873051052db06803c98ddeb560cbe74
 -F main.mk ddb6616776c53dfc06bb3f8396df8721c8b699294271fd0c3d110dd278d9c723
++F main.mk 79b31b61830f98f97c851d2be0ac4bac01dcab4ce22eea171e16beb2a69dc73d
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -448,10 -447,10 +450,10 @@@ F src/auth.c 0fac71038875693a937e506bce
  F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c 3ef104ecae8b1b5f0458be1f5fa7c1ecf25fdc322a9d63bb8151f89eb32d381e
 +F src/btree.c 9e94292b7825259a1f499cd758939a27dab798f01340ed0c3334d5918706e011
  F src/btree.h febb2e817be499570b7a2e32a9bbb4b607a9234f6b84bb9ae84916d4806e96f2
 -F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
 +F src/btreeInt.h 5903b9a6710110a483a0501a708fd09975357e7cdc98300208a2071ad7d1750b
- F src/build.c a614b226b9af1e49ec6d0ffbf3aa0d38a73123336a7f78930005db939d038253
+ F src/build.c 5bc91901b05ac7a33a324854bd2aa892311e71b82a887f99f390bead39e29175
  F src/callback.c 789bd33d188146f66c0dd8306472a72d1c05f71924b24a91caf6bd45cf9aba73
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
@@@ -469,9 -468,9 +471,9 @@@ F src/hash.h ab34c5c54a9e9de2e790b24349
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 6b81aae27b196925d8ff78824f4bbd435d6a40cd38dc324685e21735bb402109
 -F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
 +F src/legacy.c 83f4499122392b1f1527a5180b1e89951bf640611ce98768bde1a9f28f0f7dde
  F src/loadext.c 448eab53ecdb566a1259ee2d45ebff9c0bc4a2cf393774488775c33e4fbe89bf
- F src/main.c 80c1a64ed2b4bafbdedbb896169d9280b509a2a5f55b8e1f554a0a72ede3df7f
 -F src/main.c 0efc9f6fba87f7b406135062c9a1f00c5f73487730e38794c698be5f78cfea54
++F src/main.c 96d86f17b57e007f7bce42f4ef0de004a9f299105d12ac307a2a42123afbf49c
  F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -499,21 -498,20 +501,21 @@@ F src/pager.h a2e686638988964b65cf6bdb4
  F src/parse.y 6840fe7c0b5eb4dd25ee5d075213bc8255ed4c0678d71bfb6744d0520d91c179
  F src/pcache.c 4196eb6ed3bbf00b80596c8e0b4f50e57eb7d890c19fb27a7354306abb7f983d
  F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
 -F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
 -F src/pragma.c 3a5f39517cbe90af3271fb5dd2866a50fbcf4ced6cb464dcc80a6f763b415206
 +F src/pcache1.c 77a8848baa3d396b8f597b2e8ba85d82ba00584e45e1c1c27d413712a1b0d88a
- F src/pragma.c ce45a21582c07705ae2b87fd7e5e028eb2f3180cb664b88cc0a26d9ec25d1849
++F src/pragma.c 7c3cb5bc8a7055c650252eb5defbbfd989681ab5acc653d3d0a1f257009c97cc
  F src/pragma.h fdd03d78a7497f74a3f652909f945328480089189526841ae829ce7313d98d13
 -F src/prepare.c f81f8d707e583192c28fea0b2e19385415b7d188123b23f49b038076408d7a69
 +F src/prepare.c f0cc0876b3f5573e2f9aa2089dc3bc73a32d75102ed4a8bc21344e4d010f2575
  F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c bc8c79e56439b111e7d9415e44940951f7087e9466c3a9d664558ef0faf31073
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
  F src/select.c 61e867a906f140b73baf4ce7a201ad6dcba30820969f5618ee40e9a0d32c6f5f
  F src/shell.c.in 060ccc327959bdc85c895015eb382017fd0cd000ebd47b7e8dda42f8aab0b66f
- F src/sqlite.h.in 3caebc8ebe931db8ba2466395c8f1219ec0fba8828f87c65fa40989d2f2249a6
 -F src/sqlite.h.in 842ee6a2d3b2e7f2b56710f168cd189b92a2f54e68ef771e018e2ea7533c7e0e
++F src/sqlite.h.in 25586d23b612610f2123dc3390c764f8c0caa69ba0975bb9f67dbb860f0b53a7
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
- F src/sqliteInt.h eab404b67419170245b4a721bb21e50adc9d42682f002a3a8479dde32b6214b9
 -F src/sqliteInt.h c10361d952c33521111861ed4b0d625b62ad29b5fc4ee5e296a74cb032dc3cf3
++F src/sqliteInt.h e8ef63bfd8a936ca5cc553c0033881ad3918672ac8a768c27bd69028dfc80d7e
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -578,11 -576,11 +580,11 @@@ F src/update.c 1816d56c1bca1ba4e0ef98ca
  F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
- F src/vacuum.c 36e7d21a20c0bf6ef4ef7c399d192b5239410b7c4d3c1070fba4e30810d0b855
+ F src/vacuum.c 836cadc922de866c849e23a75f93d344cdc143d388339305d09a3fed27e8798d
 -F src/vdbe.c 005e691ea4c7d51e6c1a69d9389aeb34700884c85f51681817ddea3fdc2fc39b
 +F src/vdbe.c 6659e80c5b83ecba5eb6f8e828606bc8205e6cd25006ccc6107f355e6e160437
  F src/vdbe.h 5081dcc497777efe5e9ebe7330d283a044a005e4bdda2e2e984f03bf89a0d907
  F src/vdbeInt.h 8a52b8db3d20f9755a965d864b8653052c7ef1ccadceb2e057047cd421f6336e
 -F src/vdbeapi.c ecccfce6f614c33a95952efeec969d163e8349eac314ee2b7b163eda921b5eb0
 +F src/vdbeapi.c 373eebe4072c89790da638759c05e1c426edca3735c2f68ca1886dfd68ba1eb5
  F src/vdbeaux.c f547901b1aa9e2d81c63f06893f633648e434180666a827aacb547d7d6c8a601
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
  F src/vdbemem.c 7b3305bc4a5139f4536ac9b5f61da0f915e49d2e3fdfa87dfdfa9d7aba8bc1e9
@@@ -776,10 -774,10 +778,10 @@@ F test/date2.test 74c234bece1b016e94dd4
  F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
  F test/dbfuzz2-seed1.db e6225c6f3d7b63f9c5b6867146a5f329d997ab105bee64644dc2b3a2f2aebaee
  F test/dbfuzz2.c 652f85bac1770e927da139db513234a3eba308f72ac2f8b32f0093d7d19def70
- F test/dbpage.test dbf50a4d361f9e45a979432c727506065113124478a7d2db12074fa655e65d6c
+ F test/dbpage.test 650234ba683b9d82b899c6c51439819787e7609f17a0cc40e0080a7b6443bc38
  F test/dbstatus.test cd83aa623b8aab477269bc94cf8aa90c1e195a144561dd04a1620770aaa8524e
 -F test/dbstatus2.test f5fe0afed3fa45e57cfa70d1147606c20d2ba23feac78e9a172f2fe8ab5b78ef
 +F test/dbstatus2.test ce94261a9e45cfd2d08195a82553c03b45c01e5ebad8a17888aeef818d9da69c
- F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
+ F test/default.test 3e46c421eebefd2787c2f96673efabf792d360f3a1d5073918cbe450ce672a62
  F test/delete.test 31832b0c45ecb51a54348c68db173be462985901e6ed7f403d6d7a8f70ab4ef0
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
  F test/delete3.test 555e84a00a99230b7d049d477a324a631126a6ab
@@@ -1007,12 -1005,12 +1009,12 @@@ F test/incrblob_err.test 89372a28f1d982
  F test/incrblobfault.test 74dd8ac108304cea0b4a0df6df63a1567e558758
  F test/incrcorrupt.test 6c567fbf870aa9e91866fe52ce6f200cd548939a
  F test/incrvacuum.test b729aab1d4983037da57e66c20dfd7458561a85626dcf824f60175e35f4ce152
 -F test/incrvacuum2.test 7d26cfda66c7e55898d196de54ac4ec7d86a4e3d
 +F test/incrvacuum2.test 1e873b6caf87ce160d4cb6d8c7a46f0570da1ddc
  F test/incrvacuum3.test 75256fb1377e7c39ef2de62bfc42bbff67be295a
  F test/incrvacuum_ioerr.test 6ae2f783424e47a0033304808fe27789cf93e635
- F test/index.test 5131c0106a6d0c892c5f438f0630e1b4361370c393ba8a000dd0dcaa2b3bf1de
+ F test/index.test df4cddf4435314a948237fdfa9acee67de21f7bebc789beab4b89b575b4f6a70
  F test/index2.test f835d5e13ca163bd78c4459ca15fd2e4ed487407
- F test/index3.test 81bc47890b8abfb181bc35f8d10b56c069803386
+ F test/index3.test 51685f39345462b84fcf77eb8537af847fdf438cc96b05c45d6aaca4e473ade0
  F test/index4.test ab92e736d5946840236cd61ac3191f91a7856bf6
  F test/index5.test 8621491915800ec274609e42e02a97d67e9b13e7
  F test/index6.test d07ea75b8c21f125c6f325522e8df8c05c91e9251ec923a31d0582b2ba4a617d
@@@ -1168,7 -1165,7 +1170,7 @@@ F test/oserror.test e7b3416be4b9d5dd2fe
  F test/ossfuzz.c c4c4547e2c92ac52f10038b073a03248251a23c1c559728f63a18aeca0e79f03
  F test/ossshell.c f125c5bd16e537a2549aa579b328dd1c59905e7ab1338dfc210e755bb7b69f17
  F test/ovfl.test 199c482696defceacee8c8e0e0ef36da62726b2f
- F test/pager1.test cfd1c1dd00c5d5dece44476e817cfb57b578a4c1ef1425307001da6bdfa6a24f
 -F test/pager1.test 1e9ee778bdeaf4f7f09997d029cdaca6a42dfc2092edafe4f5e590acbf1eab13
++F test/pager1.test a309660a312ca241053c2b1253d432f868cfe64f25aac17f8e7572099b279e5c
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 4e9a83d6ca0838d7c602c9eb93d1357562d9059c1e02ffb138a8271020838370
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -1177,16 -1174,16 +1179,16 @@@ F test/pagerfault2.test caf4c7facb914fd
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
  F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0
  F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
- F test/parser1.test 391b9bf9a229547a129c61ac345ed1a6f5eb1854
+ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035ce4b3
 -F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 +F test/pcache.test 9a04fa260cb47dd4fdc5d13c5e97054e05931592
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test cf0b4e498db1d0143c19641d4420df7cc27fab2c95ed0abd2c7c5753beab25b8
  F test/pg_common.tcl 301ac19c1a52fd55166d26db929b3b89165c634d52b5f8ad76ea8cb06960db30
- F test/pragma.test 3ce8294c0f86ef7586e44fdc7be887f0cfeaec01093ad3e24d5736b96fb55984
 -F test/pragma.test c267bf02742c823a191960895b3d52933cebd7beee26757d1ed694f213fcd867
++F test/pragma.test 5f399fa2dabff786f109d923802b25e533dd99afb536618ef6b45d6ddae9e10f
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 8300aa9c63cff1027006ca34bf413a148abbd6dcd471fa9a1ded322fe18c0df9
 -F test/pragma4.test 3046501bee2f652dc2a4f9c87781e2741361d6864439c8381aba6c3b774b335c
 +F test/pragma4.test da107b2fd465e67aa9f419a4e313b26b76336fabf71059c51d0b3211a6ae3c51
  F test/pragma5.test 824ce6ced5d6b7ec71abe37fc6005ff836fe39d638273dc5192b39864b9ee983
  F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
  F test/printf.test a3e559bc9d922e7fe44e9d05c6965fee34fe3bc28300a4248c6a063425246ffd
@@@ -1335,11 -1332,11 +1337,11 @@@ F test/subquery2.test 8250dfd6a773b04c7
  F test/subselect.test 0966aa8e720224dbd6a5e769a3ec2a723e332303
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
  F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
 -F test/superlock.test ec94f0556b6488d97f71c79f9061ae08d9ab8f12
 +F test/superlock.test c86eacd6cead5da9c5ecd25f3d46fca30a927ef2
  F test/swarmvtab.test 9a3fd5ab3e9b3c976ad1b3d7646aab725114f2ac26b59395d0778b33bab6cdaf
  F test/swarmvtab2.test c948cb2fdfc5b01d85e8f6d6504854202dc1a0782ab2a0ed61538f27cbd0aa5c
- F test/swarmvtab3.test 6cb664669630fcec4102a09333e52068734858fd2761eee3b0465c14cdbcee29
- F test/swarmvtabfault.test 00aec54665909490f5c383f3cae3b5d18bd97c12490b429ff8752a3027acfa42
+ F test/swarmvtab3.test 247aa38b6ebd2b99db2075847ae47e789ac34f1c2ab5c720dfcffd990004c544
+ F test/swarmvtabfault.test 8a67a9f27c61073a47990829e92bc0c64420a807cb642b15a25f6c788210ed95
  F test/symlink.test 0d816670325536b8973ec08d32b45136baddb80bd45fd178e0ce7a9e8153f3e7
  F test/sync.test 89539f4973c010eda5638407e71ca7fddbcd8e0594f4c9980229f804d4333092
  F test/sync2.test 8f9f7d4f6d5be8ca8941a8dadcc4299e558cb6a1ff653a9469146c7a76ef2039
@@@ -1781,7 -1778,8 +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 62acf7a09e5ef4adbd64fb3f6cfa1eb440f12b6f8c2d81a077e2941e5128981a a8d65214a567eb1afd703ee4d09d398247e060a610b46097a726364db2861001
- R c383ef22521c395632a282c01b24d6e3
 -P 2bae0e7c1c1393aeb0bb7234865e410c9ca0e3c31cdc8566e9503f70ca7ac64c c5dc7fb873b15bd4e4f31b944c9feee78ab7ec2cb74f5fc55b615fd0e2784a88
 -R 2f07d98f23b322254bb650c4a8ed900f
 -T +closed c5dc7fb873b15bd4e4f31b944c9feee78ab7ec2cb74f5fc55b615fd0e2784a88
++P e3e9b85eadd6f1b40998ada906eaddba0001df02357f24e6766ecfcec14c9d85 9c685171c4d7ae8615d1489c9621aba79fe4ef1f0e56b75823b88c3e70d127df
++R c0e5db1783f31538fadd1bc489b9caff
  U drh
- Z a0382c9c7402346e8e45ca27319348ec
 -Z b28ad0e8933d08dc5443b19047381cba
++Z 257b0169006773372d752ff89c19c9ae

diff --cc manifest.uuid
index b6914bcaaa12cf7cc6e52ab35c70c1f220758c14,9992552831b1139be20e62197c15629ea476e281..2a158e15eca915d8904f8ae66a13c5ddb3b1b7e4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e3e9b85eadd6f1b40998ada906eaddba0001df02357f24e6766ecfcec14c9d85
 -9c685171c4d7ae8615d1489c9621aba79fe4ef1f0e56b75823b88c3e70d127df
++977fc44e65f831d4c6184073f44708567081f358904dd76e8df5a82a17977469

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc test/pager1.test
Simple merge

diff --cc test/pragma.test
Simple merge