From: drh <drh@noemail.net>
Date: Wed, 19 Nov 2014 14:05:41 +0000 (+0000)
Subject: Add an ALWAYS on an always-true branch in wal.c.
X-Git-Tag: version-3.8.8~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=664f85dd59c7995b2651ca9de390607dbfadb419;p=thirdparty%2Fsqlite.git

Add an ALWAYS on an always-true branch in wal.c.
Fix the ANALYZE command so that it resets the "unordered" and "noskipscan"
flags on indices when reloading the sqlite_stat1 table.

FossilOrigin-Name: 9ed97a85feee6593faefa2b54cc4cf9a60f515f9
---

diff --git a/manifest b/manifest
index 272d0369e1..5976aae2e5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Adding\sthe\s"noskipscan"\stoken\sto\san\ssqlite_stat1.stat\sfield\sprevents\nan\sindex\sfor\sbeing\sused\swith\sthe\sskip-scan\salgorithm.
-D 2014-11-18T21:54:31.890
+C Add\san\sALWAYS\son\san\salways-true\sbranch\sin\swal.c.\nFix\sthe\sANALYZE\scommand\sso\sthat\sit\sresets\sthe\s"unordered"\sand\s"noskipscan"\nflags\son\sindices\swhen\sreloading\sthe\ssqlite_stat1\stable.
+D 2014-11-19T14:05:41.209
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a226317fdf3f4c895fb3cfedc355b4d0868ce1fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -167,7 +167,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c ba266a779bc7ce10e52e59e7d3dc79fa342e8fdb
-F src/analyze.c 951fd859852dfbced4a58b73954f168eeb9d0772
+F src/analyze.c c59f238a39aacece176f8bb7dfece40deb268ee5
 F src/attach.c f4e94df2d1826feda65eb0939f7f6f5f923a0ad9
 F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
@@ -301,7 +301,7 @@ F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
 F src/vdbesort.c 87f3923483113d1c95d84640becb4e4946f27d9a
 F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
 F src/vtab.c 2a30791bbd7926b589401bd09c3abb33de563793
-F src/wal.c fa090966140602f03a621f87d82ee69e66ca63b5
+F src/wal.c 486e644b3b8aa5ad066f625bc428aa8ff7001405
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
 F src/where.c e275cb74731a3351a9da6ba8280bd5054db6192d
@@ -1221,8 +1221,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 c52f7971e90cac1058d6b66c9e334cbc8607def3 00fe09505792cd0d104b2da9d040f023e30fa871
-R 9bae3f4f5e0db167ef1a706a77e76141
-T +closed 00fe09505792cd0d104b2da9d040f023e30fa871
+P 4461bf045d8eecf98478035efcdba3f41c709bc5
+R b83c6fa5464847f6b6472d2244f6f040
 U drh
-Z fec927bef6596f9a5e5eec2871a731e7
+Z cd93530e8709a199e7d3e18ae995b78d
diff --git a/manifest.uuid b/manifest.uuid
index fd301fc3c9..5abcc58c68 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4461bf045d8eecf98478035efcdba3f41c709bc5
\ No newline at end of file
+9ed97a85feee6593faefa2b54cc4cf9a60f515f9
\ No newline at end of file
diff --git a/src/analyze.c b/src/analyze.c
index 769a16565a..ffb5c22b63 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -1438,6 +1438,8 @@ static void decodeIntArray(
   if( z==0 ) z = "";
 #else
   assert( z!=0 );
+  pIndex->bUnordered = 0;
+  pIndex->noSkipScan = 0;
 #endif
   for(i=0; *z && i<nOut; i++){
     v = 0;
diff --git a/src/wal.c b/src/wal.c
index 6fed8f3c6c..3033444b41 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -2506,7 +2506,7 @@ int sqlite3WalUndo(Wal *pWal, int (*xUndo)(void *, Pgno), void *pUndoCtx){
     memcpy(&pWal->hdr, (void *)walIndexHdr(pWal), sizeof(WalIndexHdr));
 
     for(iFrame=pWal->hdr.mxFrame+1; 
-        rc==SQLITE_OK && iFrame<=iMax; 
+        ALWAYS(rc==SQLITE_OK) && iFrame<=iMax; 
         iFrame++
     ){
       /* This call cannot fail. Unless the page for which the page number