Fix the build so that it works even without SQLITE_ENABLE_EXPLAIN_COMMENTS.

FossilOrigin-Name: 5896cbf4d0c7854c29c96d2ea2cea4adaedaa027a0fe4a3f0ac4dfbeaabb8dec
This commit is contained in:
drh 2020-03-23 23:17:38 +00:00
parent 8c5163a697
commit eeb55d8694
3 changed files with 9 additions and 7 deletions

View File

@ -1,5 +1,5 @@
C The\sbytecode()\sfunction\snow\sruns\sand\ssometimes\sworks,\sbut\sit\suntested\sand\nthere\sare\sknown\sproblems.
D 2020-03-23T20:58:55.887
C Fix\sthe\sbuild\sso\sthat\sit\sworks\seven\swithout\sSQLITE_ENABLE_EXPLAIN_COMMENTS.
D 2020-03-23T23:17:38.750
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@ -612,7 +612,7 @@ F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b
F src/vdbemem.c 39b942ecca179f4f30a32b54579a85d74ccaefa5af2a0ad2700abe5ef0768b22
F src/vdbesort.c 2be76d26998ce2b3324cdcc9f6443728e54b6c7677c553ad909c7d7cfab587df
F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
F src/vdbevtab.c c2dad21236249e745f99e6c4c175ab3c8c1430d84483bea30d3388b8c82bf945
F src/vdbevtab.c 412a9a432dae219a34ca9ee321b3536cd6c55f1dc1f80290d6b7795f3f8647db
F src/vtab.c 7b704a90515a239c6cdba6a66b1bb3a385e62326cceb5ecb05ec7a091d6b8515
F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
F src/wal.c 697424314e40d99f93f548c7bfa526c10e87f4bdf64d5a76a96b999dd7133ebc
@ -1861,7 +1861,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P aee1c12f4227cea9e8c6295cee3ec11797422c31b48c9468f176eb52f8261fe8
R 4e495b787689ae8a4210faab4d40d67a
P 6819b86eb2de516c445655a83f9b2ba5ae0bff660cffaf84f1345d9be79b051e
R b791763565a600914b8ed358ac45d71f
U drh
Z 0475543e1eec2402a1a0d93a49295452
Z f67cc20bd0e690a5ab7aa0e742134572

View File

@ -1 +1 @@
6819b86eb2de516c445655a83f9b2ba5ae0bff660cffaf84f1345d9be79b051e
5896cbf4d0c7854c29c96d2ea2cea4adaedaa027a0fe4a3f0ac4dfbeaabb8dec

View File

@ -190,8 +190,10 @@ static int bytecodevtabColumn(
if( i==5 ){
sqlite3_result_text(ctx, pCur->zP4, -1, SQLITE_STATIC);
}else{
#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
char *zCom = sqlite3VdbeDisplayComment(pVTab->db, pOp, pCur->zP4);
sqlite3_result_text(ctx, zCom, -1, sqlite3_free);
#endif
}
break;
case 6: