Index: src/vdbeaux.c
==================================================================
--- src/vdbeaux.c
+++ src/vdbeaux.c
@@ -82,22 +82,34 @@
   pB->zSql = zTmp;
   pB->isPrepareV2 = pA->isPrepareV2;
 }
 
 /*
-** Resize the Vdbe.aOp array so that it is at least one op larger than 
-** it was.
+** Resize the Vdbe.aOp array so that it is at least nOp elements larger 
+** its current size. nOp is guaranteed to be less than or equal to 1024.
 **
 ** If an out-of-memory error occurs while resizing the array, return
-** SQLITE_NOMEM. In this case Vdbe.aOp and Vdbe.nOpAlloc remain 
+** SQLITE_NOMEM. In this case Vdbe.aOp and Parse.nOpAlloc remain 
 ** unchanged (this is so that any opcodes already allocated can be 
 ** correctly deallocated along with the rest of the Vdbe).
 */
-static int growOpArray(Vdbe *v){
+static int growOpArray(Vdbe *v, int nOp){
   VdbeOp *pNew;
   Parse *p = v->pParse;
+
+  /* If SQLITE_TEST_REALLOC_STRESS is defined and the current op array is
+  ** less than 512 entries in size, grow the op array by the minimum amount 
+  ** required. Otherwise, allocate either double the current size of the 
+  ** array or 1KB of space, whichever is smaller.  */
+#ifdef SQLITE_TEST_REALLOC_STRESS
+  int nNew = (p->nOpAlloc>=512 ? p->nOpAlloc*2 : p->nOpAlloc+nOp);
+#else
   int nNew = (p->nOpAlloc ? p->nOpAlloc*2 : (int)(1024/sizeof(Op)));
+  UNUSED_PARAMETER(nOp);
+#endif
+
+  assert( nNew>=(p->nOpAlloc+nOp) );
   pNew = sqlite3DbRealloc(p->db, v->aOp, nNew*sizeof(Op));
   if( pNew ){
     p->nOpAlloc = sqlite3DbMallocSize(p->db, pNew)/sizeof(Op);
     v->aOp = pNew;
   }
@@ -137,11 +149,11 @@
 
   i = p->nOp;
   assert( p->magic==VDBE_MAGIC_INIT );
   assert( op>0 && op<0xff );
   if( p->pParse->nOpAlloc<=i ){
-    if( growOpArray(p) ){
+    if( growOpArray(p, 1) ){
       return 1;
     }
   }
   p->nOp++;
   pOp = &p->aOp[i];
@@ -539,11 +551,11 @@
 ** address of the first operation added.
 */
 int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp, int iLineno){
   int addr;
   assert( p->magic==VDBE_MAGIC_INIT );
-  if( p->nOp + nOp > p->pParse->nOpAlloc && growOpArray(p) ){
+  if( p->nOp + nOp > p->pParse->nOpAlloc && growOpArray(p, nOp) ){
     return 0;
   }
   addr = p->nOp;
   if( ALWAYS(nOp>0) ){
     int i;
@@ -724,11 +736,11 @@
 
 /*
 ** Change the opcode at addr into OP_Noop
 */
 void sqlite3VdbeChangeToNoop(Vdbe *p, int addr){
-  if( p->aOp ){
+  if( addr<p->nOp ){
     VdbeOp *pOp = &p->aOp[addr];
     sqlite3 *db = p->db;
     freeP4(db, pOp->p4type, pOp->p4.p);
     memset(pOp, 0, sizeof(pOp[0]));
     pOp->opcode = OP_Noop;

Index: test/incrblob_err.test
==================================================================
--- test/incrblob_err.test
+++ test/incrblob_err.test
@@ -12,10 +12,11 @@
 # $Id: incrblob_err.test,v 1.14 2008/07/18 17:16:27 drh Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+set ::testprefix incrblob_err
 
 ifcapable {!incrblob  || !memdebug || !tclvar} {
   finish_test
   return
 }

Index: test/malloc.test
==================================================================
--- test/malloc.test
+++ test/malloc.test
@@ -18,10 +18,11 @@
 #
 # $Id: malloc.test,v 1.81 2009/06/24 13:13:45 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+set ::testprefix malloc
 
 
 # Only run these tests if memory debugging is turned on.
 #
 source $testdir/malloc_common.tcl

Index: test/malloc_common.tcl
==================================================================
--- test/malloc_common.tcl
+++ test/malloc_common.tcl
@@ -407,10 +407,11 @@
   array unset ::mallocopts 
   array set ::mallocopts $args
 
   if {[string is integer $tn]} {
     set tn malloc-$tn
+    catch { set tn $::testprefix-$tn }
   }
   if {[info exists ::mallocopts(-start)]} {
     set start $::mallocopts(-start)
   } else {
     set start 0