diff --git a/Makefile.in b/Makefile.in
index d8c5522404..1f866c668a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -127,7 +127,7 @@ LIBOBJ = alter.lo analyze.lo attach.lo auth.lo btree.lo build.lo \
          pager.lo parse.lo pragma.lo prepare.lo printf.lo random.lo \
          select.lo table.lo tokenize.lo trigger.lo update.lo \
          util.lo vacuum.lo \
-         vdbe.lo vdbeapi.lo vdbeaux.lo vdbefifo.lo vdbemem.lo \
+         vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
          where.lo utf.lo legacy.lo vtab.lo
 
 # All of the source code files.
@@ -180,6 +180,7 @@ SRC = \
   $(TOP)/src/vdbe.h \
   $(TOP)/src/vdbeapi.c \
   $(TOP)/src/vdbeaux.c \
+  $(TOP)/src/vdbeblob.c \
   $(TOP)/src/vdbefifo.c \
   $(TOP)/src/vdbemem.c \
   $(TOP)/src/vdbeInt.h \
@@ -466,6 +467,9 @@ vdbeapi.lo:	$(TOP)/src/vdbeapi.c $(VDBEHDR)
 vdbeaux.lo:	$(TOP)/src/vdbeaux.c $(VDBEHDR)
 	$(LTCOMPILE) -c $(TOP)/src/vdbeaux.c
 
+vdbeblob.lo:	$(TOP)/src/vdbeblob.c $(VDBEHDR)
+	$(LTCOMPILE) -c $(TOP)/src/vdbeblob.c
+
 vdbefifo.lo:	$(TOP)/src/vdbefifo.c $(VDBEHDR)
 	$(LTCOMPILE) -c $(TOP)/src/vdbefifo.c
 
diff --git a/manifest b/manifest
index 8d8d5bdc3c..f4fb1becf6 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Fix\sa\sproblem\swith\scasting\sblobs\sto\snumeric\stypes.\s(CVS\s4021)
-D 2007-05-17T16:34:44
-F Makefile.in 87b200ad9970907f76df734d29dff3d294c10935
+C Bring\sthe\sautoconf\sbased\sbuild\ssystem\sup\sto\sdate\swith\sthe\srecent\schanges.\s#2366,\s#2367\sand\s#2368.\s(CVS\s4022)
+D 2007-05-17T16:38:30
+F Makefile.in a42354804b50c2708ce72cf79e4daa30f50191b5
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
 F VERSION 6de5e9812c227f00155cb59af3535017aef3e258
@@ -119,7 +119,7 @@ F src/test9.c c0f38f7795cc51d37db6c63874d90f40f10d0f0e
 F src/test_async.c 9d326ceda4306bcab252b8f7e8e480ed45d7ccb6
 F src/test_autoext.c 855157d97aa28cf84233847548bfacda21807436
 F src/test_btree.c 882d59acad48bab3b1fe3daf3645059b590cfc79
-F src/test_config.c 14080fbd60d334c17bf9610c8ac31814a7ad3832
+F src/test_config.c 214f376781c75db1726acd045355546c17d5ee24
 F src/test_hexio.c 14c007252285c6dabcec4a28fcf08e9177e85178
 F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8
 F src/test_md5.c 6c42bc0a3c0b54be34623ff77a0eec32b2fa96e3
@@ -132,7 +132,7 @@ F src/update.c 3359041db390a8f856d67272f299600e2104f350
 F src/utf.c 73134f4d3e44686ef5abd877f4fb1290b75f3311
 F src/util.c 80cdf6b68d03b8f0ab3237a390842e039cff66c6
 F src/vacuum.c 8bd895d29e7074e78d4e80f948e35ddc9cf2beef
-F src/vdbe.c 51baf9ba77e986db857c69d63a979bb5227317ae
+F src/vdbe.c 38e902e80e36008c29638520d59cb1b88b997dbb
 F src/vdbe.h 001c5b257567c1d3de7feb2203aac71d0d7b16a3
 F src/vdbeInt.h 7d2bf163d6d4e815724a457f2216dd8e38c3955c
 F src/vdbeapi.c f89d6bc5264e66f44589e454fbeeee96854d0dd3
@@ -256,7 +256,7 @@ F test/icu.test e6bfae7f625c88fd14df6f540fe835bdfc1e4329
 F test/in.test 369cb2aa1eab02296b4ec470732fe8c131260b1d
 F test/in2.test b1f447f4f0f67e9f83ff931e7e2e30873f9ea055
 F test/incrblob.test 7f82ae497364612aa17a37f77f12e01e2bee9f20
-F test/incrblob_err.test 9dae0762ba4d73b516d176d091c6b2b16f625953
+F test/incrblob_err.test 2501bec57e317e7051451b5093b47fc61a96c85a
 F test/incrvacuum.test f490c8ae86f2ecca622425d02e27d3119058cb21
 F test/incrvacuum2.test 82397ceb5941cbe852fd29bb33fcdf5665bc80c2
 F test/incrvacuum_ioerr.test cb331403b8dea3c5bae6163861ff25037b0df56a
@@ -317,7 +317,7 @@ F test/pager2.test c025f91b75fe65e85febda64d9416428b8a5cab5
 F test/pager3.test 2323bf27fd5bd887b580247e5bce500ceee994b4
 F test/pageropt.test b4b38eb3cf76be2be444326856248898bb0e3fc9
 F test/pagesize.test e0a8b3fe80f8b8e808d94a00734c7a18c76c407e
-F test/pragma.test fecb7085f58d9fb5172a5c0b63fd3b25c7bfb414
+F test/pragma.test b0e73879206934a835856a8b8c4cc884cd8562f3
 F test/printf.test 69d8cb0771a1a5e4d9d5dece12fc2c16179ac5e5
 F test/progress.test 8b22b4974b0a95272566385f8cb8c341c7130df8 x
 F test/ptrchng.test 1c712dd6516e1377471744fa765e41c79a357da6
@@ -493,7 +493,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 684f765df3e8a4836f254717d175a4a7b5e7d15f
-R f94684259a9006337971361185f52b0b
+P f2ce727c4d798c666e95876a2b67e8a305d82e3a
+R 7b00490089c9a9acc3bbd9b31f5ea738
 U danielk1977
-Z 9940d343779fd35f92c8bf0b213dac54
+Z 3e6e530a34bc48403e48b023fcadb804
diff --git a/manifest.uuid b/manifest.uuid
index 13c5c55a58..5c9585cc46 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f2ce727c4d798c666e95876a2b67e8a305d82e3a
\ No newline at end of file
+ae644bc7aad229f2d219ea20eb4774318feb3051
\ No newline at end of file
diff --git a/src/test_config.c b/src/test_config.c
index 7f4689e517..cf9e9c2680 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -16,7 +16,7 @@
 ** The focus of this file is providing the TCL testing layer
 ** access to compile-time constants.
 **
-** $Id: test_config.c,v 1.4 2007/05/10 10:46:57 danielk1977 Exp $
+** $Id: test_config.c,v 1.5 2007/05/17 16:38:30 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -42,6 +42,12 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options","casesensitivelike","0",TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_DEBUG
+  Tcl_SetVar2(interp, "sqlite_options", "debug", "1", TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "debug", "0", TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_DISABLE_DIRSYNC
   Tcl_SetVar2(interp, "sqlite_options", "dirsync", "0", TCL_GLOBAL_ONLY);
 #else
diff --git a/src/vdbe.c b/src/vdbe.c
index a9f19ad36d..7ea40992cb 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.621 2007/05/16 17:28:43 danielk1977 Exp $
+** $Id: vdbe.c,v 1.622 2007/05/17 16:38:30 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -5062,7 +5062,7 @@ default: {
     }
 #endif
 
-#if defined(SQLITE_TEST) && !defined(NDEBUG)
+#ifdef SQLITE_TEST
     /* Keep track of the size of the largest BLOB or STR that has appeared
     ** on the top of the VDBE stack.
     */
diff --git a/test/incrblob_err.test b/test/incrblob_err.test
index 812a50dd63..5608ea7371 100644
--- a/test/incrblob_err.test
+++ b/test/incrblob_err.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: incrblob_err.test,v 1.2 2007/05/04 19:03:03 danielk1977 Exp $
+# $Id: incrblob_err.test,v 1.3 2007/05/17 16:38:30 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -20,6 +20,14 @@ ifcapable {!incrblob} {
   return
 }
 
+# Only run these tests if memory debugging is turned on.
+#
+if {[info command sqlite_malloc_stat]==""} {
+   puts "Skipping incrblob_err tests: not compiled with -DSQLITE_MEMDEBUG..."
+   finish_test
+   return
+}
+
 # Usage: do_malloc_test <test number> <options...>
 #
 # The first argument, <test number>, is an integer used to name the
diff --git a/test/pragma.test b/test/pragma.test
index e81bfd4871..501c60820a 100644
--- a/test/pragma.test
+++ b/test/pragma.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for the PRAGMA command.
 #
-# $Id: pragma.test,v 1.53 2007/04/06 21:42:22 drh Exp $
+# $Id: pragma.test,v 1.54 2007/05/17 16:38:30 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -180,18 +180,23 @@ do_test pragma-1.14 {
 
 # Test turning "flag" pragmas on and off.
 #
-do_test pragma-1.15 {
-  execsql {
-    PRAGMA vdbe_listing=YES;
-    PRAGMA vdbe_listing;
-  }
-} {1}
-do_test pragma-1.16 {
-  execsql {
-    PRAGMA vdbe_listing=NO;
-    PRAGMA vdbe_listing;
-  }
-} {0}
+ifcapable debug {
+  # Pragma "vdbe_listing" is only available if compiled with SQLITE_DEBUG
+  #
+  do_test pragma-1.15 {
+    execsql {
+      PRAGMA vdbe_listing=YES;
+      PRAGMA vdbe_listing;
+    }
+  } {1}
+  do_test pragma-1.16 {
+    execsql {
+      PRAGMA vdbe_listing=NO;
+      PRAGMA vdbe_listing;
+    }
+  } {0}
+}
+
 do_test pragma-1.17 {
   execsql {
     PRAGMA parser_trace=ON;