Index: ext/rbu/rbudiff.test
==================================================================
--- ext/rbu/rbudiff.test
+++ ext/rbu/rbudiff.test
@@ -34,16 +34,38 @@
   }
   set rc
 }
 
 proc apply_rbudiff {sql target} {
+  test_rbucount $sql
   forcedelete rbu.db
   sqlite3 rbudb rbu.db
   rbudb eval $sql
   rbudb close
   step_rbu $target rbu.db
 }
+
+# The only argument is the output of an [sqldiff -rbu] run. This command
+# tests that the contents of the rbu_count table is correct. An exception
+# is thrown if it is not.
+#
+proc test_rbucount {sql} {
+  sqlite3 tmpdb ""
+  tmpdb eval $sql
+  tmpdb eval {
+    SELECT name FROM sqlite_master WHERE name LIKE 'data%' AND type='table'
+  } {
+    set a [tmpdb eval "SELECT count(*) FROM $name"]
+    set b [tmpdb eval {SELECT cnt FROM rbu_count WHERE tbl = $name}]
+    if {$a != $b} { 
+      tmpdb close
+      error "rbu_count error - tbl = $name" 
+    }
+  }
+  tmpdb close
+  return ""
+}
 
 proc rbudiff_cksum {db1} {
   set txt ""
 
   sqlite3 dbtmp $db1

Index: ext/rbu/rbuprogress.test
==================================================================
--- ext/rbu/rbuprogress.test
+++ ext/rbu/rbuprogress.test
@@ -377,10 +377,20 @@
         INSERT INTO data0_t1 VALUES(0, 7, 7, 7, 2);
         INSERT INTO data0_t1 VALUES(2, 10, 10, 10, 2);
         CREATE TABLE rbu_count(tbl, cnt);
         INSERT INTO rbu_count VALUES('data0_t1', 2); 
       } 
+      {2500 4000 6000 8000 10000}
+      {5000 10000}
+
+      3 {
+        CREATE TABLE data0_t1(rbu_rowid, a, b, c, rbu_control);
+        INSERT INTO data0_t1 VALUES(1, NULL, NULL, NULL, 1);
+        INSERT INTO data0_t1 VALUES(2, NULL, NULL, 7, '..x');
+        CREATE TABLE rbu_count(tbl, cnt);
+        INSERT INTO rbu_count VALUES('data0_t1', 2); 
+      } 
       {2500 4000 6000 8000 10000}
       {5000 10000}
     } {
 
       reset_db ; execsql $tbl

Index: tool/sqldiff.c
==================================================================
--- tool/sqldiff.c
+++ tool/sqldiff.c
@@ -1242,10 +1242,11 @@
   int nCol;
   Str ct = {0, 0, 0};             /* The "CREATE TABLE data_xxx" statement */
   Str sql = {0, 0, 0};            /* Query to find differences */
   Str insert = {0, 0, 0};         /* First part of output INSERT statement */
   sqlite3_stmt *pStmt = 0;
+  int nRow = 0;                   /* Total rows in data_xxx table */
 
   /* --rbu mode must use real primary keys. */
   g.bSchemaPK = 1;
 
   /* Check that the schemas of the two tables match. Exit early otherwise. */
@@ -1287,10 +1288,11 @@
       strFree(&ct);
     }
 
     /* Output the first part of the INSERT statement */
     fprintf(out, "%s", insert.z);
+    nRow++;
 
     if( sqlite3_column_type(pStmt, nCol)==SQLITE_INTEGER ){
       for(i=0; i<=nCol; i++){
         if( i>0 ) fprintf(out, ", ");
         printQuoted(out, sqlite3_column_value(pStmt, i));
@@ -1340,10 +1342,16 @@
     /* And the closing bracket of the insert statement */
     fprintf(out, ");\n");
   }
 
   sqlite3_finalize(pStmt);
+  if( nRow>0 ){
+    Str cnt = {0, 0, 0};
+    strPrintf(&cnt, "INSERT INTO rbu_count VALUES('data_%q', %d);", zTab, nRow);
+    fprintf(out, "%s\n", cnt.z);
+    strFree(&cnt);
+  }
 
   strFree(&ct);
   strFree(&sql);
   strFree(&insert);
 }
@@ -1854,11 +1862,17 @@
   if( rc || zErrMsg ){
     cmdlineError("\"%s\" does not appear to be a valid SQLite database", zDb2);
   }
 
   if( neverUseTransaction ) useTransaction = 0;
-  if( useTransaction ) printf("BEGIN TRANSACTION;\n");
+  if( useTransaction ) fprintf(out, "BEGIN TRANSACTION;\n");
+  if( xDiff==rbudiff_one_table ){
+    fprintf(out, "CREATE TABLE IF NOT EXISTS rbu_count"
+           "(tbl TEXT PRIMARY KEY COLLATE NOCASE, cnt INTEGER) "
+           "WITHOUT ROWID;\n"
+    );
+  }
   if( zTab ){
     xDiff(zTab, out);
   }else{
     /* Handle tables one by one */
     pStmt = db_prepare(