Index: src/analyze.c
==================================================================
--- src/analyze.c
+++ src/analyze.c
@@ -177,10 +177,19 @@
         );
       }else{
         /* The sqlite_stat[12] table already exists.  Delete all rows. */
         sqlite3VdbeAddOp2(v, OP_Clear, aRoot[i], iDb);
       }
+#ifdef SQLITE_ENABLE_STAT2
+      if( i==1 && iDb!=1 && pStat->nCol==4 ){
+        sqlite3NestedParse(pParse,
+           "UPDATE %Q.sqlite_master SET sql='CREATE TABLE sqlite_stat2(%s)'"
+           " WHERE name='sqlite_stat2'", pDb->zName, aTable[i].zCols
+        );
+        sqlite3ChangeCookie(pParse, iDb);
+      }
+#endif
     }
   }
 
   /* Open the sqlite_stat[12] tables for writing. */
   for(i=0; i<ArraySize(aTable); i++){
@@ -605,11 +614,11 @@
         }else if( (pTab = sqlite3LocateTable(pParse, 0, z, zDb))!=0 ){
           analyzeTable(pParse, pTab, 0);
         }
         sqlite3DbFree(db, z);
       }
-    }   
+    }
   }
 }
 
 /*
 ** Used to pass information from the analyzer reader through to the

Index: test/analyze8.test
==================================================================
--- test/analyze8.test
+++ test/analyze8.test
@@ -159,7 +159,43 @@
     UPDATE t1 SET a=20 WHERE b>2;
     ANALYZE;
     SELECT sample, cnt FROM sqlite_stat2 WHERE idx='t1all' ORDER BY sampleno;
   }
 } {2 2 20 38 20 38 20 38 20 38 20 38 20 38 20 38 20 38 20 38}
+
+
+
+# Verify that the 5th "cnt" column is added to the sqlite_stat2 table
+# on a full ANALYZE if the column is not already present.
+#
+do_test analyze8-4.0 {
+  execsql {
+    UPDATE t1 SET a=b;
+    ANALYZE;
+    PRAGMA writable_schema=ON;
+    UPDATE sqlite_master 
+       SET sql='CREATE TABLE sqlite_stat2(tbl,idx,sampleno,sample)'
+     WHERE name='sqlite_stat2';
+  }
+  db close
+  sqlite3 db test.db
+  execsql {
+    SELECT sample FROM sqlite_stat2 WHERE idx='t1all' ORDER BY sampleno
+  }
+} {2 4 6 8 10 12 14 16 18 20}
+do_test analyze8-4.1 {
+  catchsql {SELECT sample, cnt FROM sqlite_stat2}
+} {1 {no such column: cnt}}
+do_test analyze8-4.2 {
+  execsql {
+    ANALYZE;
+  }
+  db close;
+  sqlite3 db test.db
+  execsql {
+    SELECT sample, +cnt FROM sqlite_stat2 WHERE idx='t1all' ORDER BY sampleno;
+  }
+} {2 2 4 2 6 2 8 2 10 2 12 2 14 2 16 2 18 2 20 2}
+
+
 
 finish_test