Change the output of vdbe_trace etc. to include operands p3 and p5. (CVS 4665)

FossilOrigin-Name: 76f2040b051e1d4d8033e354dffe277b549f7962

diff --git a/manifest b/manifest
index 895dec7f081b33e07c69f5b93d493ab0b51b15fe..6e90a46c148e4ce518abaf22cc315afbd0018c4d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Combine\sthe\sOP_Column\sand\sOP_DfltValue\sopcodes.\s(CVS\s4664)
-D 2008-01-03T08:08:40
+C Change\sthe\soutput\sof\svdbe_trace\setc.\sto\sinclude\soperands\sp3\sand\sp5.\s(CVS\s4665)
+D 2008-01-03T08:18:31
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 30789bf70614bad659351660d76b8e533f3340e9
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -172,7 +172,7 @@ F src/vdbe.c 429493ced32e5bb3d17fabd4f893374ebe5ffdf2
 F src/vdbe.h ad5fd7aa694928e54efa84ac8f8133b77053c97d
 F src/vdbeInt.h 2985f1369273e635898cf5952237efcb3fdb21f3
 F src/vdbeapi.c bf615ff2cf2b121f1609cbadd4f52720289733b5
-F src/vdbeaux.c f31d1dbbbf98eadf0a616829d0d1456a96079316
+F src/vdbeaux.c 8c8901e4b5d5e8a89d6c149b9bcf91facb169f18
 F src/vdbeblob.c b90f7494c408d47ce6835000b01e40b371e27baf
 F src/vdbefifo.c 334c838c8f42d61a94813d136019ee566b5dc2f6
 F src/vdbemem.c 123994fcd344993d2fb050a83b91b341bbbd08b4
@@ -603,7 +603,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 35da261daf602b1e938f05bbad1ff99213d9f4b9
-R 20b90fa8179664d61eeec8c990a7aa2a
+P c30f8206353f32a08ef0b323c9fd0bdbeaa28b02
+R 771f6ceee9c4c383810617b5c88de655
 U danielk1977
-Z 86771e92c9dc1d8cb50d685596a6b3c2
+Z f7a1409cbe2afac4183b180783d9a997

diff --git a/manifest.uuid b/manifest.uuid
index 5819fbe41ed3f783df3a931a70d3038c6743e7e8..952b1b0fd928fa9f681ce7380e57bd5d4a8ef4c9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c30f8206353f32a08ef0b323c9fd0bdbeaa28b02
\ No newline at end of file
+76f2040b051e1d4d8033e354dffe277b549f7962
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index e0f7d824e3d04b67a47823f3a0b756f9cd45a48e..dd310c4f0a5f6dc5e3d82eea6a80f107d39b461e 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -735,11 +735,11 @@ void sqlite3VdbeUsesBtree(Vdbe *p, int i){
 void sqlite3VdbePrintOp(FILE *pOut, int pc, Op *pOp){
   char *zP4;
   char zPtr[50];
-  static const char *zFormat1 = "%4d %-13s %4d %4d %s\n";
+  static const char *zFormat1 = "%4d %-13s %4d %4d %4d %-4s %.2X\n";
   if( pOut==0 ) pOut = stdout;
   zP4 = displayP4(pOp, zPtr, sizeof(zPtr));
-  fprintf(pOut, zFormat1,
-      pc, sqlite3OpcodeName(pOp->opcode), pOp->p1, pOp->p2, zP4);
+  fprintf(pOut, zFormat1, pc, 
+      sqlite3OpcodeName(pOp->opcode), pOp->p1, pOp->p2, pOp->p3, zP4, pOp->p5);
   fflush(pOut);
 }
 #endif