From: dan <dan@noemail.net>
Date: Mon, 16 Mar 2015 20:40:00 +0000 (+0000)
Subject: Make SQLite slightly more likely to use an auto-index within a sub-query.
X-Git-Tag: version-3.8.9~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f104abba8417ff2f971580cb1be400c0d6e5fbfe;p=thirdparty%2Fsqlite.git

Make SQLite slightly more likely to use an auto-index within a sub-query.

FossilOrigin-Name: ab832336f4a28193c4d2b61e833564822a7b86a8
---

diff --git a/manifest b/manifest
index 80af8718b8..781a270193 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypo\sof\stest\sprefix\sin\sthe\snew\sWHERE\stest\sfile.
-D 2015-03-16T18:08:56.916
+C Make\sSQLite\sslightly\smore\slikely\sto\suse\san\sauto-index\swithin\sa\ssub-query.
+D 2015-03-16T20:40:00.496
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -307,7 +307,7 @@ F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 F src/wal.c 39303f2c9db02a4e422cd8eb2c8760420c6a51fe
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
-F src/where.c 5ca2899f280c4259a07816f4395d0bea368cfbd7
+F src/where.c 42ce3fd5ec9fe050f623be358cfddee01c1f6286
 F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1245,7 +1245,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 8bdda827a3d268009297a0216e3d94bf0eceeb2e
-R 5cfb4e6342c564787ed07b1b1007b605
-U mistachkin
-Z 76cd4818fe183f76c64a28733f84e037
+P 34779c528f1817d6ec34216b58fb4277956b5167
+R 20e702b8205b517ce2cb7b49f472a434
+U dan
+Z 33f45126f2bf7daffd881933acc4eaa9
diff --git a/manifest.uuid b/manifest.uuid
index b5adcae9f4..cc066477d9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-34779c528f1817d6ec34216b58fb4277956b5167
\ No newline at end of file
+ab832336f4a28193c4d2b61e833564822a7b86a8
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 2fe076ba6d..6a1f481d60 100644
--- a/src/where.c
+++ b/src/where.c
@@ -6001,10 +6001,10 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
 
   /* Seed the search with a single WherePath containing zero WhereLoops.
   **
-  ** TUNING: Do not let the number of iterations go above 25.  If the cost
-  ** of computing an automatic index is not paid back within the first 25
+  ** TUNING: Do not let the number of iterations go above 28.  If the cost
+  ** of computing an automatic index is not paid back within the first 28
   ** rows, then do not use the automatic index. */
-  aFrom[0].nRow = MIN(pParse->nQueryLoop, 46);  assert( 46==sqlite3LogEst(25) );
+  aFrom[0].nRow = MIN(pParse->nQueryLoop, 48);  assert( 48==sqlite3LogEst(28) );
   nFrom = 1;
   assert( aFrom[0].isOrdered==0 );
   if( nOrderBy ){