From: drh <> Date: Wed, 22 Jun 2022 14:25:12 +0000 (+0000) Subject: Additional enhancements to comments. No changes to code. X-Git-Tag: version-3.39.0~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2591cfb6739d95e6135275b6bde22dc5565827fa;p=thirdparty%2Fsqlite.git Additional enhancements to comments. No changes to code. FossilOrigin-Name: d9a320448f5693d906adf437800675cd4773701db065f3ed238b933fb80f6681 --- diff --git a/manifest b/manifest index 7ee71c0987..ea0ce73d98 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Give\sdbtotxt\san\soption\sto\sprepend\s.open\s--hexdb -D 2022-06-22T14:00:24.150 +C Additional\senhancements\sto\scomments.\s\sNo\schanges\sto\scode. +D 2022-06-22T14:25:12.248 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -642,10 +642,10 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0 F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8 -F src/vdbe.c 555620fbbf4cb2e816e506afeae189e9f2c19a0bf18442f471f7a799300155b7 +F src/vdbe.c d7a10fd2afa527886e930ea39eb4a946206e0e439e6cca7424d7373232183010 F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662 F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da -F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217 +F src/vdbeapi.c 602610f1252d59cd69742f78a1e2f6fbae40a4b407f5506a6a7b869b0df08ff2 F src/vdbeaux.c 328b866880e67526300aa2361c5e50beb3d97dd8746db37dd4aa0135aea60e4d F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd F src/vdbemem.c 3db315458f8dc158aff58719795441437dd6c0fd302e9d9379a8f2a61e185ad6 @@ -1978,8 +1978,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 ef9de201b33678a80bb27c5be8f9dc973c8a4f14af9bfdd3ace36887c8a591ea -R 67da5a3eed2217c3a0aabb673b1aeeeb -U larrybr -Z 3ac9b1cd50f131bc537beb881646b592 +P afeee6125d141ae281658a5f7b73e9b77bc252fa387678b2b5837488180bf108 +R 69eeb3295eb4274ceb6c39df1e8e1372 +U drh +Z 91cf5bff56e9a2477802f426b46d491e # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b754e9a5a0..993099b892 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -afeee6125d141ae281658a5f7b73e9b77bc252fa387678b2b5837488180bf108 \ No newline at end of file +d9a320448f5693d906adf437800675cd4773701db065f3ed238b933fb80f6681 \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 64bb7d4328..7857924a80 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -1004,7 +1004,7 @@ case OP_Gosub: { /* jump */ ** and also less than the current address, then the "EXPLAIN" output ** formatter in the CLI will indent all opcodes from the P2 opcode up ** to be not including the current Return. P2 should be the first opcode -** in the subroutine from which this opcode is returnning. Thus the P2 +** in the subroutine from which this opcode is returning. Thus the P2 ** value is a byte-code indentation hint. See tag-20220407a in ** wherecode.c and shell.c. */ diff --git a/src/vdbeapi.c b/src/vdbeapi.c index 39d73288ce..4e719ede36 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -818,9 +818,9 @@ int sqlite3_step(sqlite3_stmt *pStmt){ sqlite3_reset(pStmt); if( savedPc>=0 ){ /* Setting minWriteFileFormat to 254 is a signal to the OP_Init and - ** OP_Trace opcodes to *not* perform SQLITE_TRACE_STMT because one - ** should output has already occurred due to SQLITE_SCHEMA. - ** tag-20220401a */ + ** OP_Trace opcodes to *not* perform SQLITE_TRACE_STMT because it has + ** already been done once on a prior invocation that failed due to + ** SQLITE_SCHEMA. tag-20220401a */ v->minWriteFileFormat = 254; } assert( v->expired==0 );