From: drh <drh@noemail.net>
Date: Wed, 9 Oct 2019 17:38:56 +0000 (+0000)
Subject: Merge recent fixes and enhancements from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2F2-size-lookaside;p=thirdparty%2Fsqlite.git

Merge recent fixes and enhancements from trunk.

FossilOrigin-Name: 553258c2ed85cb3a539d7562bf6fcf58bb601a7c459e408a2188794ea4bb2f2c
---

8ed265c9e6cffd5bce56944aa963727cfc4e766b
diff --cc manifest
index 7a32feb0f9,9503bdb239..a225b913a1
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C An\salternative,\sexperimental\slookaside\smemory\sallocator\sthat\suses\stwo\ndifferent\sslot\ssizes.
- D 2019-10-09T17:06:38.567
 -C An\simproved\sfix\sfor\sthe\sdbsqlfuzz-discovered\sALWAYS()\sfailure\sfollowing\sOOM\sin\nsqlite3ExprCollSeq().\s\sThis\stime\swith\sa\stest\scase\s(engineered\sby\sDan).
 -D 2019-10-09T15:37:58.973
++C Merge\srecent\sfixes\sand\senhancements\sfrom\strunk.
++D 2019-10-09T17:38:56.137
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in 97473628071905a0496a38e1b0721dda732829c89fa0b87675d877c26d95936a
 -F Makefile.in bf24a9abbb277afa2fbe6bac80a181f22be6c48de771cd260c9851ecf6165dc1
++F Makefile.in d7f9d10aac33fd23e156e27301baca94656ca3f509111cadcd3cfef1486f2dca
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc 99a026807172f0e99c982d386a6470c445307a9fd0383aa4692406102ad7e7e4
 -F Makefile.msc c7e3548d5c9dc12bedf47366ca3f1438196f635d81f08fda44c6c1f290c4bcf8
++F Makefile.msc 9224f40ade70b77a55fb386a2dae8d04a4395432c3b9ba7884a8acd933c46b71
  F README.md 1514a365ffca3c138e00c5cc839906108a01011a6b082bad19b09781e3aa498a
  F VERSION 4c516d84c2a5f26c477ed34c09ac4136630f71c68139631f2eb591b22eea7cf1
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -447,7 -447,7 +447,7 @@@ F ext/userauth/userauth.c f81aa5a3ecacf
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk b939f7fa33486a28466c40dcbd6681b817a66de73aa9e121434e471b16ac731a
 -F main.mk 7ce055f3df31a4f7d21e38f493f907c21db1f673863a573e231f55e2ab005023
++F main.mk 57097ab23e6b0cccb7fcd35ffbbdbda037316887881507c58a0f115af6ec37cb
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -477,9 -477,9 +477,9 @@@ F src/date.c e1d8ac7102f3f283e63e13867a
  F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
  F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
  F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
- F src/expr.c 1e9a6da29e3e13c14783891e867e19a54e2731c6a9b58d011cc4f3b4742a59e4
+ F src/expr.c 3f4dcbe7cb6644652c2d12b7fa5c9087965229c515e65070cbe99f100c2f2e5f
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 -F src/fkey.c 6271fda51794b569d736eba4097d28f13080cd0c9eb66d5fcecb4b77336fae50
 +F src/fkey.c 48921db21c10b7857efe8a9f4dd9dbe7fe931df3eaea0913629e8512924fc8ef
  F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
  F src/global.c a1a8d698762ddd9a1543aac26c1e0029b20fcc3fcb56bfa41ec8cea2368f2798
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
@@@ -522,7 -520,7 +522,7 @@@ F src/pcache.h 4f87acd914cef5016fae3030
  F src/pcache1.c 62714cbd1b7299a6e6a27a587b66b4fd3a836a84e1181e7f96f5c34a50917848
  F src/pragma.c b47bc7db02ab13d04c680aee424466b4e34f4ef5aa7b2e464876ec005806f98f
  F src/pragma.h 40962d65b645bb3f08c1f4c456effd01c6e7f073f68ea25177e0c95e181cff75
- F src/prepare.c 5cd97fadcf1b98de8260fd5077abb666929433ec48c533fc6b4b222a64c99276
 -F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
++F src/prepare.c 4d267e595a317a9a8564800f086700a5b0d82ed3bbf75ed703453e6ae43e8606
  F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c e021be0c1c4a2125fa38aabcd8dbb764bf5b2c889a948c30d3708430ec6ccd00
@@@ -1848,10 -1846,8 +1848,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 238e0835714696aba0631f288fcc30ec5fddb43893d469c6bf017f386b3cddee
- R ff93c002380d3f08d9900baed24887de
- T *branch * 2-size-lookaside
- T *sym-2-size-lookaside *
- T -sym-trunk *
- U sperry
- Z f6212e7bc680bb8a80c6fe2ff4a2e853
 -P 75775c5ab44e497cb19be10397229637f1374f05c3244e8f92d6c54fcea94f5f
 -Q -01ba4641ab436c6065c8725908fc0913f2abded4ea62e004b7534e0116b9451a
 -R 46052c64c579bf3fda5dd04a558500b4
++P 5ba8cee8f710eb2a6844d5de0d975c207e5645754e30211a4cb5a4869248b693 907f7965b335d8d5441f2e386bb190d1f93ffcd45ca98d2d1c621dede491fc5e
++R a61ffa3a3938c973c9604e15b466ae5c
+ U drh
 -Z cca2984ae5fcf8dec44abaa439367b12
++Z 5fdd027d7167a6e0b3c7253d67bed640
diff --cc manifest.uuid
index 2fe8c23022,7854b4d5cf..180138750c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5ba8cee8f710eb2a6844d5de0d975c207e5645754e30211a4cb5a4869248b693
 -907f7965b335d8d5441f2e386bb190d1f93ffcd45ca98d2d1c621dede491fc5e
++553258c2ed85cb3a539d7562bf6fcf58bb601a7c459e408a2188794ea4bb2f2c