Remove two more overzealous assert() statements. (CVS 6932)

FossilOrigin-Name: 788aa9dde9e76f67f22c07a904faf03e97e032c6

diff --git a/manifest b/manifest
index 48a6b8b885ad200d275cad73cf485f4026dac4bb..495e715e669432018185adef671aefaf4178f3e5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\soverzealous\sassert()\sfrom\spager.c.\s(CVS\s6931)
-D 2009-07-25T00:10:46
+C Remove\stwo\smore\soverzealous\sassert()\sstatements.\s(CVS\s6932)
+D 2009-07-25T00:13:59
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -147,7 +147,7 @@ F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c cdb2a08b9ce4aa13b3f7b91d4dd60fb48be9f56a
 F src/os_win.c 725c38a524d168ce280446ad8761d731bc516405
-F src/pager.c 872b3807172f24d46413d9b765b9af6020da443a
+F src/pager.c c462bf6153c3c29da0ce723ac76c8fa76cbd6a9b
 F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
 F src/parse.y bcd46d43fbd23a22b8c020a3eb1806b794794ed5
 F src/pcache.c 1dae135b70a029f81ed66f6e9b5d0db91480d5d0
@@ -741,7 +741,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P e5165c80abfdba0ad74e1042e4c94fe00d4b3308
-R b4fdc5081eb8c32bbe893361356d85e8
+P 4a924b475aa0f7f2f69caed0adc2e60d29c47f21
+R 69d11ad1bb13603103594d88d70fe872
 U drh
-Z a3c81fe414979381903477f6ab6cc886
+Z e88cd7ec3be1e087035327e93db22707

diff --git a/manifest.uuid b/manifest.uuid
index 4702ab9a3a34388271e83b517e96bff6d9ef5568..487108c6434710b23f68eb59e528690a107a2e7c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4a924b475aa0f7f2f69caed0adc2e60d29c47f21
\ No newline at end of file
+788aa9dde9e76f67f22c07a904faf03e97e032c6
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 50b6fdf762426075c755c090c10d4b5b9ed27602..28e100ff87de85b96abeeab67099f26739638661 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.618 2009/07/25 00:10:46 drh Exp $
+** @(#) $Id: pager.c,v 1.619 2009/07/25 00:13:59 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -2406,8 +2406,7 @@ static void pagerReportSize(Pager *pPager){
 */
 int sqlite3PagerSetPagesize(Pager *pPager, u16 *pPageSize, int nReserve){
   int rc = pPager->errCode;
-  assert( pPager->dbSize==0 );
-  assert( sqlite3PcacheRefCount(pPager->pPCache)==0 );
+
   if( rc==SQLITE_OK ){
     u16 pageSize = *pPageSize;
     assert( pageSize==0 || (pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE) );