Get ANALYZE working again with -DSQLITE_ENABLE_STAT2 and virtual tables.

FossilOrigin-Name: b7a26427afc43c9bbdf365b775379eb57187bc97

diff --git a/manifest b/manifest
index 539232dd11aca986722df08821738654c4cecefa..58b26217e5b6ea1f11386518caa2007bb286e3ef 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Disallow\sstatements\sof\sthe\sform\s"CREATE\sTEMP\sTABLE\smain.t1\s...".
-D 2010-09-28T15:55:48
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Get\sANALYZE\sworking\sagain\swith\s-DSQLITE_ENABLE_STAT2\sand\svirtual\stables.
+D 2010-09-28T17:34:46
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -112,7 +115,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
 F src/alter.c 8dc27638e7e2553e80b2b621f232be5eb1e85ef3
-F src/analyze.c 041ebe729bdbf34bac61bb78ece26e5e84e3ef32
+F src/analyze.c 1ea594a912a14138e20a05db09d9065e46f29a2a
 F src/attach.c 252c4f7e36cc219349451ed63e278c60e80b26f3
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c d5b0137bc20327af08c14772227cc35134839c30
@@ -868,7 +871,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 890816c52d688f01be9a8abd8b4c9375eed4de7e
-R bb6d7614396bfdf34c844eda2125719d
-U dan
-Z 79640b932b15b5e171373f446f6cc41b
+P dd1b34bab7edaaedd985882f6e16b16940a46d38
+R 1463f4693d4e0abbc27bfcfd5adba4a4
+U drh
+Z 63582f977f7a2fd2da752e2048dc9c5c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMoic5oxKgR168RlERAolQAJ49CRE/+QjrZGusXzf5RC3/aleugwCghMVL
+OuSXAsSEDXHLGVDa/3cyGSM=
+=nrqa
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index ab199256299396d31a9b00d5189ca763ba7c23b1..e8294704c956dd500bade1b400045bde51cdb15e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dd1b34bab7edaaedd985882f6e16b16940a46d38
\ No newline at end of file
+b7a26427afc43c9bbdf365b775379eb57187bc97
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 7e00f02e8baad53aa8d8eb5df066dd3627c66458..159e323612bde750e5f843baa5957d6fb57bcdbe 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -136,8 +136,8 @@ static void analyzeOneTable(
   if( v==0 || NEVER(pTab==0) ){
     return;
   }
-  if( pTab->pSelect ){
-    /* Do not gather statistics on views */
+  if( pTab->tnum==0 ){
+    /* Do not gather statistics on views or virtual tables */
     return;
   }
   if( memcmp(pTab->zName, "sqlite_", 7)==0 ){