Suppress the display of the P4 operand in EXPLAIN output when an opcode

has been converted into a No-op.

FossilOrigin-Name: 9f8297f862a110ded686d091854fae20c6bc393c

diff --git a/manifest b/manifest
index 33c05175d017b43b587c2750c769561d7bde12ce..c246f07bd440e5c171f593b93b2d75da511b8efb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunnecessary\smemset()\sfrom\sthe\ssymbol\sname\sresolver.
-D 2016-01-20T02:21:50.387
+C Suppress\sthe\sdisplay\sof\sthe\sP4\soperand\sin\sEXPLAIN\soutput\swhen\san\sopcode\nhas\sbeen\sconverted\sinto\sa\sNo-op.
+D 2016-01-20T02:36:12.461
 F Makefile.in a476545d0c8626224d0bacac85c6e2967474af81
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 01e855f958932d0d3ed62ec675fc63e2cef61fcb
@@ -414,7 +414,7 @@ F src/vdbe.c b90d9d38e5e0260c2eafa3cb4c2274d8ea94da27
 F src/vdbe.h 7a733ea8aac1b77305a67698e784fa3484ee3337
 F src/vdbeInt.h 42eefa4f9e7432b9968d321b44e48821ec13b189
 F src/vdbeapi.c ffae8f5af4570fbd548504e815e9fb7227f0822e
-F src/vdbeaux.c d34740a472662f9555c0cbb46bbfe323014ba0e5
+F src/vdbeaux.c db67d3e0fcedced22bfeca47a567eb9df91b3495
 F src/vdbeblob.c 37c3d11a753e403698c69e17383d282e1ae73e75
 F src/vdbemem.c b9181e77eca2a095929d46250daf85c8d2621fc0
 F src/vdbesort.c 0971557e5d3c289e46f56a52aed2197c13251de7
@@ -1419,7 +1419,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 730d7efb6fef54ed7c1f4ae27e3b55778ea6ff01
-R 2a84d613eab09af872226a39d465de29
+P da527ddae06460ab4b706cdb871de2188ebaf5ac
+R 9c350206cbc3ec71bedbf771eaad6af4
 U drh
-Z a3f73fee0434b592305d171cd50a9012
+Z d3ee680a30750cc9b6d539ba48a1436a

diff --git a/manifest.uuid b/manifest.uuid
index 8dcaaee61045878fc80c0f747c4652143cb754fd..4615528f3e72ff368887b8cbae22339c7d2de815 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-da527ddae06460ab4b706cdb871de2188ebaf5ac
\ No newline at end of file
+9f8297f862a110ded686d091854fae20c6bc393c
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 47ac9dd9f5bd8e9eeb5a054265575b4e49291e63..d88fbac611c56b46bb3685b6713bb69e4ad6acd4 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -850,6 +850,7 @@ int sqlite3VdbeChangeToNoop(Vdbe *p, int addr){
   pOp = &p->aOp[addr];
   freeP4(p->db, pOp->p4type, pOp->p4.p);
   pOp->p4type = P4_NOTUSED;
+  pOp->p4.z = 0;
   pOp->opcode = OP_Noop;
   return 1;
 }