Merge the latest trunk enhancements into the bedrock branch.

FossilOrigin-Name: 5c8e80f435dc24d5af9f217f9034215bf0b39fa5888eda9f4416da832da2735f

src/btreeInt.h

@@ -727,6 +727,7 @@ struct IntegrityCk {
   StrAccum errMsg;  /* Accumulate the error message text here */
   u32 *heap;        /* Min-heap used for analyzing cell coverage */
   sqlite3 *db;      /* Database connection running the check */
+  i64 nRow;         /* Number of rows visited in current tree */
 };
 
 /*