diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c index 00f96cc92b..1889121dc0 100644 --- a/ext/session/sqlite3session.c +++ b/ext/session/sqlite3session.c @@ -5528,7 +5528,7 @@ static int sessionRetryConstraints( if( rc==SQLITE_OK ){ sqlite3_step(pInsert); rc = sqlite3_finalize(pInsert); - if( rc==SQLITE_CONSTRAINT ){ + if( (rc&0xff)==SQLITE_CONSTRAINT ){ rc = sqlite3_exec(db, "ROLLBACK TO update_op", 0, 0, 0); sqlite3_free(pApply->constraints.aBuf); pApply->constraints = cons; diff --git a/manifest b/manifest index f5528221a8..c610b57bff 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Lower\sthe\srange\sof\sinputs\saccepted\sby\sthe\spstack\sallocator\sto\saddress\s[bugs:4dbd096fe335f974dbd096fe3|/bugs/4dbd096fe335]. -D 2026-08-07T05:31:08.916 +C Fix\sa\sproblem\sintroduced\sby\s[32c762bbb1]\scausing\ssessions\smodule\sconflict\shandling\sto\smalfunction\swhen\sused\swith\sa\sdatabase\shandle\sconfigured\swith\ssqlite3_extended_result_codes().\sAlso\sensure\sthe\s"session_eec"\spermutation,\swhich\swould\shave\sdetected\sthis,\sis\srun\sas\spart\sof\srelease\stesting. +D 2026-08-07T13:33:54.415 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -579,7 +579,7 @@ F ext/session/sessionrowid.test 85187c2f1b38861a5844868126f69f9ec62223a03449a98a F ext/session/sessionsize.test 8fcf4685993c3dbaa46a24183940ab9f5aa9ed0d23e5fb63bfffbdb56134b795 F ext/session/sessionstat1.test 5e718d5888c0c49bbb33a7a4f816366db85f59f6a4f97544a806421b85dc2dec F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc -F ext/session/sqlite3session.c 673a2c71a3e1fc909301ed15daa30485d774419d015eb7688c79396e6cba6378 +F ext/session/sqlite3session.c ae04242b3516058785f69b684c3076951b13f598559f9f430e3908630ca25098 F ext/session/sqlite3session.h ca7c4422c1514a95056cc8d333217df6b1829d39058126b1de85d10cd62d7a9c F ext/session/test_session.c f465f13c661919f8ba4485a9d0690c4df5bff1cc79e962cfdafa9ff376d5119f F ext/wasm/GNUmakefile cc28e65dec12f1b992957152d8395484f4fcf7f94e6b6736a09ee4f48e7ec048 @@ -1735,7 +1735,7 @@ F test/temptrigger.test a00f258ed8d21a0e8fd4f322f15e8cfb5cef2e43655670e07a753e3f F test/tester.tcl dfd8dd05b54bc493a8db6cc1263ee364c36e3c27fab258dad7305cd79b948f3f F test/testloadext.c 862b848783eaed9985fbce46c65cd214664376b549fae252b364d5d1ef350a27 F test/testrunner.tcl 8734997d6e9c458d5606bd4cc70ee47ddf45aa30fd4e89c67ebc2e1f32794dd5 x -F test/testrunner_data.tcl 2295e8090a337146cb810ba8df426484736ea16eeaf6af37675a46a7a510d5aa +F test/testrunner_data.tcl 4c75dd01fe5ba96b425f3571bff1ddf927734caa3c79e19acd9c84966d7ddfa3 F test/testrunner_estwork.tcl 81e2ae10238f50540f42fbf2d94913052a99bfb494b69e546506323f195dcff9 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502 @@ -2218,8 +2218,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P ee8ef5cd4eb0fa2725aef6e27e771e27f04246a11ee235bad4b506d1b116abbe -R 26d09aba92a9c16d6a5b866aa1be0e22 -U stephan -Z fbaa1e6d14c2b952c17cbcddc9cb48ae +P fafefb59481530255a881f22b1f75b587731867d00eabea39eaec7da2199fdff +R ebde525a0505de1358c5172510950f54 +U dan +Z 2983dccdfb898c446e47a5c1921cb3df # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9f1a2b7734..feaadf5fd6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fafefb59481530255a881f22b1f75b587731867d00eabea39eaec7da2199fdff +8b3da5d6cea2e3b31784f5e8f05c4801a3d881039aa26ecadf3a50b4454a3de6 diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl index 04e04f37f3..7f8216196b 100644 --- a/test/testrunner_data.tcl +++ b/test/testrunner_data.tcl @@ -77,7 +77,7 @@ namespace eval trd { persistent_journal_error no_journal no_journal_error autovacuum_ioerr no_mutex_try fullmutex journaltest inmemory_journal pcache0 pcache10 pcache50 pcache90 - pcache100 prepare mmap + pcache100 prepare mmap session_eec session_strm } #-----------------------------------------------------------------------