Import SQLite 3.8.7.4.

sql/recovery_unittest.cc

Index: sql/recovery_unittest.cc
diff --git a/sql/recovery_unittest.cc b/sql/recovery_unittest.cc
index 99212ef27d540c0687093eef4b194a9f8c744c35..78a147815f9eeb4f65bffbb05043cb54a1768019 100644
--- a/sql/recovery_unittest.cc
+++ b/sql/recovery_unittest.cc
@@ -328,8 +328,9 @@ TEST_F(SQLRecoveryTest, RecoverCorruptTable) {
   const char kCountSql[] = "SELECT COUNT (*) FROM x";
   EXPECT_EQ("9", ExecuteWithResults(&db(), kCountSql, "|", ","));
 
-  // A full table scan shows all of the original data.
-  const char kDistinctSql[] = "SELECT DISTINCT COUNT (id) FROM x";
+  // A full table scan shows all of the original data.  Using column [v] to
+  // force use of the table rather than the index.
+  const char kDistinctSql[] = "SELECT DISTINCT COUNT (v) FROM x";
   EXPECT_EQ("10", ExecuteWithResults(&db(), kDistinctSql, "|", ","));
 
   // Insert id 0 again.  Since it is not in the index, the insert