Expire prepared statements after running ANALYZE.

FossilOrigin-Name: b083a961f8ac3a6158e822574d73cd63e3103b09

diff --git a/manifest b/manifest
index 0b57ed3d1bd448a67fd863555e10881e7d70405a..5a933c39915fa6be7c982ed6a2d058bfe73d78ab 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\scomment\son\swhereLoopAddBtree().\s\sNo\schanges\sto\scode.
-D 2014-07-22T12:05:32.008
+C Expire\sprepared\sstatements\safter\srunning\sANALYZE.
+D 2014-07-22T14:42:16.806
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -161,7 +161,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c b00900877f766f116f9e16116f1ccacdc21d82f1
-F src/analyze.c 61bc3467bd7803158d460dd92f5ba5205371bdce
+F src/analyze.c 9f4e473c83a582d696ce57dc8cb7a40ad1314d02
 F src/attach.c 3801129015ef59d76bf23c95ef9b0069d18a0c52
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
@@ -296,7 +296,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c 00c4b52d973f5176297ab3b633c8f5d8f9475af6
+F src/where.c 52edd7f5df58d8f73230e5f9883ce867ca2f4a7d
 F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -313,7 +313,7 @@ F test/analyze.test 1772936d66471c65221e437b6d1999c3a03166c4
 F test/analyze3.test bf41f0f680dd1e0d44eed5e769531e93a5320275
 F test/analyze4.test eff2df19b8dd84529966420f29ea52edc6b56213
 F test/analyze5.test 765c4e284aa69ca172772aa940946f55629bc8c4
-F test/analyze6.test d31defa011a561b938b4608d3538c1b4e0b5e92c
+F test/analyze6.test f1c552ce39cca4ec922a7e4e0e5d0203d6b3281f
 F test/analyze7.test bb1409afc9e8629e414387ef048b8e0e3e0bdc4f
 F test/analyze8.test 093d15c1c888eed5034304a98c992f7360130b88
 F test/analyze9.test bd5aaf2a8fd2dd774b08251416897185531a8adf
@@ -1182,7 +1182,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 b67a6e33f23ce5f5d9a545fa9d6700a7ed636901
-R 7e3c00e4bb7f0f9e6e95bc158e12c00a
+P b22dd165da227a52d88b17a91e80a1701dce61ad
+R 9fe107c1276b2eda80832b2d6848bc6f
 U drh
-Z bea5212013e532ea4358a5003d399c52
+Z 54d8743399e09513763a4a3a09f86610

diff --git a/manifest.uuid b/manifest.uuid
index 6d720e3002a595b4f51bf0e421e4405a40b977f1..300e0983ce0f57b1fcbcb2d39be0d8be8001bb93 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b22dd165da227a52d88b17a91e80a1701dce61ad
\ No newline at end of file
+b083a961f8ac3a6158e822574d73cd63e3103b09
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 2330bdb34275bac975c36e083c96acc6f5699547..7d2bed8c7faced88e189d07300509efd79937c03 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -1320,6 +1320,7 @@ void sqlite3Analyze(Parse *pParse, Token *pName1, Token *pName2){
   Table *pTab;
   Index *pIdx;
   Token *pTableName;
+  Vdbe *v;
 
   /* Read the database schema. If an error occurs, leave an error message
   ** and code in pParse and return NULL. */
@@ -1367,6 +1368,8 @@ void sqlite3Analyze(Parse *pParse, Token *pName1, Token *pName2){
       }
     }   
   }
+  v = sqlite3GetVdbe(pParse);
+  if( v ) sqlite3VdbeAddOp0(v, OP_Expire);
 }
 
 /*

diff --git a/src/where.c b/src/where.c
index 753284bc326c666eedac8e4cd5e276675f936b9f..4ecf02f0c1d581dca3a8158ee8fe652a2ae454b6 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -4426,7 +4426,6 @@ static int whereLoopAddBtreeIndex(
           }else{
             rc = whereInScanEst(pParse, pBuilder, pExpr->x.pList, &nOut);
           }
-          assert( rc!=SQLITE_OK || nOut>0 );
           if( rc==SQLITE_NOTFOUND ) rc = SQLITE_OK;
           if( rc!=SQLITE_OK ) break;          /* Jump out of the pTerm loop */
           if( nOut ){

diff --git a/test/analyze6.test b/test/analyze6.test
index f77f05324acb75d039b7a472274f8e3878c595bf..31ace8eda574e2cd3063f718b2768d85131a61c8 100644 (file)
--- a/test/analyze6.test
+++ b/test/analyze6.test
@@ -91,7 +91,7 @@ do_test analyze6-2.3 {
 } {0 0 0 {SEARCH TABLE t201 USING INTEGER PRIMARY KEY (rowid=?)}}
 do_test analyze6-2.4 {
   execsql {
-    INSERT INTO t201 VALUES(1,2,3);
+    INSERT INTO t201 VALUES(1,2,3),(2,3,4),(3,4,5);
     ANALYZE t201;
   }
   eqp {SELECT * FROM t201 WHERE z=5}