From: drh <drh@noemail.net>
Date: Tue, 2 Aug 2005 21:42:16 +0000 (+0000)
Subject: Comment out the use of memory high-water marks when not compiling with
X-Git-Tag: version-3.6.10~3582
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7018030d06556b49bded282a1379c995fd6c7a01;p=thirdparty%2Fsqlite.git

Comment out the use of memory high-water marks when not compiling with
SQLITE_MEMDEBUG. (CVS 2577)

FossilOrigin-Name: fb7a258fd35fdf81772b9d47711d30a30dfa4564
---

diff --git a/manifest b/manifest
index 7cddbc7bb5..3d18e8a6d0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\srefactoring\sof\sthe\snew\soptimizer\scode.\s(CVS\s2576)
-D 2005-08-02T17:48:22
+C Comment\sout\sthe\suse\sof\smemory\shigh-water\smarks\swhen\snot\scompiling\swith\nSQLITE_MEMDEBUG.\s(CVS\s2577)
+D 2005-08-02T21:42:17
 F Makefile.in 22ea9c0fe748f591712d8fe3c6d972c6c173a165
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -67,7 +67,7 @@ F src/sqlite.h.in 7ccf2f61de2a0dca515e73708e561362e6c3d1e3
 F src/sqliteInt.h 4cacefaca973cbf8e6a82910c704bf9b4a32fdf1
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
 F src/tclsqlite.c 96feead1f1d301efa1d3ac6b89ecea7592ab18f9
-F src/test1.c 4268e81180a7f9b396a4cf2aa7f268d828cfdf74
+F src/test1.c c809e469683d93c3e9773aa3651a7586a1d37eec
 F src/test2.c 716c1809dba8e5be6093703e9cada99d627542dc
 F src/test3.c 683e1e3819152ffd35da2f201e507228921148d0
 F src/test4.c 7c6b9fc33dd1f3f93c7f1ee6e5e6d016afa6c1df
@@ -290,7 +290,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P 3dc823a0ac12f640a3c54fe1eb7be878d2738529
-R c9921c0f0ed27b22b2b2216c858185fd
+P 868322f7b7176486dfb4b54d99cf6662b79e639d
+R 3a17ea4690ee08d0de2910ea1786f2ae
 U drh
-Z 8627ed9e9eb875486f17896d9b8483fe
+Z c47aa9f3b3ea81319cc7c139f0e5d891
diff --git a/manifest.uuid b/manifest.uuid
index 040ba2a63a..4cfe711262 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-868322f7b7176486dfb4b54d99cf6662b79e639d
\ No newline at end of file
+fb7a258fd35fdf81772b9d47711d30a30dfa4564
\ No newline at end of file
diff --git a/src/test1.c b/src/test1.c
index 4ca3f0438e..a50ad91e66 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.151 2005/07/23 22:59:56 drh Exp $
+** $Id: test1.c,v 1.152 2005/08/02 21:42:17 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -3120,10 +3120,12 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
       (char*)&sqlite3_os_trace, TCL_LINK_INT);
   Tcl_LinkVar(interp, "sqlite_where_trace",
       (char*)&sqlite3_where_trace, TCL_LINK_INT);
+#ifdef SQLITE_MEMDEBUG
   Tcl_LinkVar(interp, "sqlite_memused",
       (char*)&sqlite3_memUsed, TCL_LINK_INT | TCL_LINK_READ_ONLY);
   Tcl_LinkVar(interp, "sqlite_memmax",
       (char*)&sqlite3_memMax, TCL_LINK_INT | TCL_LINK_READ_ONLY);
+#endif
   Tcl_LinkVar(interp, "sqlite_query_plan",
       (char*)&query_plan, TCL_LINK_STRING|TCL_LINK_READ_ONLY);
 #ifndef SQLITE_OMIT_DISKIO