Improved byte-code coverage testing verification in the merge algorithm.

FossilOrigin-Name: e49ec0e24b4765a6a819f3e980b680b9604f6db21aa8112ec4e9b54d82220c00

diff --git a/manifest b/manifest
index d9d250aa6e1c9dfc8eb2275fcf1be1f09fc4f7ab..10bf2c7a56c97157a0cc4fd70937f7c620effc33 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\stmstmpvfs.c\sextension\sshould\snot\smodify\sthe\scontent\sof\spages\sgoing\sinto\nthe\sWAL\sfile,\sas\sthat\swould\scorrupt\sthe\spage\schecksum\sused\sfor\srecovery.\nInstead,\sonly\sinsert\stimestamp\sinformation\sas\scontent\sis\swritten\sinto\sthe\ndatabase\sfile.
-D 2026-01-27T16:18:35.538
+C Improved\sbyte-code\scoverage\stesting\sverification\sin\sthe\smerge\salgorithm.
+D 2026-01-27T22:27:14.946
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -738,7 +738,7 @@ F src/printf.c b1b29b5e58e1530d5daeee5963d3c318d8ab2d7e38437580e28755753e0c1ded
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 47aa7fdc9ec4c19b103ac5e79d7887d30119b5675309facf5eed1118391c868b
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
-F src/select.c 36697f8ef0b3fc36534c0cb0c97676fc92480b7572c0bb89f711cf85aea0f3c1
+F src/select.c 89db4768dc2ffed05755e072006dd13455cd387a2c169f167b48c1d48c56b257
 F src/shell.c.in d7c1041d6ad00bee2515842a1950640afe424df2e89ad2d6e3b9e68b184824a5
 F src/sqlite.h.in 8bcbaecfe2cbecf8c5c1381354fcdd7d307443e88b4953fccb222456c1267b61
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
@@ -2193,8 +2193,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P aff74e71ea734e1ad8fa893652885fd8c6c432fb60e92913a799e6df5e980b47
-R c1c4f0f314e0c4017374b4b85c1bf563
+P dabaeeb1dab82eaea2449658b9c4c74af0058e5a64a076dab046902c6efac292
+R 75afb5053416893c324ab21387fcb473
 U drh
-Z 890f1169d388ee61b94fe2eac35c478f
+Z 3c56490441974bd50e8ddc69af179ada
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f3b58656bd96ec5f4daf0ae522b0a7dfa4403bbe..9426c5c9d5b89c1d403d44d3f64b4d981727038c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dabaeeb1dab82eaea2449658b9c4c74af0058e5a64a076dab046902c6efac292
+e49ec0e24b4765a6a819f3e980b680b9604f6db21aa8112ec4e9b54d82220c00

diff --git a/src/select.c b/src/select.c
index a1d3cf8837bf8e4c8bad4efe762441a51e7f1c28..9b910b890c14b9747a9a0c71b548e3f54e75e25a 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -3704,7 +3704,11 @@ static int multiSelectByMerge(
   sqlite3VdbeAddOp4(v, OP_Compare, destA.iSdst, destB.iSdst, nOrderBy,
                          (char*)pKeyMerge, P4_KEYINFO);
   sqlite3VdbeChangeP5(v, OPFLAG_PERMUTE);
-  sqlite3VdbeAddOp3(v, OP_Jump, addrAltB, addrAeqB, addrAgtB); VdbeCoverage(v);
+  sqlite3VdbeAddOp3(v, OP_Jump, addrAltB, addrAeqB, addrAgtB);
+  VdbeCoverageIf(v, op==TK_ALL);
+  VdbeCoverageIf(v, op==TK_UNION);
+  VdbeCoverageIf(v, op==TK_EXCEPT);
+  VdbeCoverageIf(v, op==TK_INTERSECT);
 
   /* Jump to the this point in order to terminate the query.
   */