From: drh Date: Fri, 4 Oct 2019 15:52:19 +0000 (+0000) Subject: Bring the begin-concurrent branch up-to-date with the 3.30.0 release. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f654ac668bf563709a60c96a288e7f8f2799cd6;p=thirdparty%2Fsqlite.git Bring the begin-concurrent branch up-to-date with the 3.30.0 release. FossilOrigin-Name: abd1b4df4f847a32a2b9379774397a6674bab2e027fa36e921da049f26be2988 --- 0f654ac668bf563709a60c96a288e7f8f2799cd6 diff --cc manifest index b4d78fec63,44f902f667..6689d0d82a --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Merge\sthe\s3.30.0\sbeta\s1\schanges\sfrom\strunk. - D 2019-09-30T16:14:05.606 -C Version\s3.30.0 -D 2019-10-04T15:03:17.190 ++C Bring\sthe\sbegin-concurrent\sbranch\sup-to-date\swith\sthe\s3.30.0\srelease. ++D 2019-10-04T15:52:19.564 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -493,8 -488,8 +493,8 @@@ F src/hwtime.h 747c1bbe9df21a92e9c50f3b F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c 40557ebd69f4115e7a273f9304a8ab637a47ce44f3c6923396928f023967b5e8 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa - F src/loadext.c a045bb3425a9a633cc0f78e93d9beda6866f4c0f15bfdee735aba7c6b39f5cc4 + F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d -F src/main.c 3851950717170ade4f6d718c18c6c7400ef5994c2a654679af2cff2ffd0fb2b9 +F src/main.c d702cd01d10eb97648edd655d7194e15bac985dd015df196c9df8a45fb46f74c F src/malloc.c 0f9da2a66b230a5785af94b9672126845099b57b70a32c987d04ac28c69da990 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de @@@ -527,20 -522,20 +527,20 @@@ F src/pragma.c b47bc7db02ab13d04c680aee F src/pragma.h 40962d65b645bb3f08c1f4c456effd01c6e7f073f68ea25177e0c95e181cff75 F src/prepare.c 132484635a30f873ee7eccd47f93ed1932503863b93b28423b42332d81adffaf F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4 -F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 +F src/random.c f27af4099afaea7284ade5c206224dcfdb2334cfd119d018b470d46356b3f27d F src/resolve.c e021be0c1c4a2125fa38aabcd8dbb764bf5b2c889a948c30d3708430ec6ccd00 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93 -F src/select.c f509982c96bb24ccf57a0155fbe1e6184e0b8fb8866a04397dc41baa400e5240 +F src/select.c addc1c57cb391158d1d444e237a90b83797395b60214d660715c149c1aeb8bf4 - F src/shell.c.in 026d8a5b3e1c477f23ef027e1ecb4c86e9e3fed0aa922e3825cf4d7feb6bdd69 + F src/shell.c.in d70bcf630c4073eaa994fa74be98886c781918e794cb8b562be8df10f018e274 -F src/sqlite.h.in 5725a6b20190a1e8d662077a1c1c8ea889ad7be90dd803f914c2de226f5fe6ab +F src/sqlite.h.in 5c794e32368499d5b9f1a034d426e8d1968f5593aff1ae5efc5197fb32b053e3 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31 -F src/sqliteInt.h 246740eab76d3ac87f856f8d979567089e8749104c12932143a6ba570e38e415 +F src/sqliteInt.h 1ddec0d82c6e5d94522f0894820fe049baeeaadfc7906baebce81e04b3aea5e9 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 F src/tclsqlite.c 50c93be3e1c03b4e6cf6756e5197afcfe7f5cd0497d83a7ac317cde09e19b290 - F src/test1.c dba1b71424954bd61725cdc09d7af44cee99dd9bd58e72b80c743adde5809019 -F src/test1.c 17e1395cbddeb9226b756d723a7566b45b43b99a5f9f55afb4ff70888de6ad6f ++F src/test1.c e9f578242b276b48f826ea35850aa5077f59a1128a2ff4575356ba27e88f446f F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644 F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb @@@ -601,8 -596,8 +601,8 @@@ F src/update.c 7f05fad5e145248a00048aeb F src/upsert.c 710c91bb13e3c3fed5b6fe17cb13e09560bdd003ad8b8c51e6b16c80cfc48b10 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507 F src/util.c fffdfa627be74d69ef425f92db124e7148af449bb8a3286e79577c42bca84061 -F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf -F src/vdbe.c 7f43ed8e055a4290535d2e4520d33f0ac6cc00ef76a0c099e4c6bd85be74a6b9 +F src/vacuum.c 0bbe81da32e3adb91bd70d84da38494234857373fb2e94811c4a5eb21cee870d - F src/vdbe.c cdfafd2dea7b96e7b5f7dbbdc2ace9c2549c1b4f4e2e2b7c233451c5faf39e5c ++F src/vdbe.c 3cae92bf5c8abf7d94a7d63e0e8b8c2c3204a2f56765983114c60ad0f77f04e9 F src/vdbe.h 3f2b571e702e77e6bf031f0236e554aedfae643e991f69000320f481408455cf F src/vdbeInt.h e95de5129124d77f01439e6635012adfaf23c0017bff47296126143cf18bd0c6 F src/vdbeapi.c 95001d0f84ee3cda344fed98ca0d7961deb4fc836b83495630d0af1f7cc4789e @@@ -1859,7 -1846,10 +1860,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 93b9ef3f470a04658f5a7931a7ea978f2c35326a634586893670df9476833835 661a3789eb329a2487855e49c31067a9dde4c91c1a3a65b65375d079f906b1da - R adc939ec69d78e92b99e8b94391bdd3c -P 7f9a4b6015ac332a04d3e394a6b3210fc95253d8786a261178a5639cb8d9d987 -R f116075cb1c47b7928f41444f3803579 -T +bgcolor * #d0c0ff -T +sym-release * -T +sym-version-3.30.0 * ++P a003818f708c336359d62b32f7e896ea0da5095dc20f47fefddecfcecda43e95 c20a35336432025445f9f7e289d0cc3e4003fb17f45a4ce74c6269c407c6e09f ++R c80fdfe409d0bc3322396a670c992b00 U drh - Z dd811038ab269242eebf84671a3cbcd8 -Z edadfb0c72633ac9bcd13396063b6815 ++Z 7eab1f36854ecdc282a63cecad22090d diff --cc manifest.uuid index 93166abd5d,59c1946757..8a806b3928 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - a003818f708c336359d62b32f7e896ea0da5095dc20f47fefddecfcecda43e95 -c20a35336432025445f9f7e289d0cc3e4003fb17f45a4ce74c6269c407c6e09f ++abd1b4df4f847a32a2b9379774397a6674bab2e027fa36e921da049f26be2988