1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-10 01:02:56 +03:00

Get ANALYZE working again with -DSQLITE_ENABLE_STAT2 and virtual tables.

FossilOrigin-Name: b7a26427afc43c9bbdf365b775379eb57187bc97
This commit is contained in:
drh
2010-09-28 17:34:46 +00:00
parent 72c5ea3279
commit f39d29c0bd
3 changed files with 20 additions and 10 deletions

View File

@@ -1,5 +1,8 @@
C Disallow\sstatements\sof\sthe\sform\s"CREATE\sTEMP\sTABLE\smain.t1\s...". -----BEGIN PGP SIGNED MESSAGE-----
D 2010-09-28T15:55:48 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.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -112,7 +115,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
F src/alter.c 8dc27638e7e2553e80b2b621f232be5eb1e85ef3 F src/alter.c 8dc27638e7e2553e80b2b621f232be5eb1e85ef3
F src/analyze.c 041ebe729bdbf34bac61bb78ece26e5e84e3ef32 F src/analyze.c 1ea594a912a14138e20a05db09d9065e46f29a2a
F src/attach.c 252c4f7e36cc219349451ed63e278c60e80b26f3 F src/attach.c 252c4f7e36cc219349451ed63e278c60e80b26f3
F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
F src/backup.c d5b0137bc20327af08c14772227cc35134839c30 F src/backup.c d5b0137bc20327af08c14772227cc35134839c30
@@ -868,7 +871,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 890816c52d688f01be9a8abd8b4c9375eed4de7e P dd1b34bab7edaaedd985882f6e16b16940a46d38
R bb6d7614396bfdf34c844eda2125719d R 1463f4693d4e0abbc27bfcfd5adba4a4
U dan U drh
Z 79640b932b15b5e171373f446f6cc41b Z 63582f977f7a2fd2da752e2048dc9c5c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMoic5oxKgR168RlERAolQAJ49CRE/+QjrZGusXzf5RC3/aleugwCghMVL
OuSXAsSEDXHLGVDa/3cyGSM=
=nrqa
-----END PGP SIGNATURE-----

View File

@@ -1 +1 @@
dd1b34bab7edaaedd985882f6e16b16940a46d38 b7a26427afc43c9bbdf365b775379eb57187bc97

View File

@@ -136,8 +136,8 @@ static void analyzeOneTable(
if( v==0 || NEVER(pTab==0) ){ if( v==0 || NEVER(pTab==0) ){
return; return;
} }
if( pTab->pSelect ){ if( pTab->tnum==0 ){
/* Do not gather statistics on views */ /* Do not gather statistics on views or virtual tables */
return; return;
} }
if( memcmp(pTab->zName, "sqlite_", 7)==0 ){ if( memcmp(pTab->zName, "sqlite_", 7)==0 ){