src/Pure/Tools/build_process.scala

           (serial, numa_index)
         }).nextOption.getOrElse(error("No build state instance " + instance + " in database " + db))
       }
 
     def write_state(db: SQL.Database, instance: String, serial: Long, numa_index: Int): Unit = {
-      db.using_statement(
-        State.table.delete() + SQL.where(Generic.sql_equal(instance = instance)))(_.execute())
       db.using_statement(State.table.insert()) { stmt =>
         stmt.string(1) = instance
         stmt.long(2) = serial
         stmt.int(3) = numa_index
         stmt.execute()
       }
     }
 
+    def reset_state(db: SQL.Database, instance: String): Unit =
+      db.using_statement(
+        State.table.delete() + SQL.where(Generic.sql_equal(instance = instance)))(_.execute())
+
     def init_database(db: SQL.Database, build_context: Build_Process.Context): Unit = {
       val tables =
         List(Config.table, State.table, Pending.table, Running.table, Results.table)
 
       for (table <- tables) db.create_table(table)

       val ch2 = update_running(db, state.running)
       val ch3 = update_results(db, state.results)
 
       val (serial0, numa_index0) = read_state(db, instance)
       val serial = if (ch1 || ch2 || ch3) serial0 + 1 else serial0
-      if (serial != serial0) write_state(db, instance, serial, state.numa_index)
+      if (serial != serial0) {
+        reset_state(db, instance)
+        write_state(db, instance, serial, state.numa_index)
+      }
 
       state.copy(serial = serial)
     }
   }