From: drh Date: Fri, 15 Nov 2019 02:52:22 +0000 (+0000) Subject: Merge the version 3.30.1 changes into the apple-osx branch. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca113937cdd10dc65ff8f2072422e774aa14aa40;p=thirdparty%2Fsqlite.git Merge the version 3.30.1 changes into the apple-osx branch. FossilOrigin-Name: 2c8af3520632b1a072df47420ee388c4746b2544835ee2a9d13d26e2f368dd90 --- ca113937cdd10dc65ff8f2072422e774aa14aa40 diff --cc manifest index 5a5f4858cf,1cff7b7b85..13787425b8 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Bring\sthe\sapple-osx\sbranch\sup-to-date\swith\sthe\s3.30.0\srelease. - D 2019-10-04T15:41:17.879 -C Version\s3.30.1 -D 2019-10-10T20:19:45.339 ++C Merge\sthe\sversion\s3.30.1\schanges\sinto\sthe\sapple-osx\sbranch. ++D 2019-11-15T02:52:22.365 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -528,13 -525,12 +528,13 @@@ F src/printf.c 9be6945837c839ba57837b4b F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c e021be0c1c4a2125fa38aabcd8dbb764bf5b2c889a948c30d3708430ec6ccd00 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93 - F src/select.c f509982c96bb24ccf57a0155fbe1e6184e0b8fb8866a04397dc41baa400e5240 + F src/select.c b3d64a7a3342471ce078251c5ba132f8ec66f994534f1070dda025b354a09a62 F src/shell.c.in d70bcf630c4073eaa994fa74be98886c781918e794cb8b562be8df10f018e274 -F src/sqlite.h.in 5725a6b20190a1e8d662077a1c1c8ea889ad7be90dd803f914c2de226f5fe6ab +F src/sqlite.h.in c16500202fdfe9c4400e18377f84488c0c56b7b5537f036915b1a556b96aa8ab F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942 F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31 - F src/sqliteInt.h 588d1e7a7eb3a092cc7ef129f378c323b5db92a404a97d6ccf9cffa407c61fa6 -F src/sqliteInt.h b8cabe8fcef93b7251422db41903c04abb4052df015eacb886dabd496fc3e0e8 ++F src/sqliteInt.h 4d5c6d23ea78c0ad38a91322036f08b11fcc83be45c78adee0db912b3e21c68c F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 @@@ -601,11 -597,11 +601,11 @@@ F src/upsert.c 710c91bb13e3c3fed5b6fe17 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507 F src/util.c fffdfa627be74d69ef425f92db124e7148af449bb8a3286e79577c42bca84061 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf - F src/vdbe.c ba31e329cd8d8051cf52384aa60883ff92662f128a0816863b54d229553ec96b -F src/vdbe.c da4030a71acf42be18001b9b7067d6d34ffb76610603ce6fafa52854b9e52936 ++F src/vdbe.c da91e9d340bbb46b6717e86c208078c02e88558f1abe4f7723806dadec3ed6c5 F src/vdbe.h 3f2b571e702e77e6bf031f0236e554aedfae643e991f69000320f481408455cf F src/vdbeInt.h e95de5129124d77f01439e6635012adfaf23c0017bff47296126143cf18bd0c6 -F src/vdbeapi.c 95001d0f84ee3cda344fed98ca0d7961deb4fc836b83495630d0af1f7cc4789e +F src/vdbeapi.c 8a3b164874aeea34e6fbfbc76d0bdae4bde6f0400b23b762a13f0d415dde77a0 - F src/vdbeaux.c 7ccf418141df1c7f87b0d69510523ae522abbe47c769d1b2c15120e88fac3eb9 + F src/vdbeaux.c d17dfbf1e03ef706cad9e2076c7f2354882c191a84e73e00c69c50bb7823e5ce F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1 F src/vdbemem.c d8e10d1773806105e62094c4ede0a4684f46caaf07667a45e6d461e94306b530 F src/vdbesort.c da75f505aba230060ce6472605a4aa6494f73eeb1071e1cc2643c3d4035e671b @@@ -860,10 -856,10 +860,10 @@@ F test/expr.test 7cb55e80aeb41d65fec968 F test/expr2.test c27327ae9c017a7ff6280123f67aff496f912da74d78c888926d68b46ec75fd8 F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9 F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79 -F test/fallocate.test 37a62e396a68eeede8f8d2ecf23573a80faceb630788d314d0a073d862616717 +F test/fallocate.test 9151a4a8912fe0d873c4e02cd52bdd6b2d6eb8b57a69f42b27972c1ded4775c8 F test/filectrl.test 6e871c2d35dead1d9a88e176e8d2ca094fec6bb3 F test/filefmt.test f393e80c4b8d493b7a7f8f3809a8425bbf4292af1f5140f01cb1427798a2bbd4 - F test/filter1.test c2f34e58ee82a60c3ee9b5b4c4f2004ec2f529dff2f473706eeffa684cbb6719 + F test/filter1.test edd797ab2ef38de16064c9e3945efd941cba72d27e8f070c349501ff95d2727d F test/filter2.tcl 44e525497ce07382915f01bd29ffd0fa49dab3adb87253b5e5103ba8f93393e8 F test/filter2.test 485cf95d1f6d6ceee5632201ca52a71868599836f430cdee42e5f7f14666e30a F test/filterfault.test c08fb491d698e8df6c122c98f7db1c65ffcfcad2c1ab0e07fa8a5be1b34eaa8b @@@ -1851,7 -1846,10 +1851,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 9ce4c79171fd92b6d9c7accdfa11966529e96437cf044a2bbbf6f2738ce4be91 c20a35336432025445f9f7e289d0cc3e4003fb17f45a4ce74c6269c407c6e09f - R b555b7cff10b343eafc0aca435774d6e -P c6cc2390e91097a32992d11c74af8e77a6a42862ec8a936b549e156250629407 -R 9b77b3da995b6a235a01d1e768df1101 -T +bgcolor * #d0c0ff -T +sym-release * -T +sym-version-3.30.1 * ++P 76b26acaba3a4169b358079fdd95526505902ee003d2505fdea111120d48169b 18db032d058f1436ce3dea84081f4ee5a0f2259ad97301d43c426bc7f3df1b0b ++R 433fd9748ca7fb6d50270e06512a90d0 U drh - Z a6abb69700ffe31673d9f59d675faa9d -Z 6b715002b9e76fa6c3cf0c09f9813287 ++Z deaf84714bfc4eaf15fe7f8157f7c8c6 diff --cc manifest.uuid index 78e544f119,67ff2f9e3e..044e1ebc1c --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 76b26acaba3a4169b358079fdd95526505902ee003d2505fdea111120d48169b -18db032d058f1436ce3dea84081f4ee5a0f2259ad97301d43c426bc7f3df1b0b ++2c8af3520632b1a072df47420ee388c4746b2544835ee2a9d13d26e2f368dd90