From: dan <dan@noemail.net>
Date: Thu, 23 Feb 2012 16:45:42 +0000 (+0000)
Subject: Fix a typo made inside an assert() statement in the previous commit.
X-Git-Tag: version-3.7.11~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf24261b7beda34593596dffa77108e176bbce1c;p=thirdparty%2Fsqlite.git

Fix a typo made inside an assert() statement in the previous commit.

FossilOrigin-Name: f0640615f25ebe8bf2eed0e1a0f2e309471889fe
---

diff --git a/manifest b/manifest
index 3b970f297d..7316e3191d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\ssqlite3PagerWalFramesize()\sfunction\sto\spager.c.\sThis\sis\sused\sby\szipvfs.
-D 2012-02-23T15:35:49.591
+C Fix\sa\stypo\smade\sinside\san\sassert()\sstatement\sin\sthe\sprevious\scommit.
+D 2012-02-23T16:45:42.651
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -168,7 +168,7 @@ F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c 0e3d2942d228d0366fb80a3640f35caf413b66d1
 F src/os_win.c 5ac061ae1326a71500cee578ed0fd9113b4f6a37
-F src/pager.c af82f106e5b22e90cdbccbccdabe14bfa00ced5e
+F src/pager.c 25733ab94de3c058b98b7481ed0d7163cd9471cf
 F src/pager.h 0ccc8260fadff8e0ce5193392faea6954178bf3d
 F src/parse.y 1ddd71ae55f4b7cbb2672526ea4de023de0f519e
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
@@ -250,7 +250,7 @@ F src/vdbemem.c fb0ac964ccbcd94f595eb993c05bfd9c52468a4a
 F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
 F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
 F src/vtab.c ab90fb600a3f5e4b7c48d22a4cdb2d6b23239847
-F src/wal.c 176b50fc9e30ef76d3d3c9ba99a40cea6f23eace
+F src/wal.c ef05bdbff7ad30eb950222b2783dac21f7b8acb4
 F src/wal.h 9a300673e86f04eeb7442348d3557eecc5a9509a
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c af623942514571895818b9b7ae11db95ae3b3d88
@@ -990,7 +990,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P c539cf21ef8f4eb4782790aa97a67d10ae9ffd64
-R 9cc56f07006d3b03439dff4deb3c69b5
+P 786e24dc56504d1958db0618e645610f2600a087
+R 62ee79e3c7935d38f24dc9d649f992a8
 U dan
-Z 4dc0dc11213b3ebf076551ec72da6775
+Z 453c5f133ed9456db2536b040019e9b7
diff --git a/manifest.uuid b/manifest.uuid
index d8472242ac..9847f54855 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-786e24dc56504d1958db0618e645610f2600a087
\ No newline at end of file
+f0640615f25ebe8bf2eed0e1a0f2e309471889fe
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index d293472957..2cf4dd0dd9 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -6879,7 +6879,7 @@ int sqlite3PagerCloseWal(Pager *pPager){
 ** is empty, return 0.
 */
 int sqlite3PagerWalFramesize(Pager *pPager){
-  assert( pPager->eState==PAGER_SHARED );
+  assert( pPager->eState==PAGER_READER );
   return sqlite3WalFramesize(pPager->pWal);
 }
 
diff --git a/src/wal.c b/src/wal.c
index 315fc0bc26..48fcba100b 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -3074,7 +3074,6 @@ int sqlite3WalHeapMemory(Wal *pWal){
 ** or zero if it is not (or if pWal is NULL).
 */
 int sqlite3WalFramesize(Wal *pWal){
-  int nRet = 0;
   assert( pWal==0 || pWal->readLock>=0 );
   return (pWal ? pWal->szPage : 0);
 }