From: drh Date: Mon, 25 May 2015 10:29:52 +0000 (+0000) Subject: Fix an obsolete comment - no changes to code. X-Git-Tag: version-3.8.11~227 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af80a1c8e7ca3a62a55bbb175fa08bf1517b85c7;p=thirdparty%2Fsqlite.git Fix an obsolete comment - no changes to code. FossilOrigin-Name: 4e4228c47f862c7f1fb078bf1b8c1d604f09d365 --- diff --git a/manifest b/manifest index 9ce9c0096d..28621753ef 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\san\sincorrect\sand\spointless\sassert(). -D 2015-05-25T09:33:48.801 +C Fix\san\sobsolete\scomment\s-\sno\schanges\sto\scode. +D 2015-05-25T10:29:52.538 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -237,7 +237,7 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa F src/os_unix.c 23eb5f56fac54d8fe0cb204291f3b3b2d94f23fc F src/os_win.c 97f7828a9554d753665b6fcf7540e31c2b3d6a6e F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca -F src/pager.c 97110085b1321298412f1e5c37bddb95b36d9208 +F src/pager.c 9bc918a009285f96ec6dac62dd764c7063552455 F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77 F src/parse.y af55d4fb5e588705112e9788364ca3af09651fcf F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4 @@ -1278,7 +1278,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 336fccc84cd7b770c9c3720efc9976269096232e -R e6209457c074a6729d7b05e89be47ecb +P 8c3929bd42ff9c041df341aced5b7dbc0f563506 +R 11e0e82c515ce5306d176915c715cba0 U drh -Z 95520a7699ed285b4b256a5657988e91 +Z d2520be369a919344f6618089d325658 diff --git a/manifest.uuid b/manifest.uuid index 039546bf55..4cff3ec3c8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8c3929bd42ff9c041df341aced5b7dbc0f563506 \ No newline at end of file +4e4228c47f862c7f1fb078bf1b8c1d604f09d365 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index 91378f0612..291c7e4968 100644 --- a/src/pager.c +++ b/src/pager.c @@ -3149,11 +3149,10 @@ static int pagerPagecount(Pager *pPager, Pgno *pnPage){ assert( pPager->eLock>=SHARED_LOCK ); nPage = sqlite3WalDbsize(pPager->pWal); - /* If the database size was not available from the WAL sub-system, - ** determine it based on the size of the database file. If the size - ** of the database file is not an integer multiple of the page-size, - ** round down to the nearest page. Except, any file larger than 0 - ** bytes in size is considered to contain at least one page. + /* If the number of pages in the database is not available from the + ** WAL sub-system, determine the page counte based on the size of + ** the database file. If the size of the database file is not an + ** integer multiple of the page-size, round up the result. */ if( nPage==0 ){ i64 n = 0; /* Size of db file in bytes */