]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the 3.35.0 release into the reuse-schema branch.
authordrh <>
Fri, 12 Mar 2021 17:26:59 +0000 (17:26 +0000)
committerdrh <>
Fri, 12 Mar 2021 17:26:59 +0000 (17:26 +0000)
FossilOrigin-Name: c8237a024d14fc7827fec89d768cb533b78a77a2ed3b9b6df43f262d257d98a6

1  2 
manifest
manifest.uuid
src/shell.c.in

diff --cc manifest
index 3255b6f093e7dc2226a770d5c1783d6af0c668f7,3a658ff0852b74b8d7dd45ecf7fa125de0452ca0..826f9179993df74bd8614c7f646c0ada2bdf73b4
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthis\sbranch\swith\slatest\sfixes\sfrom\strunk.
- D 2021-03-11T21:00:42.178
 -C Version\s3.35.0
 -D 2021-03-12T15:10:09.783
++C Merge\sthe\s3.35.0\srelease\sinto\sthe\sreuse-schema\sbranch.
++D 2021-03-12T17:26:59.507
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -544,15 -543,15 +544,15 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c d95db73d3e6a5c689e5f6604b4d2521350e45f2a0f0f84f5a2dc2bfee56580a0
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c fc904a7aa7ebfd5c7a57a0141d829c9f5388ac7773e0d1d9668768c1bbc87fc3
- F src/shell.c.in 3c626bb2087ad079283f2ca5fbfffc2fb92543a58cd021f20e1dace109d64070
 -F src/shell.c.in 35adf1212d759069b00e468a9304a05a67710c8f8f50e7312335e23cac985d8c
 -F src/sqlite.h.in 3426a080ea1f222a73e3bd91e7eacbd30570a0117c03d42c6dde606f33e5e318
++F src/shell.c.in 7860475ad526382e54d1548384e3e4a9c3ba53569fad3b93451c2bd820d01bd5
 +F src/sqlite.h.in 0144aeddd6f44ffddfcf965f6dd3983865830d2db3fe73a856874b28cd40765e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
 -F src/sqliteInt.h 3652edb9e6032808d51d6f26d9c6f9eb621ac199e0fd2d2a5aa551799d91a296
 +F src/sqliteInt.h a3b80c98ca989f35207b675ffb838673a789fa5afd4b542dc3ff9934965a8621
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 -F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 +F src/status.c d0956e57c71160155f620a3efeb1e5c05a3f8b9a897dd09c5263268e5d237579
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 986b6391f02cd9b53c1d688be55899f6ffddeb8e8014cd83c1b73ff912579a71
 +F src/tclsqlite.c f4dd32d001c2be33371dca87e30117352f02dad59a2e5428c97f08703360a169
  F src/test1.c cff43d8e21be543b77651b4d2caf49bd6488fee220f8540ecd9f71d13169dbd1
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -1920,7 -1910,10 +1920,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 ef8c6e06cb094c5a6f5862f0f3f2a67c3db40dc39e520cc421311bcb55e0f762 07150cf15ad36c7fc681a911f66db23d610ddf110a7be7f1fcefbd8750cd135a
- R 0e4b18617058170b91597c286f1d19e6
- U dan
- Z 75fb1df96bd21be35fce6850478b09a7
 -P 98d67152849e062c6de45b0e526daffc3d6cb29d563d40664a8d7140119a30b2
 -R 39a4a0d8e5c6bc44cb1af4a996c13e18
 -T +sym-major-release *
 -T +sym-release *
 -T +sym-version-3.35.0 *
++P 12363f8e176690d237b06e2fa6e9e3710574bdf841b8f6cef0cce34646367aa1 acd63062eb06748bfe9e4886639e4f2b54ea6a496a83f10716abbaba4115500b
++R 46d67a43cdb0760a727886da2da7465f
+ U drh
 -Z 57dbd644ae30193b3f75279561c2eade
++Z 61142ee8cfc23b3813e76fdf1fb4048c
diff --cc manifest.uuid
index 9cf1b3cc6586606e8c6eb2e50d80fe02f9d75c85,6f063d70d6776e53df7b05b57d67da4ad39d486b..932f16730bb1f4af7a44521bbb662dcc8f2275ad
@@@ -1,1 -1,1 +1,1 @@@
- 12363f8e176690d237b06e2fa6e9e3710574bdf841b8f6cef0cce34646367aa1
 -acd63062eb06748bfe9e4886639e4f2b54ea6a496a83f10716abbaba4115500b
++c8237a024d14fc7827fec89d768cb533b78a77a2ed3b9b6df43f262d257d98a6
diff --cc src/shell.c.in
Simple merge