Remove an unused call to sqlite3PageBegin() from pager_write(). Replace it

with an assert().

FossilOrigin-Name: 01c1278263fdd8454763be15bddd2558e720e6e0

diff --git a/manifest b/manifest
index a04014c28a537888f6230ec8971bc3b18dc63af1..e05ad1fe670bbd76aec94e30386d94d55ab51721 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Run\stkt-9d68c883.test\salong\swith\sthe\sother\spager.c\scoverage\stests.\sAdd\sa\stest\scase\sto\spager1.test.
-D 2010-07-02T13:49:09
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Remove\san\sunused\scall\sto\ssqlite3PageBegin()\sfrom\spager_write().\s\sReplace\sit\nwith\san\sassert().
+D 2010-07-02T15:35:58
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -156,7 +159,7 @@ F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
 F src/os_unix.c ec7c7f7ca224ce2ff58736eebf804b48a75f9946
 F src/os_win.c 48f67798969ba983487fed5691059ade7fff2ef7
-F src/pager.c 3808cf9cbeb349c985f084eb18a377563a4725fe
+F src/pager.c 95068d8b0f8a161ea364aa41af85d220a1be23df
 F src/pager.h 879fdde5a102d2f21a3135d6f647530b21c2796c
 F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
 F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
@@ -830,7 +833,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P eddfb2b4062f8a8b907f0c7bc08a05c16692e900
-R cbcbb94acbf46b2c6e4f187c138fdd3d
-U dan
-Z f230db57535217f8f5a9d88d4de4baa6
+P c6714b0dbdc782e721662ec166d9f161bc05c6df
+R 6b061c34f328178e14495dbe8bda105d
+U drh
+Z 1d4426dd5a36bf8b9496de70daa3941f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMLgdhoxKgR168RlERAgrFAJ9BcfJJE41g0R/wTWwcLA+eHswnvACfZcVS
+nrB2I8DZXgACDKC9GqC0AnY=
+=LU4G
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 97a6df673e34a43e3dc4161472307ec3123ef06e..a8efe90114fe08a2d9facebb13adc643deef4f83 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c6714b0dbdc782e721662ec166d9f161bc05c6df
\ No newline at end of file
+01c1278263fdd8454763be15bddd2558e720e6e0
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index b97c6baf598973bd7c01b46151ddcea8728e5c39..5ed4fe8ebfacb65a504fe05072b6c689a178518c 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -4724,10 +4724,7 @@ static int pager_write(PgHdr *pPg){
     ** which means they have acquired the necessary locks but the rollback
     ** journal might not yet be open.
     */
-    rc = sqlite3PagerBegin(pPager, 0, pPager->subjInMemory);
-    if( rc!=SQLITE_OK ){
-      return rc;
-    }
+    assert( pPager->state>=RESERVED_LOCK );
     if( pPager->pInJournal==0
      && pPager->journalMode!=PAGER_JOURNALMODE_OFF 
      && !pagerUseWal(pPager)