diff --git a/manifest b/manifest
index dcaa2e9d59..5404553284 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\ssimulating\san\serror\sin\sthe\sclose()\ssystem\scall,\sclose\sthe\sfile\sdescriptor\sanyway.\sOtherwise\slong\srunning\stests\sleak\stoo\smany\sfile-descriptors\sand\scrash.
-D 2011-04-01T16:50:07
+C Change\sanalyze7.test\sso\sthat\sit\sworks\swithout\sSQLITE_ENABLE_STAT2\sdefined.
+D 2011-04-01T17:53:20
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -259,7 +259,7 @@ F test/analyze3.test d61f55d8b472fc6e713160b1e577f7a68e63f38b
 F test/analyze4.test 757b37875cf9bb528d46f74497bc789c88365045
 F test/analyze5.test adc89b92fc9fee5ca1cb0bc8512f3206ad0fe5aa
 F test/analyze6.test c125622a813325bba1b4999040ddc213773c2290
-F test/analyze7.test 06405dd3d2a3101de14270da508016a59254873b
+F test/analyze7.test 8095fed183e1fb999c1b1c4a1606cec1bcb13d1f
 F test/async.test ad4ba51b77cd118911a3fe1356b0809da9c108c3
 F test/async2.test bf5e2ca2c96763b4cba3d016249ad7259a5603b6
 F test/async3.test 93edaa9122f498e56ea98c36c72abc407f4fb11e
@@ -896,7 +896,7 @@ F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/lemon.c dfd81a51b6e27e469ba21d01a75ddf092d429027
 F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
-F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
+F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c.tcl cf44512a48112b1ba09590548660a5a6877afdb3
 F tool/mksqlite3h.tcl d76c226a5e8e1f3b5f6593bcabe5e98b3b1ec9ff
@@ -921,7 +921,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P d9707ef8dcd29667b6d366897f6ad02c87aa0041
-R 61773a6586c7ffae758339f441c619af
+P 81ddbf43366c18ebdd46558d6a0fbee2ce6a4c4e
+R 99f8eb376089a9fabbaf964c125c721f
 U dan
-Z 4a1b718c29bc9f24adfbad40e4254b98
+Z bf935093daa7a73e12043061e537a56c
diff --git a/manifest.uuid b/manifest.uuid
index 6f0caefd4a..bd021d3020 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-81ddbf43366c18ebdd46558d6a0fbee2ce6a4c4e
\ No newline at end of file
+9415201c8a0b9b640f5997c5348c5df812e88230
\ No newline at end of file
diff --git a/test/analyze7.test b/test/analyze7.test
index 4c2fd53e85..9107376e28 100644
--- a/test/analyze7.test
+++ b/test/analyze7.test
@@ -87,9 +87,22 @@ do_test analyze7-3.0 {
 do_test analyze7-3.1 {
   execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE b=123;}
 } {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?) (~10 rows)}}
-do_test analyze7-3.2 {
-  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2;}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?) (~102 rows)}}
+do_test analyze7-3.2.1 {
+  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=?;}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?) (~86 rows)}}
+ifcapable stat2 {
+  # If ENABLE_STAT2 is defined, SQLite comes up with a different estimated
+  # row count for (c=2) than it does for (c=?).
+  do_test analyze7-3.2.2 {
+    execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2;}
+  } {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?) (~102 rows)}}
+} else {
+  # If ENABLE_STAT2 is not defined, the expected row count for (c=2) is the
+  # same as that for (c=?).
+  do_test analyze7-3.2.3 {
+    execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2;}
+  } {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?) (~86 rows)}}
+}
 do_test analyze7-3.3 {
   execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123 AND b=123}
 } {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~1 rows)}}
diff --git a/tool/mkopts.tcl b/tool/mkopts.tcl
old mode 100644
new mode 100755