From: drh Date: Tue, 1 Dec 2020 16:36:04 +0000 (+0000) Subject: Merge the 3.34.0 release into the reuse-schema branch. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36b4ffef758de4432481756bdb597d742e688b69;p=thirdparty%2Fsqlite.git Merge the 3.34.0 release into the reuse-schema branch. FossilOrigin-Name: 73b5f614cd6603d6cf9605ac4ccb510a2560fca70a8a3f3f930cf2a4e853c301 --- 36b4ffef758de4432481756bdb597d742e688b69 diff --cc manifest index 6f4c719e2d,e80f89eeb9..89c548d139 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Merge\strunk\schanges\sinto\sthis\sbranch. - D 2020-11-25T20:29:45.537 -C Version\s3.34.0 -D 2020-12-01T16:14:00.051 ++C Merge\sthe\s3.34.0\srelease\sinto\sthe\sreuse-schema\sbranch. ++D 2020-12-01T16:36:04.454 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -541,15 -540,15 +541,15 @@@ F src/random.c 80f5d666f23feb3e6665a6ce F src/resolve.c 1948a92ca9eab776632816b97e57c61d933474a78aad4f4ef835c916a83dbb1c F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 31387e56f5e6d1adc798dfa04b946001289a61e65acf4615f7b7130f121f3b9c -F src/shell.c.in 55113760ae91a05c6ce4558714a1c8fc7a44bf266f735de6e71ea40f79e69830 -F src/sqlite.h.in 1dbae67057d999161c30b21c3c7fa45d51f665b510d397dd1b7d671287d772b0 +F src/shell.c.in 97e9ec678cfd713463e7843a809396ca5cc1608167d99448b2105f55f8c7a523 - F src/sqlite.h.in f8c2d6753b960b13c32128b31876b36383fbbe97e9af84430584ad506ca497bc ++F src/sqlite.h.in 6f9e74566afa0edbc4bda2271928bcd67c00694dc41fb9f03c5ec5f3457fd906 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e -F src/sqliteInt.h c01115c8dd967f7d334a98ba37ac821eafb04144c8085a795daaf2185743d27a +F src/sqliteInt.h 0b579b0cba4ec1b4126da809da9eda466bbcf08c4718d412b79e6c5236632128 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 465b7a35b7e231bf2833e47c1371b5dfc99bd803ebe73783862399d479d696a5 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644 @@@ -1896,7 -1886,10 +1896,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 6004de525d90e5a32742349db9a7c818e1ae2d3bf3f57aff9058a3cb8f6f0fff bb174a074b5833181900d396edda955254ea1768750a0ab3b6d714530b1fe13f - R f266faa8fb04cefece7b4dda17e3980b - U dan - Z 65e771508c94256c0070542bf898d1d4 -P 23212b1a054f05773a9f69f9802035eea6a9d759a2a09e22f46d1046c058b417 -R 02db8b9bcb7f3c64353edbc1fa9fbf5b -T +bgcolor * #d0c0ff -T +sym-release * -T +sym-version-3.34.0 * ++P f4b7c10057a50c5b1f38d4e35ec684ad9d6e21278675fec98961e1fa408ded52 a26b6597e3ae272231b96f9982c3bcc17ddec2f2b6eb4df06a224b91089fed5b ++R 7aa41e6d896276bdafa7eb3013c6bac0 + U drh -Z b7b093d44b407c1b4e832f8c913357ae ++Z 0381bb72d2503cf2901550fcf8c98b9e diff --cc manifest.uuid index cbfd85d458,275e6f34d5..9838be59a1 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - f4b7c10057a50c5b1f38d4e35ec684ad9d6e21278675fec98961e1fa408ded52 -a26b6597e3ae272231b96f9982c3bcc17ddec2f2b6eb4df06a224b91089fed5b ++73b5f614cd6603d6cf9605ac4ccb510a2560fca70a8a3f3f930cf2a4e853c301