From: drh Date: Fri, 11 Oct 2019 11:21:03 +0000 (+0000) Subject: Merge the 3.30.1 changes into reuse-schema. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Freuse-schema-3.30;p=thirdparty%2Fsqlite.git Merge the 3.30.1 changes into reuse-schema. FossilOrigin-Name: eff7cd7f12ecbceb452a6e89aad556ba34510f8124295a2aa9273f6d9605b4fe --- fbc31806a27d1fc870959a70ddd9cc59389590e0 diff --cc manifest index a4339e04bd,1cff7b7b85..a5e97c2b09 --- a/manifest +++ b/manifest @@@ -1,13 -1,13 +1,13 @@@ - C Bring\sthe\sreuse-schema\sbranch\sup-to-date\swith\sversion\s3.30.0. - D 2019-10-04T15:31:42.731 -C Version\s3.30.1 -D 2019-10-10T20:19:45.339 ++C Merge\sthe\s3.30.1\schanges\sinto\sreuse-schema. ++D 2019-10-11T11:21:03.165 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in 578f123620087ea459aa08fa872810a25ca7c0aaf16331de985bfcddb5f1e747 +F Makefile.in 4f63722008696418bae434379987f9987cba2ce823579512f2dd5f0ff734c04a F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241 -F Makefile.msc a463dca3c50d8a36094fe5c8c39077907f530b54edfc5388c66c85e2cfc8dc04 +F Makefile.msc bfa3ab0a9d6a81ac5156084c67b75e2c9b66fd543954673ff2135075eef07414 F README.md 1514a365ffca3c138e00c5cc839906108a01011a6b082bad19b09781e3aa498a - F VERSION 4c516d84c2a5f26c477ed34c09ac4136630f71c68139631f2eb591b22eea7cf1 + F VERSION 396c1094b353e5533180a7498086557a9c50c76f2bfb62cc5fb69cfba07d562c F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 @@@ -460,9 -459,9 +460,9 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a - F src/alter.c deddf439893a8157b19b2b69e9537ed12aa2e4ddf5738141932f6d0330d1bb44 -F src/alter.c 5773b28684a001dcab45adcefa3cbf5e846335c0c8fee0da8a3770cb0123bba8 -F src/analyze.c a3f4ea45cdb4e9df78d4ea7beb87ec8a7a46f494173b641cd28512a40a97bff2 -F src/attach.c 3ca19504849c2d9be10fc5899d6811f9d6e848665d1a41ffb53df0cd6e7c13ed ++F src/alter.c 2cd3adaef22863a5d5789b86b662cde97ab66f9c27c7ed86df8c78129d0c5d93 +F src/analyze.c 050e013f2b1d0f6f334e147c4c0f8a24f4b7dfb83c24fc62a2da7ebb50e45dfb +F src/attach.c 6a1a045ff64c542882d1159a1df0aebaeaad86c9ed204edd979e94e8e9feefe1 F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06 F src/backup.c f70077d40c08b7787bfe934e4d1da8030cb0cc57d46b345fba2294b7d1be23ab F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33 @@@ -478,9 -477,9 +478,9 @@@ F src/date.c e1d8ac7102f3f283e63e13867a F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7 F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319 F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf - F src/expr.c 1e9a6da29e3e13c14783891e867e19a54e2731c6a9b58d011cc4f3b4742a59e4 + F src/expr.c 18974550063a6a1c8eef69e63d2ad88ceb4395ef139a60cc0d0a28632f41d553 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 -F src/fkey.c 6b79f4c2447691aa9ac86e2a6a774b65f3b3dd053d4220a4893051a0de20f82e +F src/fkey.c 2c14c9431a2de2c0d9444d0cc27e4360f4829455f689decfff01cac383fe0894 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12 F src/global.c a1a8d698762ddd9a1543aac26c1e0029b20fcc3fcb56bfa41ec8cea2368f2798 F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19 @@@ -526,16 -525,16 +526,16 @@@ 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/shell.c.in 2c49eff321d70abe720d5799f6abfb12c1093dda3956ac813060eb81a5cc8b05 +F src/sqlite.h.in ba0f0a99948d98adcab93824f6203b50ba81f69c4376cbba8e4e392fd25a8ebe F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31 - F src/sqliteInt.h 88d98a058528319eebb598a71353faaf81ea6d070ebf3c83cccfb19418fdc1a0 -F src/sqliteInt.h b8cabe8fcef93b7251422db41903c04abb4052df015eacb886dabd496fc3e0e8 ++F src/sqliteInt.h e2331a36c03c18f4b13444e3502e6cdcb439f97425784733180e8d352b9fdd87 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b -F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e +F src/status.c d9f7d66ae8bee9ffbe4cf7ae72a8d3d429a269336dee1e705ecb3dbea27fa5e2 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 -F src/tclsqlite.c 50c93be3e1c03b4e6cf6756e5197afcfe7f5cd0497d83a7ac317cde09e19b290 +F src/tclsqlite.c 02d9f47e1797c7aa4174fe90dc5380fb99057303e0b6443fa1b103e9de65cf35 F src/test1.c 17e1395cbddeb9226b756d723a7566b45b43b99a5f9f55afb4ff70888de6ad6f F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644 @@@ -598,13 -596,13 +598,13 @@@ 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 da4030a71acf42be18001b9b7067d6d34ffb76610603ce6fafa52854b9e52936 -F src/vdbe.h 3f2b571e702e77e6bf031f0236e554aedfae643e991f69000320f481408455cf +F src/vacuum.c 5b9b4771ffb47aaef038c4ad5f1acd76dfbc9e0a4f101c1ba7f7ac9c2ba96374 - F src/vdbe.c a70a294f7f05313e32ffe67c1b1e5f33820d5985f83f3aa794d7e963bbffd960 ++F src/vdbe.c c434e1587c30497e26c3e35758274041c46923efc3c4ee29faec4b3e4a45bdb9 +F src/vdbe.h 2cfde8249aac55d7f508752e27919e17a30add7bf7444dc221ae5a65d2bafe9d F src/vdbeInt.h e95de5129124d77f01439e6635012adfaf23c0017bff47296126143cf18bd0c6 F src/vdbeapi.c 95001d0f84ee3cda344fed98ca0d7961deb4fc836b83495630d0af1f7cc4789e - F src/vdbeaux.c 38f1e2dcb4571ddc9e75459345ab8f229ad62e0bdc0a1f7545112e6e7f443bbd -F src/vdbeaux.c d17dfbf1e03ef706cad9e2076c7f2354882c191a84e73e00c69c50bb7823e5ce -F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1 ++F src/vdbeaux.c 66d0137de294cadec0dd1d363415bbc0a37416fa9c4ba0b40769a7bbabc02d4b +F src/vdbeblob.c 40028e015fe557a945c99edb6cbf844ea96d853c3e8ac4eb5c1e49bff59f154e F src/vdbemem.c d8e10d1773806105e62094c4ede0a4684f46caaf07667a45e6d461e94306b530 F src/vdbesort.c da75f505aba230060ce6472605a4aa6494f73eeb1071e1cc2643c3d4035e671b F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0 @@@ -1856,7 -1846,10 +1856,10 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 - P 067961241293b99b7f716e6f05e302b8354c9e7216296148b6f4ab59f8d3f4b0 c20a35336432025445f9f7e289d0cc3e4003fb17f45a4ce74c6269c407c6e09f - R 8446e9bb49d694ba552d7092cfcb2561 -P c6cc2390e91097a32992d11c74af8e77a6a42862ec8a936b549e156250629407 -R 9b77b3da995b6a235a01d1e768df1101 -T +bgcolor * #d0c0ff -T +sym-release * -T +sym-version-3.30.1 * ++P 6e09afecd6086211253b5f8eab718dde097f92a88100e54604a3f063c1a1fc98 18db032d058f1436ce3dea84081f4ee5a0f2259ad97301d43c426bc7f3df1b0b ++R 72301fc53aaec28cdab85602ae540f06 ++T *branch * reuse-schema-3.30 ++T *sym-reuse-schema-3.30 * ++T -sym-reuse-schema * U drh - Z 64ac795d118c8062077fc7428aa80632 -Z 6b715002b9e76fa6c3cf0c09f9813287 ++Z d19ae6e90840efaa2320c6bb5a4768e2 diff --cc manifest.uuid index 4e688faa6b,67ff2f9e3e..9b108e2598 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 6e09afecd6086211253b5f8eab718dde097f92a88100e54604a3f063c1a1fc98 -18db032d058f1436ce3dea84081f4ee5a0f2259ad97301d43c426bc7f3df1b0b ++eff7cd7f12ecbceb452a6e89aad556ba34510f8124295a2aa9273f6d9605b4fe