From: dan <Dan Kennedy>
Date: Thu, 10 Dec 2020 18:07:01 +0000 (+0000)
Subject: Merge trunk changes into this branch.
X-Git-Tag: version-3.35.0~190^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46a6b1a1be69c85e203afdcdaa68b84e6dab2ed0;p=thirdparty%2Fsqlite.git

Merge trunk changes into this branch.

FossilOrigin-Name: 7337eed629b4537b8fc2dc87c3c71d0a664128a91fd00f3c5f18843505beee90
---

46a6b1a1be69c85e203afdcdaa68b84e6dab2ed0
diff --cc manifest
index d9b671f413,ead9a8fa60..95ecdca302
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Better\sintegrate\sthe\schanges\son\sthis\sbranch\swith\sOP_Insert\sand\sOP_IdxInsert.
- D 2020-12-10T18:06:24.603
 -C Add\san\soptional\sfunction\sto\sthe\schsumvfs\sextension.\s\sWhen\sactivated\sby\nthe\sSQLITE_CKSUMVFS_INIT_FUNCNAME\smacro,\sthis\sfunction\swill\sinvoke\sthe\nfile-control\sthat\ssets\sthe\snumber\sof\sreserved\sbytes\sto\s8.\s\sThis\scan\sbe\nused\sto\sinitialize\sa\scksumvfs\sdatabase\sfile\sby\sprogramming\slanguages\nthat\sdo\snot\shave\saccess\sto\sthe\ssqlite3_file_control()\sinterface.
 -D 2020-12-10T13:49:00.833
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2020-12-10T18:07:01.742
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -545,7 -545,7 +545,7 @@@ F src/shell.c.in e9f674ee4ec6c345679e8a
  F src/sqlite.h.in 0e2b4259e49a0eda54d9118eb18a04fcd60e0727a2fd2c81aade0bf57520e706
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
- F src/sqliteInt.h 47bc1232d1c68525876c6c2d2b602bf8f614f84e7650de6031301435b535bf30
 -F src/sqliteInt.h 6b9e04aff5ae385e8d0957bf64cb3c1c42f4bf5115788c7be76e85ca9875740b
++F src/sqliteInt.h 6f99431f5b6f90948fb991907c35d11ca4e7eed43da48e790f8facd92c820711
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -1889,7 -1888,7 +1889,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 dfd4ca6891a893d0e9551689954d3e79114d5565f8a5264f96ad1d64fe1d6280
- R 649db055ff8e87cb8a713e180a0e255a
 -P c0de6c1fb2c486be1da01e5e4ca8c5634ba37822e418d57f272e018c3e3fc0a2
 -R 6c67d7c383f4b37d548756594c8d9b75
 -U drh
 -Z ffe92d1035962188772639969e0a3892
++P 101cef14910d6e865a94bc870aed599321b893188062a9a61d70a9434992cf23 01841fb4bf3d6c5fd5bcbc7d1338998c50f69f84ca475fba7cf764d636714678
++R a5d793c28e830d9302f879f5ab38dd56
 +U dan
- Z 6c3c81094000f4145ba4e14f9b1ea402
++Z 2458c10db91ae6ca73e242d0fd66a7be
diff --cc manifest.uuid
index 36af76a357,782a536fd6..e8cdfeec6b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 101cef14910d6e865a94bc870aed599321b893188062a9a61d70a9434992cf23
 -01841fb4bf3d6c5fd5bcbc7d1338998c50f69f84ca475fba7cf764d636714678
++7337eed629b4537b8fc2dc87c3c71d0a664128a91fd00f3c5f18843505beee90