From: drh <> Date: Wed, 1 Nov 2023 12:38:28 +0000 (+0000) Subject: Version 3.44.0 for the begin-concurrent branch. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dba104de4a9d0964a13902c1a0301efcc772a0ad;p=thirdparty%2Fsqlite.git Version 3.44.0 for the begin-concurrent branch. FossilOrigin-Name: 291d6b44035c14647f5c8e2f264fd33ed6a9d969ae357fe3f74a9faf3d62faff --- dba104de4a9d0964a13902c1a0301efcc772a0ad diff --cc ext/session/test_session.c index c08c67c84d,af42351ba7..21e1965a9b --- a/ext/session/test_session.c +++ b/ext/session/test_session.c @@@ -396,7 -391,7 +396,6 @@@ static int SQLITE_TCLAPI test_session_c { 0, 0 } }; size_t sz = sizeof(aOpt[0]); - int rc; - int iArg; int iOpt; if( Tcl_GetIndexFromObjStruct(interp,objv[2],aOpt,sz,"option",0,&iOpt) ){ diff --cc manifest index 3cd2039345,603321be0f..0a6274d23c --- a/manifest +++ b/manifest @@@ -1,11 -1,11 +1,11 @@@ - C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sbegin-concurrent\sbranch. - D 2023-10-30T21:39:11.158 -C Version\s3.44.0 -D 2023-11-01T11:23:50.173 ++C Version\s3.44.0\sfor\sthe\sbegin-concurrent\sbranch. ++D 2023-11-01T12:38:28.106 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in 8b59912fc1538f96a08555605c5886cdcc733696ae7f22e374b2a4752196ca20 +F Makefile.in 240106bd70960bbc4f05d0704fad04ef16bdd71f0ba1ffb3482ddf6dd6962a62 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6 - F Makefile.msc 7a9eb2c4d960b34accebd5a8d6005161071b1863ca4ef28a07a603dc77249843 -F Makefile.msc f0cf219350d9af4fba411b4f6306dce2adc897484e8f446de1fb4f40de674d00 ++F Makefile.msc a677b8bcb2a8205e1ca4139588a284a0cd6f369f94b6bbbac6960dbf494e3e5e F README.md 963d30019abf0cc06b263cd2824bce022893f3f93a531758f6f04ff2194a16a8 F VERSION 4c09b629c03b8ae32317cb336a32f3aa3252841d6dcd51184cecc4278d08f21e F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@@ -557,11 -554,9 +557,11 @@@ F ext/session/sessionrowid.test 85187c2 F ext/session/sessionsize.test 8fcf4685993c3dbaa46a24183940ab9f5aa9ed0d23e5fb63bfffbdb56134b795 F ext/session/sessionstat1.test b039e38e2ba83767b464baf39b297cc0b1cc6f3292255cb467ea7e12d0d0280c F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc -F ext/session/sqlite3session.c 7b0f9bf6479aebd49e5f34cdaeb1479cde843cf5189bca6f32db4f36c130b414 -F ext/session/sqlite3session.h 4cf19a51975746d7cff2fdd74db8b769c570958e1c3639ac150d824ac1553b3e -F ext/session/test_session.c 7b94ad945cd4afe6c73ee935aeb3d44b4446186e1729362af616c7695a5283d9 +F ext/session/sqlite3changebatch.c d5553b79e012ee2cb06c0a96bdf9dfe19e66354390ea0036cc46c4953142d517 +F ext/session/sqlite3changebatch.h e72016998c9a22d439ddfd547b69e1ebac810c24 +F ext/session/sqlite3session.c 31324bff026b63daa0c34d0eeb1f0e3ab3aa8d2a5a5efb47d6692c0adb2109cb +F ext/session/sqlite3session.h 388d34fea3db95a951b838bf6f16e068d15f5312aa174fe0db6aa03ec0c0c319 - F ext/session/test_session.c 3829e4cfa96ef7de8246078c86203b95676694dc8055b09501c9384d416bd427 ++F ext/session/test_session.c dec29dc72cbf8e4d637bdbc7bd717aa01d2bc173b1874ea73b0ceed06e067627 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb @@@ -676,10 -671,10 +676,10 @@@ F src/date.c eebc54a00e888d3c56147779e9 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782 F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43 F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500 - F src/expr.c 2ad50ae13cc6402973593eebd1f9af2c0915d5f7cc2c2f4f2f3472a9a7aeddce + F src/expr.c 433f12e1237524482b0b2681c07da3cd54ddada2a625237cecde419f3e3a2553 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c a47610f0a5c6cb0ad79f8fcef039c01833dec0c751bb695f28dc0ec6a4c3ba00 -F src/func.c 472f6dcfa39cf54f89a6aec76c79c225fb880a6c14469c15d361331662b9bf43 +F src/func.c dc3a713c862097d2ad02b0dd829b369da1c44e6bd67bcaed88f96022a857e8fe F src/global.c 29f56a330ed9d1b5cd9b79ac0ca36f97ac3afc730ff8bfa987b0db9e559d684d F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51 @@@ -720,18 -715,18 +720,18 @@@ F src/pcache.c 040b165f30622a21b7a9a77c F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00 F src/pragma.c b3b4ad9c0298d63098a067acca613c21a5f56b4d176d5842922bcd0b07b7164e -F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7 +F src/pragma.h 6ebbdee90ed56a892d2c728e27fd9c1ce48c8a28841888d0c6c147946b38cb25 F src/prepare.c bde74add20fc0e8ce0c4e937a1f70a36d17413afe4f71d3e103f5cb74b17c8d9 F src/printf.c 9da63b9ae1c14789bcae12840f5d800fd9302500cd2d62733fac77f0041b4750 -F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c +F src/random.c a3e70f8515721ff24d2c0e6afd83923e8faab5ab79ececea4c1bf9fe4049fbb2 F src/resolve.c 31229276a8eb5b5de1428cd2d80f6f1cf8ffc5248be25e47cf575df12f1b8f23 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 -F src/select.c a19daa26e95f7245106a31f288b2f50c72d1f2cc156703f04c8c91450e111515 +F src/select.c 37a7110225abe9b10bf1f0c8247965b79afce22f71b113bbf92359c3c85e42aa - F src/shell.c.in fbb0ff59cd62e1103221f655a9b3357edec4f89bd6c6d3350f6bddc1ff855357 + F src/shell.c.in 3e9371ca6a93294931a8ed8b098bc3cb15d57567aa9a1f2ade72db7f5c572795 -F src/sqlite.h.in ef0e41e83ad1ac0dcc9ec9939bf541a44b1c5de821bee2d6c61754c3252f3276 +F src/sqlite.h.in 58babce6a12e937b9e7a583b26e546a0a57f7993d06b1591f7220039f0790c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h 567e317f8631883897b7d3da43fce778b7c30dd0dd7f714558c9725fc1c1196c +F src/sqliteInt.h ef78a7f0ea8e42d17468d7a598312a94ef3e1692f41f834a4712f8197a063ee6 F src/sqliteLimit.h 33b1c9baba578d34efe7dfdb43193b366111cdf41476b1e82699e14c11ee1fb6 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@@ -1148,7 -1132,7 +1148,7 @@@ F test/fts3conf.test c9cd45433b6787d48a F test/fts3corrupt.test 6732477c5ace050c5758a40a8b5706c8c0cccd416b9c558e0e15224805a40e57 F test/fts3corrupt2.test e318f0676e5e78d5a4b702637e2bb25265954c08a1b1e4aaf93c7880bb0c67d0 F test/fts3corrupt3.test 0d5b69a0998b4adf868cc301fc78f3d0707745f1d984ce044c205cdb764b491f --F test/fts3corrupt4.test 48bd57baed9654e511709a02dbef2d22ee54c012ad466e8648f0f825233faa08 ++F test/fts3corrupt4.test dcaa5055b225093d877eb89c9e5ab772accc459c7210d6adc6a7312af1290bc0 F test/fts3corrupt5.test 0549f85ec4bd22e992f645f13c59b99d652f2f5e643dac75568bfd23a6db7ed5 F test/fts3corrupt6.test f417c910254f32c0bc9ead7affa991a1d5aec35b3b32a183ffb05eea78289525 F test/fts3cov.test 7eacdbefd756cfa4dc2241974e3db2834e9b372ca215880e00032222f32194cf @@@ -2156,8 -2139,11 +2156,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 - P c5ef898a79c74d313e23be130d687675bda72925fb78470f147ba4ec82d52aeb c4f724de279dae1afd10d435ad61ed07c1e4658288457c50e4f9b2f4521bbe12 - R f6086e9200a8554582327ce94597e40f -P d1895dd8f5757a339f619f22b29c8a739398ded673bb9c93f1b8eb8a4b38f510 -R 06db090922d30265c1e1381238ea6702 -T +sym-major-release * -T +sym-release * -T +sym-version-3.44.0 * ++P 9fa405eb5aa786e7d7f5ee5a9ccf39adcc1dc25552da3a344c443367dc5881a3 17129ba1ff7f0daf37100ee82d507aef7827cf38de1866e2633096ae6ad81301 ++R 8671ded86ce79efecdfdbb4643243126 U drh - Z b618973fc57a8c0496359cbe6f45af6a -Z 14f36413d8197ea0c35026cb3842c9f7 ++Z e7769e6c51b71843b5554ebe97f39502 # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index 2c22623a1b,1cefea455e..27640e698b --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 9fa405eb5aa786e7d7f5ee5a9ccf39adcc1dc25552da3a344c443367dc5881a3 -17129ba1ff7f0daf37100ee82d507aef7827cf38de1866e2633096ae6ad81301 ++291d6b44035c14647f5c8e2f264fd33ed6a9d969ae357fe3f74a9faf3d62faff diff --cc test/fts3corrupt4.test index 433a486359,433a486359..dc2c991a56 --- a/test/fts3corrupt4.test +++ b/test/fts3corrupt4.test @@@ -4396,6 -4396,6 +4396,7 @@@ do_catchsql_test 25.4 INSERT INTO t1(a) SELECT randomblob(3000) FROM t2 ; } {0 {}} ++if 0 { # test incompatible with this branch due to per-connection PRNG do_catchsql_test 25.5 { WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x%1 FROM c WHERE x<599237) INSERT INTO t1( a ) SELECT randomblob(3000) FROM t2 ; @@@ -4405,6 -4405,6 +4406,7 @@@ do_catchsql_test 25.6 INSERT INTO t1(t1) SELECT x FROM t2; INSERT INTO t1(t1) SELECT x FROM t2; } {1 {database disk image is malformed}} ++} #------------------------------------------------------------------------- reset_db