Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -953,11 +953,11 @@
 # A very detailed test running most or all test cases
 fulltest:	testfixture$(TEXE) sqlite3$(TEXE) fuzztest
 	./testfixture$(TEXE) $(TOP)/test/all.test
 
 # Really really long testing
-soaktest:	testfixture$(TEXE) sqlite3$(TEXE)
+soaktest:	testfixture$(TEXE) sqlite3$(TEXE) fuzzoomtest
 	./testfixture$(TEXE) $(TOP)/test/all.test -soak=1
 
 # Do extra testing but not aeverything.
 fulltestonly:	testfixture$(TEXE) sqlite3$(TEXE)
 	./testfixture$(TEXE) $(TOP)/test/full.test
@@ -964,10 +964,13 @@
 
 # Fuzz testing
 fuzztest:	fuzzershell$(TEXE)
 	./fuzzershell$(TEXE) -f $(TOP)/test/fuzzdata1.txt
 
+fuzzoomtest:	fuzzershell$(TEXE)
+	./fuzzershell$(TEXE) -f $(TOP)/test/fuzzdata1.txt --oom
+
 # This is the common case.  Run many tests but not those that take
 # a really long time.
 #
 test:	testfixture$(TEXE) sqlite3$(TEXE) fuzztest
 	./testfixture$(TEXE) $(TOP)/test/veryquick.test

Index: Makefile.msc
==================================================================
--- Makefile.msc
+++ Makefile.msc
@@ -1625,11 +1625,11 @@
 	.\testfixture.exe $(TOP)\test\loadext.test
 
 fulltest:	testfixture.exe sqlite3.exe fuzztest
 	.\testfixture.exe $(TOP)\test\all.test
 
-soaktest:	testfixture.exe sqlite3.exe
+soaktest:	testfixture.exe sqlite3.exe fuzzoomtest
 	.\testfixture.exe $(TOP)\test\all.test -soak=1
 
 fulltestonly:	testfixture.exe sqlite3.exe fuzztest
 	.\testfixture.exe $(TOP)\test\full.test
 
@@ -1637,10 +1637,13 @@
 	.\testfixture.exe $(TOP)\test\permutations.test queryplanner
 
 fuzztest:	fuzzershell.exe
 	.\fuzzershell.exe -f $(TOP)\test\fuzzdata1.txt
 
+fuzzoomtest:	fuzzershell.exe
+	.\fuzzershell.exe -f $(TOP)\test\fuzzdata1.txt --oom
+
 test:	testfixture.exe sqlite3.exe fuzztest
 	.\testfixture.exe $(TOP)\test\veryquick.test
 
 smoketest:	testfixture.exe
 	.\testfixture.exe $(TOP)\test\main.test

Index: main.mk
==================================================================
--- main.mk
+++ main.mk
@@ -634,11 +634,11 @@
 		-o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
 
 fulltest:	testfixture$(EXE) sqlite3$(EXE) fuzztest
 	./testfixture$(EXE) $(TOP)/test/all.test
 
-soaktest:	testfixture$(EXE) sqlite3$(EXE)
+soaktest:	testfixture$(EXE) sqlite3$(EXE) fuzzoomtest
 	./testfixture$(EXE) $(TOP)/test/all.test -soak=1
 
 fulltestonly:	testfixture$(EXE) sqlite3$(EXE) fuzztest
 	./testfixture$(EXE) $(TOP)/test/full.test
 
@@ -646,10 +646,13 @@
 	./testfixture$(EXE) $(TOP)/test/permutations.test queryplanner
 
 fuzztest:	fuzzershell$(EXE)
 	./fuzzershell$(EXE) -f $(TOP)/test/fuzzdata1.txt
 
+fuzzoomtest:	fuzzershell$(EXE)
+	./fuzzershell$(EXE) -f $(TOP)/test/fuzzdata1.txt --oom
+
 test:	testfixture$(EXE) sqlite3$(EXE) fuzztest
 	./testfixture$(EXE) $(TOP)/test/veryquick.test
 
 # Run a test using valgrind.  This can take a really long time
 # because valgrind is so much slower than a native machine.

Index: test/releasetest.tcl
==================================================================
--- test/releasetest.tcl
+++ test/releasetest.tcl
@@ -109,10 +109,17 @@
     -DSQLITE_ENABLE_MEMSYS3=1
     -DSQLITE_ENABLE_COLUMN_METADATA=1
     -DSQLITE_ENABLE_STAT4
     -DSQLITE_MAX_ATTACHED=125
   }
+  "Fast-One" {
+    -O6
+    -DSQLITE_ENABLE_FTS4=1
+    -DSQLITE_ENABLE_RTREE=1
+    -DSQLITE_ENABLE_STAT4
+    -DSQLITE_MAX_ATTACHED=125
+  }
   "Device-One" {
     -O2
     -DSQLITE_DEBUG=1
     -DSQLITE_DEFAULT_AUTOVACUUM=1
     -DSQLITE_DEFAULT_CACHE_SIZE=64
@@ -215,10 +222,11 @@
     "Extra-Robustness"        test
     "Device-Two"              test
     "No-lookaside"            test
     "Devkit"                  test
     "Sanitize"                {QUICKTEST_OMIT=func4.test,nan.test test}
+    "Fast-One"                fuzzoomtest
     "Valgrind"                valgrindtest
     "Default"                 "threadtest fulltest"
     "Device-One"              fulltest
   }
   Linux-i686 {
@@ -651,14 +659,15 @@
 
     # If the configuration included the SQLITE_DEBUG option, then remove
     # it and run veryquick.test. If it did not include the SQLITE_DEBUG option
     # add it and run veryquick.test.
     if {$target!="checksymbols" && $target!="valgrindtest"
-           && !$::BUILDONLY && $::QUICK<2} {
+           && $target!="fuzzoomtest" && !$::BUILDONLY && $::QUICK<2} {
       set debug_idx [lsearch -glob $config_options -DSQLITE_DEBUG*]
       set xtarget $target
       regsub -all {fulltest[a-z]*} $xtarget test xtarget
+      regsub -all {fuzzoomtest} $xtarget fuzztest xtarget
       if {$debug_idx < 0} {
         incr NTEST
         append config_options " -DSQLITE_DEBUG=1"
         run_test_suite "${zConfig}_debug" $xtarget $config_options
       } else {

Index: tool/fuzzershell.c
==================================================================
--- tool/fuzzershell.c
+++ tool/fuzzershell.c
@@ -37,12 +37,12 @@
 ** The input text can be divided into separate test cases using comments
 ** of the form:
 **
 **       |****<...>****|
 **
-** where the "..." is arbitrary text, except the "|" should really be "/".
-** ("|" is used here to avoid compiler errors about nested comments.)
+** where the "..." is arbitrary text. (Except the "|" should really be "/".
+** "|" is used here to avoid compiler errors about nested comments.)
 ** A separate in-memory SQLite database is created to run each test case.
 ** This feature allows the "queue" of AFL to be captured into a single big
 ** file using a command like this:
 **
 **    (for i in id:*; do echo '|****<'$i'>****|'; cat $i; done) >~/all-queue.txt
@@ -58,11 +58,10 @@
 **
 ** New test cases can be appended to all-queue.txt at any time.  If redundant
 ** test cases are added, they can be eliminated by running:
 **
 **    fuzzershell -f ~/all-queue.txt --unique-cases ~/unique-cases.txt
-**
 */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
@@ -82,10 +81,17 @@
   int bOomEnable;                  /* True to enable OOM simulation */
   int nOomBrkpt;                   /* Number of calls to oomFault() */
   char zTestName[100];             /* Name of current test */
 } g;
 
+/*
+** Maximum number of iterations for an OOM test
+*/
+#ifndef OOM_MAX
+# define OOM_MAX 1000
+#endif
+
 /*
 ** This routine is called when a simulated OOM occurs.  It exists as a
 ** convenient place to set a debugger breakpoint.
 */
 static void oomFault(void){
@@ -613,11 +619,11 @@
     if( strncmp(&zIn[i], "/****<",6)==0 ){
       char *z = strstr(&zIn[i], ">****/");
       if( z ){
         z += 6;
         sqlite3_snprintf(sizeof(g.zTestName), g.zTestName, "%.*s", 
-                         (int)(z-&zIn[i]), &zIn[i]);
+                         (int)(z-&zIn[i]) - 12, &zIn[i+6]);
         if( verboseFlag ){
           printf("%.*s\n", (int)(z-&zIn[i]), &zIn[i]);
           fflush(stdout);
         }
         i += (int)(z-&zIn[i]);
@@ -640,20 +646,23 @@
     }
     zSql = &zIn[i];
     if( verboseFlag ){
       printf("INPUT (offset: %d, size: %d): [%s]\n",
               i, (int)strlen(&zIn[i]), &zIn[i]);
-      fflush(stdout);
     }else if( multiTest && !quietFlag ){
-      int pct = oomFlag ? 100*iNext/nIn : ((10*iNext)/nIn)*10;
-      if( pct!=lastPct ){
-        if( lastPct<0 ) printf("fuzz test:");
-        printf(" %d%%", pct);
-        fflush(stdout);
-        lastPct = pct;
+      if( oomFlag ){
+        printf("%s\n", g.zTestName);
+      }else{
+        int pct = (10*iNext)/nIn;
+        if( pct!=lastPct ){
+          if( lastPct<0 ) printf("fuzz test:");
+          printf(" %d%%", pct*10);
+          lastPct = pct;
+        }
       }
     }
+    fflush(stdout);
     switch( iMode ){
       case FZMODE_Glob:
         zSql = zToFree = sqlite3_mprintf("SELECT glob(%s);", zSql);
         break;
       case FZMODE_Printf:
@@ -723,11 +732,11 @@
       }
       if( sqlite3_memory_used()>0 ){
         abendError("memory in use after close: %lld bytes", sqlite3_memory_used());
       }
       if( oomFlag ){
-        if( g.nOomFault==0 || oomCnt>2000 ){
+        if( g.nOomFault==0 || oomCnt>OOM_MAX ){
           if( g.bOomOnce ){
             oomCnt = g.iOomCntdown = 1;
             g.bOomOnce = 0;
           }else{
             oomCnt = 0;
@@ -767,11 +776,11 @@
         printf("\nExit early due to TEST_FAILURE being set");
         break;
       }
     }
   }
-  if( !verboseFlag && multiTest && !quietFlag ) printf("\n");
+  if( !verboseFlag && multiTest && !quietFlag && !oomFlag ) printf("\n");
   if( nTest>1 && !quietFlag ){
     printf("%d fuzz tests with no errors\nSQLite %s %s\n",
            nTest, sqlite3_libversion(), sqlite3_sourceid());
   }
   if( zDataOut ){