Remove a couple of incorrect assert statements so that the test suite will

run with -DSQLITE_DEFAULT_CACHE_SIZE=0.

FossilOrigin-Name: 87614b62ace530761e0e1170ec5840b212735ec6

diff --git a/manifest b/manifest
index cdc683141ca03737ae8c402570c5e3a75c0b0cc3..61a9274c37fea46959d63d23144b4c5c8e2e2105 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\swindows\sxSyscall\senhancements\sinto\strunk.
-D 2011-11-12T15:41:52.950
+C Remove\sa\scouple\sof\sincorrect\sassert\sstatements\sso\sthat\sthe\stest\ssuite\swill\nrun\swith\s-DSQLITE_DEFAULT_CACHE_SIZE=0.
+D 2011-11-12T16:46:55.610
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -219,7 +219,7 @@ F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
 F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
 F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
 F src/test_osinst.c 62b0b8ef21ce754cc94e17bb42377ed8795dba32
-F src/test_pcache.c 7bf828972ac0d2403f5cfa4cd14da41f8ebe73d8
+F src/test_pcache.c 335285416eb7a5c3a0f4daffb796912011ebbf6e
 F src/test_quota.c a391c866217e92986c6f523f05b08aa6956c8419
 F src/test_rtree.c 6d06306e29946dc36f528a3a2cdc3add794656f1
 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
@@ -249,7 +249,7 @@ F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
 F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
 F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
 F src/vtab.c e9318d88feac85be8e27ee783ac8f5397933fc8a
-F src/wal.c 9658df8d404b82e6b2d40fd05944463214e2d935
+F src/wal.c 5fe1ba55b8fab9d3936bc9093af61ab9f1c580a1
 F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 7c85f4c93058e27100d404f0777aaeb0d1b296ae
@@ -893,7 +893,7 @@ F test/vtabF.test fd5ad376f5a34fe0891df1f3cddb4fe7c3eb077e
 F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
-F test/wal.test e11da8d5ea8a38a247339455098357e9adf63d76
+F test/wal.test c743be787e60c1242fa6cdf73b410e64b2977e25
 F test/wal2.test ad6412596815f553cd30f271d291ab003092bc7e
 F test/wal3.test 18da4e65c30c43c646ad40e145e9a074e4062fc9
 F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
@@ -974,7 +974,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 77119785c84ac7f416ed72c38c532399b6093d7a 76dec8aa9dbbc39e0a7c3b358b58ce7f7a477a2b
-R ed313c65fa66f4a0f305ec8176ce8f6d
+P c1fab9aca1fe1dda2b4c7e4fdc0a406998847bdb
+R 9f74f7e0555602e5901be80ed362f860
 U drh
-Z 011c8308c57c9b72d1c6dd7078495814
+Z 60452ea200640726cdeacf2996a4fa41

diff --git a/manifest.uuid b/manifest.uuid
index 4f5951bb69fab14321cda2f46669ff5da19ed33d..d0c247ea6fb804082b9046ce6480e4547842dc9d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c1fab9aca1fe1dda2b4c7e4fdc0a406998847bdb
\ No newline at end of file
+87614b62ace530761e0e1170ec5840b212735ec6
\ No newline at end of file

diff --git a/src/test_pcache.c b/src/test_pcache.c
index 98aa1367aa19aa756ca315c449c4d598512f2b90..8e66b4b025d7e240a4d8b199083147f6aa2af7ce 100644 (file)
--- a/src/test_pcache.c
+++ b/src/test_pcache.c
@@ -161,7 +161,6 @@ static sqlite3_pcache *testpcacheCreate(int szPage, int bPurgeable){
 static void testpcacheCachesize(sqlite3_pcache *pCache, int newSize){
   testpcache *p = (testpcache*)pCache;
   assert( p->iMagic==TESTPCACHE_VALID );
-  assert( newSize>=1 );
   assert( testpcacheGlobal.pDummy!=0 );
   assert( testpcacheGlobal.nInstance>0 );
 }

diff --git a/src/wal.c b/src/wal.c
index f2b31871477d753cd3b99967d706d8418b5bda86..2c905a29e926d11c89c6f4eff2ce393c911d9c71 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -2310,7 +2310,7 @@ int sqlite3WalRead(
     for(iKey=walHash(pgno); aHash[iKey]; iKey=walNextHash(iKey)){
       u32 iFrame = aHash[iKey] + iZero;
       if( iFrame<=iLast && aPgno[aHash[iKey]]==pgno ){
-        assert( iFrame>iRead );
+        /* assert( iFrame>iRead ); -- not true if there is corruption */
         iRead = iFrame;
       }
       if( (nCollide--)==0 ){

diff --git a/test/wal.test b/test/wal.test
index 056becf7dbcd85e440e1125cb22e1985837362c6..1c63ddc00f3f765156b62f1f94fb57bffbcc5370 100644 (file)
--- a/test/wal.test
+++ b/test/wal.test
@@ -416,6 +416,7 @@ do_test wal-8.3 {
 do_test wal-9.1 {
   reopen_db
   execsql {
+    PRAGMA cache_size=2000;
     CREATE TABLE t1(x PRIMARY KEY);
     INSERT INTO t1 VALUES(blob(900));
     INSERT INTO t1 VALUES(blob(900));
@@ -1124,6 +1125,7 @@ foreach {tn sectorsize logsize} "
     execsql {
       PRAGMA auto_vacuum = 0;
       PRAGMA page_size = 512;
+      PRAGMA cache_size = -2000;
       PRAGMA journal_mode = WAL;
       PRAGMA synchronous = FULL;
     }