Improvements to the debugging code. (CVS 1979)

FossilOrigin-Name: bdc3bb070f7f29713b7bb9a6454a7ecbee6cf36d

diff --git a/manifest b/manifest
index a52cddbc1572f29a923aa848af0699abfc88ffec..1cc17456857a9f3f9a1a6f04928008904f956d72 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypo\sin\s".help"\soutput\sfrom\sthe\sshell.\s\sTicket\s#914.\s(CVS\s1978)
-D 2004-09-24T12:50:03
+C Improvements\sto\sthe\sdebugging\scode.\s(CVS\s1979)
+D 2004-09-24T19:39:27
 F Makefile.in abdeb5bd9d017822691884935c320037c33f6ee6
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -55,7 +55,7 @@ F src/pager.c db8f6cb80798091fcff95c1f86873381fbfefee6
 F src/pager.h 67739fe649f33be55dba522ca8a9cc4e42d14f71
 F src/parse.y 9389af67bd49b8e5c9d2968b3315a30565b4a200
 F src/pragma.c 5fb6647fda4c95edb08447a505e6c98c041e5b31
-F src/printf.c 2dfe86e6fcdc83ca55d2f9f4d9771428329eb0c5
+F src/printf.c 74ee8eed5983226d1953b46b8ed7d9a55937c145
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c 13a4e6d0ca2bce8be60e26a499060524fef2e28c
 F src/shell.c 0856973c2b94e22664bc43f398ba3fc22d5e080c
@@ -78,7 +78,7 @@ F src/vdbe.c 0542852785220807feb02b9dee1150ac2e592c8d
 F src/vdbe.h 067ca8d6750ba4f69a50284765e5883dee860181
 F src/vdbeInt.h 6017100adff362b8dfa37a69e3f1431f084bfa5b
 F src/vdbeapi.c f1e060aae5adace5f3a6ae2b0527cfe73e880f1c
-F src/vdbeaux.c 3b67c86338d6a39a173704ffd9e09ae9ceda6601
+F src/vdbeaux.c 082d63e06c276bd600c7d8ddad361cb9f67590ea
 F src/vdbemem.c ef9ac7d32acfe4bce5c5b408b1294c8d9e0cdb56
 F src/where.c 5d573333c07f259c8d3b8423d82ba774b78b63a9
 F test/all.test 929bfa932b55e75c96fe2203f7650ba451c1862c
@@ -247,7 +247,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 49f25ddf8382d588e00bf927e2acae93e332e4d4
-R ee454647ea7cec38b46bf272f4bd777c
+P 1ee3a787ada5abd460200d5812474161bfd1cc71
+R 15484f1b24114da1012f0baff327a290
 U drh
-Z 5a6bc1ab3c53eb7bf32cabb93d8c91d8
+Z 4e3ae2dfcca5df52050a8ce4b9bedbca

diff --git a/manifest.uuid b/manifest.uuid
index d36a5ec85d28d6312bd47834d23240dccef5c29f..11d5355ef9ad6d051bf75d579d70963492669e87 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1ee3a787ada5abd460200d5812474161bfd1cc71
\ No newline at end of file
+bdc3bb070f7f29713b7bb9a6454a7ecbee6cf36d
\ No newline at end of file

diff --git a/src/printf.c b/src/printf.c
index 4744921576291e54a528279ed34ac20a205e7cfb..768e331bfa2edfa67d370d319f1c07bc34845455 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -814,7 +814,7 @@ void sqlite3DebugPrintf(const char *zFormat, ...){
   va_start(ap, zFormat);
   base_vprintf(0, 0, zBuf, sizeof(zBuf), zFormat, ap);
   va_end(ap);
-  fprintf(stdout,"%s", zBuf);
+  fprintf(stdout,"%d: %s", getpid(), zBuf);
   fflush(stdout);
 }
 #endif

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 11e06462fe89bb401ae98b6f229914f3c83630bc..7c34776004f9695c6c54fff58da3e60bba1e45ee 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -440,7 +440,7 @@ static char *displayP3(Op *pOp, char *zTemp, int nTemp){
 }
 
 
-#if !defined(NDEBUG) || defined(VDBE_PROFILE)
+#if !defined(NDEBUG) || defined(VDBE_PROFILE) || defined(SQLITE_DEBUG)
 /*
 ** Print a single opcode.  This routine is used for debugging only.
 */