From: drh <>
Date: Mon, 17 Jan 2022 19:10:25 +0000 (+0000)
Subject: Merge the begin-concurrent-pnuu branch into begin-concurrent.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02369f514d9537bc7a72817d94010b8f92112c0b;p=thirdparty%2Fsqlite.git

Merge the begin-concurrent-pnuu branch into begin-concurrent.

FossilOrigin-Name: 22fb50500505462baa0a8baa9f6dad6140c451429e420efd304cf8bbe35bdd69
---

02369f514d9537bc7a72817d94010b8f92112c0b
diff --cc manifest
index 6adc6cc09d,7eb29a221e..15ba3bda09
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sversion\s3.37.0\sinto\sthe\sbegin-concurrent\sbranch.
- D 2021-11-27T14:45:54.160
 -C Merge\sversion\s3.37.0\sinto\sthe\sbegin-concurrent-pnu\sbranch.
 -D 2021-11-27T14:48:36.971
++C Merge\sthe\sbegin-concurrent-pnuu\sbranch\sinto\sbegin-concurrent.
++D 2022-01-17T19:10:25.948
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -549,10 -549,10 +549,10 @@@ F src/pcache.c 084e638432c610f95aea72b8
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
  F src/pragma.c c536665ce8431c8b1efbf7e0a5c01852f49f7bf28f1954f8118b2d28e4a3797f
- F src/pragma.h 87330ed2fbfa2a1274de93ca0ab850fba336189228cb256089202c3b52766fad
+ F src/pragma.h f98354c48571c490927029510566839bf9e7242569bfbb48032dafeb008481d2
  F src/prepare.c 7520a371f1de8a53e3023eba75bc0d3473196833c6363d285cad8d002eabef0b
  F src/printf.c 5901672228f305f7d493cbc4e7d76a61a5caecdbc1cd06b1f9ec42ea4265cf8d
 -F src/random.c c6e61d041f230d46c658e6dfe7165fc1ecb0093d5fe28cfe74f389d261dc3af8
 +F src/random.c d4127b3d8ba155e293cc1abb19f70992c147abd5cc911df25582cb481b705974
  F src/resolve.c 4a1db4aadd802683db40ca2dbbb268187bd195f10cbdb7206dbd8ac988795571
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c 7e8082835f8b8891a0785dc163724a13b5c200abd0931fd3204b2578339c49bc
@@@ -560,7 -560,7 +560,7 @@@ F src/shell.c.in e51731a7ca44a9ec09b722
  F src/sqlite.h.in 32f7d112cb85d3f2fd56500e11a6bd6d19a969306650200dcde97c2638cfecfc
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8ff2fd2c166150b2e48639f5e506fb44e29f1a3f65031710b9e89d1c126ac839
- F src/sqliteInt.h 72d2835262ca2d950545291cbbc6f00e00e7660e8402ee1ebca8e188a0a1484d
 -F src/sqliteInt.h 43d34bba92cfbf88794b8da251b9ae94945fcaa8181cb389f09fdfd969c5da25
++F src/sqliteInt.h ad96a10be55aaf9e6096c0688143d88364953132b54a286c8fb6532f9a475de6
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -1948,7 -1949,7 +1949,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 8f3e68424ae8dfffd01312b178376f3666a28995145c6f4028d8c71a7da1b93a bd41822c7424d393a30e92ff6cb254d25c26769889c1499a18a0b9339f5d6c8a
- R 0e7c72f4e2e79dae181ae4f762b44adf
 -P aa045e7b09ee47fb281579178add904fffc2299b05cfc67cf872ec3caaffd69b bd41822c7424d393a30e92ff6cb254d25c26769889c1499a18a0b9339f5d6c8a
 -R 0b73519482b632519dc5c94ef5f418e1
++P c5f2ad19423785d5d6fc2a41f232fee4bdc1a489e548fbc4d874578f45533812 910001f28368896c3e6f11bb6ced3ec3171dcafefd9e6702106b32f3c451e229
++R bb31d59f65a16a73b071078123e01262
++T +closed 910001f28368896c3e6f11bb6ced3ec3171dcafefd9e6702106b32f3c451e229
  U drh
- Z 9dbe3d0d3cf4956acda58cce19ff6ef3
 -Z e542c117dcb222209ab8a2000fd55012
++Z e943400dd39f2e4c660c88ea7bc78a2c
++# Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 2030852801,ab40bbb21b..372ae04d38
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c5f2ad19423785d5d6fc2a41f232fee4bdc1a489e548fbc4d874578f45533812
 -910001f28368896c3e6f11bb6ced3ec3171dcafefd9e6702106b32f3c451e229
++22fb50500505462baa0a8baa9f6dad6140c451429e420efd304cf8bbe35bdd69