Improved debugging comment generation for the OP_Column opcode.

FossilOrigin-Name: 3e073bfddfcd652dfae8656d8978a4de427d21847fdaccfce53b6b895ad33f01

diff --git a/manifest b/manifest
index 0a4277735f34709f20619686fc317d1a78a4cc54..cda1c3f8caedec1282d75290b3c97ac35a684304 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\sdecision\sof\swhen\sto\scheck\sON\sconstraints\sfor\san\sinner\njoin\sthat\sis\san\soperand\sto\sa\sRIGHT\sJOIN.\s\sFix\sfor\sissue\sidentify\sby\n[forum:/forumpost/c06b10ad7e|forum\spost\sc06b10ad7e].
-D 2022-05-14T15:59:42.367
+C Improved\sdebugging\scomment\sgeneration\sfor\sthe\sOP_Column\sopcode.
+D 2022-05-14T17:40:47.718
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -629,7 +629,7 @@ F src/vdbe.c a6a20956fa128c0b8d3c5592a9a3db890a46cf626f46ffee0cab2ac5bf8d04b2
 F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
 F src/vdbeInt.h ef43f7fdc5fde29fc3fd29c506c12830f366178fdb4edbbf0cbc3dfbd1278b5f
 F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
-F src/vdbeaux.c f406d8d8b461f260aeaa69d265c5d175ff0a9f84d6153c87975cdfbf9d681922
+F src/vdbeaux.c 75c4f75ed7e1d12eb3d80093a160ec998c839f3008a1c3c967fc5acf522d0e3c
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 7189090b72baa025f945a1ac8c61ee420c645254476e8a191d555db76dfea5d4
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -1954,8 +1954,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 778e57a558dc3f819ca57623bcb85f58c8fbeb28bc12a1e2edbdd1244e9107c5
-R 09aeae61cd90b7d055124f3c701f239f
+P 9d17233c7d98bf25c1a518d067e778708b3db6d6302edd8d7e376ba0ba4f1c30
+R 3e11d035d04bb8add88257d626a130df
 U drh
-Z 41a70168dfca4248dc5d36d0e11691b8
+Z 4f25ce32e3f912e3438ae5561148601c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f0092674dd5c004967da23ebcb07aee39103dfdf..f030da8c3d375755d07664340a52624a9e5546df 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d17233c7d98bf25c1a518d067e778708b3db6d6302edd8d7e376ba0ba4f1c30
\ No newline at end of file
+3e073bfddfcd652dfae8656d8978a4de427d21847fdaccfce53b6b895ad33f01
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 9e702edcd52d42fb74fdf573ed087214334d6d00..b2e471e0c9238daeb6c1fcfa2934d77ff1ed7cef 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1576,11 +1576,9 @@ char *sqlite3VdbeDisplayComment(
         }else if( c=='X' ){
           if( pOp->zComment && pOp->zComment[0] ){
             sqlite3_str_appendall(&x, pOp->zComment);
-          }else{
-            sqlite3_str_appendall(&x, zSynopsis+1);
+            seenCom = 1;
+            break;
           }
-          seenCom = 1;
-          break;
         }else{
           int v1 = translateP(c, pOp);
           int v2;