Merge enhancements from trunk.

FossilOrigin-Name: 091403a6705f5f1352c76eacbfdca75fe0bab12ab9b156842641de07c38d3f66

diff --cc manifest
index d00d6abea268c11f2234f0998cc00bceb68b6f19,ed9effd8466a823359343247b269d3d87233dee6..860c76daf4beca79e86378f7211949ec95890e60
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Experimental\sbranch\swith\snew\ssqlite3_db_config()\soptions\sthat\scould\spossible\nenhance\ssecurity\sfor\sapplications\sreading\spotentially\scompromised\sdatabase\nfiles.
- D 2019-12-31T22:52:10.121
 -C Add\sthe\stwo-size\slookaside\smemory\sallocator.\s\sAlso,\sreduce\sthe\sper-entry\nsize\sof\sthe\sExprList\sobject.
 -D 2020-01-02T22:28:47.433
++C Merge\senhancements\sfrom\strunk.
++D 2020-01-02T23:50:50.904
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -489,11 -489,11 +489,11 @@@ F src/hash.c 8d7dda241d0ebdafb6ffdeda31
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 97afb0bf06d7fd7b820f6de3e42cf60beb5cd10131828c29b131b2614bbb1f39
+ F src/insert.c 5ba8fd376f539240939ae76b5bc9fa7ad9a0d86e9914ecd11eb7002204138c11
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c d74f5e7bd51f3c9d283442473eb65aef359664efd6513591c03f01881c4ae2da
- F src/main.c b75192ececab87f3342088546a8738b22ffc727865d61902ef93de9dc057669c
- F src/malloc.c 550021fcae36f0ffe9f8563d83e6385f9df307a854d55d7d0abb7241ee8dbcc6
 -F src/main.c 07b5259e712bc479f0d7b51feaceab6ae3a4e08019a7ddad004562d56c317701
++F src/main.c 939e0ff163bd4c96362f7c81be98a8d7a043d1bf1eb250ea7119d39c27d6c5ac
+ F src/malloc.c eaa4dc9602ce28b077f7de2eb275db2be270c5cc56d7fec5466301bd9b80e2f5
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -526,19 -526,19 +526,19 @@@ F src/pragma.h ec3b31eac9b1df040f1cc8cb
  F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
  F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 8513df170ff6069828fbfcb7a59d84521b30b2ee19a2f57a391cc59baf381a55
 -F src/resolve.c 938295261d556dc173e7c4b85c921b565b25c38656b924bdf03c3ff8f37e24ab
++F src/resolve.c 241c32d6be93e72572f23e3dd1160036db377fa0707fcb04b69e4d1a034c5fe9
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
- F src/select.c 2a753ec714703c32e4aade5b0115033bbee8a377b215cb0fbe88ab2fa4b3e028
- F src/shell.c.in 709c85e7f90ac62f8bc45ed11feabcfeb6e9559892c55fcb557a062b8c698d0e
+ F src/select.c 8791103f21df458fdaba16c7d6452f92b00363f222f0f242661654f12455ea0a
 -F src/shell.c.in 90b002bf0054399cbbfac62dd752a9b05770427ba141bcba75eefbb0098f4280
 -F src/sqlite.h.in 51f69c62ba3e980aca1e39badcaf9ad13f008774fe1bb8e7f57e3e456c656670
++F src/shell.c.in 69462c95793d69a16df93deabbd6d026f5f6ef6c87d9da54ed1477c03490d17b
 +F src/sqlite.h.in efaecabd038dc30282f243af087c4960e528d0df25a05f90f988435fec5ef779
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 72af51aa4e912e14cd495fb6e7fac65f0940db80ed950d90911aff292cc47ce2
- F src/sqliteInt.h 3e4c8037071dbf74886c25f4ada1499bac7e90352a91ad072372282477dc7296
 -F src/sqliteInt.h 7f028954dc3602b5505064b1028ac671965bfd9905316767cb3298f945478ac0
++F src/sqliteInt.h 03a952654df3b9a94fbe34a2cbeb73a3a613689fa2a61307a4709a68628ee16b
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
- F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
+ F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
  F src/tclsqlite.c 8cd2600e8de23dff6cdf84d39f46ca57139b061b28f6f80b166bace17d52ab1c
- F src/test1.c c654981c1d86ebc90dd23fcc0969e6c85e28112f0acc2e2224a97a2a33e7c42f
+ F src/test1.c 4d0ab2f67053a4fff87d1d3586ecc0e5322a1fc45dd4119ab11dc96de44f17a1
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb
@@@ -1853,10 -1853,8 +1853,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 3bd095a53119c368fe30e539983588b27957203344cf427405b9a64784b8eba7
- R 1519469fee4296191cf9c590f16cccb9
- T *branch * new-security-options
- T *sym-new-security-options *
- T -sym-trunk *
 -P 7405e982257611803792617f5d8142c54f9831b4a030f4de8607888c525e6289 34b877742ef78e9bb3f16815180f4ad9cd722beb1d610f713400a3b25d68aa9b
 -R 896a86b40586a93b7de7ff4de391d81d
 -T +closed 34b877742ef78e9bb3f16815180f4ad9cd722beb1d610f713400a3b25d68aa9b
++P 96a2db2612f2e47bbec0e374a242820c88f03c42ccbf8467abccaef41469bae2 51665bf0f975fb248964a4be205a4f3285d3f3f8cc697977d264efefbbe20dd8
++R 8c7e397d4bcba49889cbfedd58b7bb0e
  U drh
- Z 66c42f7199d224391a430f509bbf28ff
 -Z 486c5971cb86c4301cea954c124cc71f
++Z 091b61bd8246d8cb46dad6a652b4937a

diff --cc manifest.uuid
index 34ed42b1fb127d9a618acaf1eb68b94493f9d42e,b1fa06af2e6e99a65946954ffe13bbf04d68ff43..ec0780186015a106575a35abe83c74e160f26675
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 96a2db2612f2e47bbec0e374a242820c88f03c42ccbf8467abccaef41469bae2
 -51665bf0f975fb248964a4be205a4f3285d3f3f8cc697977d264efefbbe20dd8
++091403a6705f5f1352c76eacbfdca75fe0bab12ab9b156842641de07c38d3f66

diff --cc src/main.c
Simple merge

diff --cc src/resolve.c
Simple merge

diff --cc src/shell.c.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge