mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge version 3.39.0 into the begin-concurrent-pnu-wal2 branch.

Browse Source 
FossilOrigin-Name: 09cfef38daa791c2ba114fcf960436322c5acde312234b2c5105c3d95b6c1337
This commit is contained in:
drh 2022-06-25 17:08:25 +00:00
commit acf11ef443
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Merge\sthe\slatest\schanges\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
D 2022-06-24T15:26:30.415
C Merge\sversion\s3.39.0\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
D 2022-06-25T17:08:25.541
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@ -656,7 +656,7 @@ F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da
F src/vdbeapi.c 602610f1252d59cd69742f78a1e2f6fbae40a4b407f5506a6a7b869b0df08ff2
F src/vdbeaux.c b769bb218a5cf1a621e8cdb137937625d1159bef29edc6a78c349665a5f6161e
F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
F src/vdbemem.c 3db315458f8dc158aff58719795441437dd6c0fd302e9d9379a8f2a61e185ad6
F src/vdbemem.c 5ebf05c0182addedb1607ade848e1c83cef40981df94d1abfab0c59288c6064f
F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@ -2012,8 +2012,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 82e7e836011f52c09196aa6af9519cd9f584881d41dcbcdb23969e863c6e4fb0 5a5e6e368f5cc8fe7cf29696a07942101f5c114084d4117acf277bb3ad8555ac
R 6af1fb267b559ac13ca3f5eec3a5395b
P d3fa692179fb2e704e22f1fa0a64152bd0d6d6b531e359fa038eecf909373d97 ad3a7005e704711fb9de9e96883db3aed82c4f132a66cb74daf67c2527d79f73
R 2fdb6eee279557a448a7092c530a5c13
U drh
Z 55e96386371c2ffe4430229f65340003
Z 8186556c8d69c75aa7307dee637a1388
# Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@ -1 +1 @@
d3fa692179fb2e704e22f1fa0a64152bd0d6d6b531e359fa038eecf909373d97
09cfef38daa791c2ba114fcf960436322c5acde312234b2c5105c3d95b6c1337

3
src/vdbemem.c
View File

@ -1491,7 +1491,8 @@ static int valueFromFunction(
goto value_from_function_out;
}
assert( pCtx->pParse->rc==SQLITE_OK );
testcase( pCtx->pParse->rc==SQLITE_ERROR );
testcase( pCtx->pParse->rc==SQLITE_OK );
memset(&ctx, 0, sizeof(ctx));
ctx.pOut = pVal;
ctx.pFunc = pFunc;