Index: ext/fts3/fts3_write.c
==================================================================
--- ext/fts3/fts3_write.c
+++ ext/fts3/fts3_write.c
@@ -376,11 +376,11 @@
 **   Return the largest relative level in the FTS index or indexes.  */
 /* 36 */  "SELECT max( level %% 1024 ) FROM %Q.'%q_segdir'",
 
           /* Return segments in order from oldest to newest.*/ 
 /* 37 */  "SELECT level, idx, end_block "
-            "FROM %Q.'%q_segdir' WHERE level BETWEEN ? AND ?"
+            "FROM %Q.'%q_segdir' WHERE level BETWEEN ? AND ? "
             "ORDER BY level DESC, idx ASC",
 
           /* Update statements used while promoting segments */
 /* 38 */  "UPDATE OR FAIL %Q.'%q_segdir' SET level=-1,idx=? "
             "WHERE level=? AND idx=?",
@@ -3192,11 +3192,13 @@
     if( rc!=SQLITE_OK ) goto finished;
   }
   if( pWriter ){
     rc = fts3SegWriterFlush(p, pWriter, iNewLevel, iIdx);
     if( rc==SQLITE_OK ){
-      rc = fts3PromoteSegments(p, iNewLevel, pWriter->nLeafData);
+      if( iLevel==FTS3_SEGCURSOR_PENDING || iNewLevel<iMaxLevel ){
+        rc = fts3PromoteSegments(p, iNewLevel, pWriter->nLeafData);
+      }
     }
   }
 
  finished:
   fts3SegWriterFree(pWriter);
@@ -3230,10 +3232,12 @@
       sqlite3_bind_int(pStmt, 1, FTS_STAT_AUTOINCRMERGE);
       rc = sqlite3_step(pStmt);
       if( rc==SQLITE_ROW ){
         p->nAutoincrmerge = sqlite3_column_int(pStmt, 0);
         if( p->nAutoincrmerge==1 ) p->nAutoincrmerge = 8;
+      }else if( rc==SQLITE_DONE ){
+        p->nAutoincrmerge = 0;
       }
       rc = sqlite3_reset(pStmt);
     }
   }
   return rc;

Index: test/trace2.test
==================================================================
--- test/trace2.test
+++ test/trace2.test
@@ -134,10 +134,11 @@
     "-- SELECT value FROM 'main'.'x1_stat' WHERE id=?" 
     "-- REPLACE INTO 'main'.'x1_stat' VALUES(?,?)" 
     "-- SELECT (SELECT max(idx) FROM 'main'.'x1_segdir' WHERE level = ?) + 1" 
     "-- SELECT coalesce((SELECT max(blockid) FROM 'main'.'x1_segments') + 1, 1)"
     "-- REPLACE INTO 'main'.'x1_segdir' VALUES(?,?,?,?,?,?)"
+    "-- SELECT level, idx, end_block FROM 'main'.'x1_segdir' WHERE level BETWEEN ? AND ? ORDER BY level DESC, idx ASC"
   }
 
   do_trace_test 2.3 {
     INSERT INTO x1(x1) VALUES('optimize');
   } {