From: drh <drh@noemail.net>
Date: Tue, 14 Jul 2020 01:03:05 +0000 (+0000)
Subject: Merge latest changes from trunk.  This branch still does not work.
X-Git-Tag: version-3.33.0~57^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d575e46f329d9268f7f32002d711c0f7b35d3bb;p=thirdparty%2Fsqlite.git

Merge latest changes from trunk.  This branch still does not work.

FossilOrigin-Name: 6144387238c03b8b33ae98d624f7ffa44a7829d3e0d4a0a01b5528e71ab4f08b
---

9d575e46f329d9268f7f32002d711c0f7b35d3bb
diff --cc manifest
index 550c4e40bc,c182bbb7ca..ba21d1f1c1
--- a/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
  B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
- C An\sattempt\sto\sget\sthe\sMin/Max\soptimization\sworking\swith\sIN\sconstraints.\nNot\scurrently\sworking.
- D 2020-07-10T19:09:40.123
 -C Readd\sthe\sALWAYS()\smacro\sthat\swas\sremoved\sby\s[f7a74f89dbd58b47]\sas\sthe\ncondition\sis\sno\slonger\sreachable\sdue\sto\sthe\sprevious\scheck-in.
 -D 2020-07-13T15:35:08.219
++C Merge\slatest\schanges\sfrom\strunk.\s\sThis\sbranch\sstill\sdoes\snot\swork.
++D 2020-07-14T01:03:05.378
  F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
  F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
  F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@@ -21,17 -23,18 +23,19 @@@ F src/parse.y b6b4b02f8cc8f94ac1d93a922
  F src/pragma.c ae499b5ab8f4e833f67e28bf2322500e9aa612aadf12581d1324333f848d8b51
  F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
  F src/resolve.c 79cee37182fea66703f90365b8b0a646ed7e9bfa9238b91fa90dfc74258b940e
- F src/select.c 14d212b94088cf06f0074f080e46f858b36bf55a772029a7d006a16b305fe5a8
 -F src/select.c 2a5099399d7e3bf2956c2ec019262e000831b87c095aa9150939a28a3a743c8f
++F src/select.c d9f067b2dda2202d1f80f820449acbd3f423010f29a453ce4e4a517a4bd679cb
  F src/shell.c.in 81fa23ac1a3d6ac9ed13e9ae711a3d8806396ca7cc12c5d6a2e2536f70b0c7ad
- F src/sqliteInt.h f89ed824bc55b6bd90ca692518f85eeb22f8962d46e0e12cad989d4aee1e7b8c
+ F src/sqliteInt.h 8366e482a1330e9c103c9c9053c53894e373daf1fb9dd65bd953ffc0b3ad7a8b
  F src/test1.c fe56c4bcaa2685ca9aa25d817a0ee9345e189aff4a5a71a3d8ba946c7776feb8
  F src/update.c 6a0484134635f167594d597a33d186051125d3ef41803a90b246cea6cf7f11f9
  F src/util.c c0bacc165f46169d2b720c37c8719165e383211698fad1de39dd16a8c161815a
  F src/vdbe.c 981666c49d33039df6dc9fccd40191575586ac4866255b2f57819cc5eb99f572
  F src/vdbeapi.c c1a9004ac554d8d48794d2ce5f80397f8e419fd28643a543cc1e004c7713c3ef
 +F src/where.c a485bc1ec23b04ef6e7868abc559b8adc4c3fdc3314222386928b2e47f1e4505
+ F src/window.c 0dec178bfa541c757d15a2be78f34aea36393a0966600366810e5f8739ccf370
  F test/altertab.test b8b2104212e8ea87c75c3cbe3cb78ed7236a6c828ee2e59ed09d3dbe9812d002
  F test/busy2.test 415364312743992641f9bf679c84918327296067f85a5d00012b339dc35acbd7
+ F test/corruptL.test 01cfda6b28f463d1713ac72a101e65549250568129ce5317ec6729729ecaf477
  F test/decimal.test 12739a01bdba4c4d79f95b323e6b67b9fad1ab6ffb56116bd2b9c81a5b19e1d9
  F test/filter1.test 6c483ecf7886c8843a8612c021aa23f33c581f584151f251842b3a3592c95ac8
  F test/fkey5.test 321fd41e8754389526b2b8e8769348dc9ff23a65d4d48b19c27df17459e82ec5
@@@ -47,10 -51,7 +52,7 @@@ F tool/mksqlite3c.tcl f4ef476510eca4124
  F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
  F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
  F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
- P ccff8cb8267d4c5605484f7a35c1836937f20b3d6879fe84cd84dc24bbbffc77
- R 35d6b9743e23c38e933ae2f7f81185b9
- T *branch * minmax-opt-exp
- T *sym-minmax-opt-exp *
- T -sym-trunk *
 -P e6c2192ef88e9990c8b91755c8e779f09e23f936a17123d8e42059257b756ed7
 -R 6bb073a35e650c3614329dfe9addd72f
++P 4a64c16fb7a07431e534fb9bbcf778646be8a1c718d5d10873fbccb0c867aac7 9cb03beae42d814a1b1b69f72865fde502d3f443313ec29edd010d1de40225eb
++R b5d39bb30ff84871e9397d6d2ffce041
  U drh
- Z 4df4fe61b85919c997c14bcb75af2a60
 -Z 0642ca58347e016bdf51c35b901ea5bc
++Z cf6e9dd9fd5e835801e651e2c806ed31
diff --cc manifest.uuid
index ddb1bc4f91,880efef3d2..67d0f7a6d0
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4a64c16fb7a07431e534fb9bbcf778646be8a1c718d5d10873fbccb0c867aac7
 -9cb03beae42d814a1b1b69f72865fde502d3f443313ec29edd010d1de40225eb
++6144387238c03b8b33ae98d624f7ffa44a7829d3e0d4a0a01b5528e71ab4f08b