Merge version 3.39.0 into the wal2 branch.

FossilOrigin-Name: ad3a7005e704711fb9de9e96883db3aed82c4f132a66cb74daf67c2527d79f73
This commit is contained in:
drh
2022-06-25 16:53:36 +00:00
3 changed files with 9 additions and 8 deletions
+6 -6
View File
@@ -1,5 +1,5 @@
C Merge\s3.39.0\srelease\scandidate\s1\sinto\sthe\swal2\sbranch.
D 2022-06-24T15:15:39.211
C Merge\sversion\s3.39.0\sinto\sthe\swal2\sbranch.
D 2022-06-25T16:53:36.816
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -650,7 +650,7 @@ F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da
F src/vdbeapi.c 602610f1252d59cd69742f78a1e2f6fbae40a4b407f5506a6a7b869b0df08ff2
F src/vdbeaux.c 328b866880e67526300aa2361c5e50beb3d97dd8746db37dd4aa0135aea60e4d
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
@@ -1991,8 +1991,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 c8ad869938b06378f49c02655c00ee4f3315e1275d15e69d4ff61d6f60230fe8 e93fd170ce4ae91d572c46d03f68f55d00091d0188030517455017d90d212587
R 692e7c03f597037567e85ef2103289b9
P 5a5e6e368f5cc8fe7cf29696a07942101f5c114084d4117acf277bb3ad8555ac 14e166f40dbfa6e055543f8301525f2ca2e96a02a57269818b9e69e162e98918
R e5fc911f0a86748145e1da0886462030
U drh
Z b96b262e6700f48175fd3d1c6c53396f
Z 1da384b15e9d7950d5559005e2984b62
# Remove this line to create a well-formed Fossil manifest.
+1 -1
View File
@@ -1 +1 @@
5a5e6e368f5cc8fe7cf29696a07942101f5c114084d4117acf277bb3ad8555ac
ad3a7005e704711fb9de9e96883db3aed82c4f132a66cb74daf67c2527d79f73
+2 -1
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;