Rearrange the order of two branches in order to restore 100% branch coverage

after recent changes to in-memory database processing.

FossilOrigin-Name: 6ce6ff4402241d5c76acd0c60c85097dfcd7fd7c

diff --git a/manifest b/manifest
index 0db8a02fef93fb7140d1ed7e86cd93bac78c9d06..221622ce3bf346c140094ce45e126dcadd8a63c4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Change\sso\sthat\sdeleting\san\sExpr\sstructure\srequires\sonly\sone\sframe\sper\slevel\sin\sthe\sexpression\stree,\snot\stwo.
-D 2009-11-23T14:39:15
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Rearrange\sthe\sorder\sof\stwo\sbranches\sin\sorder\sto\srestore\s100%\sbranch\scoverage\nafter\srecent\schanges\sto\sin-memory\sdatabase\sprocessing.
+D 2009-11-23T15:59:28
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 7f6c6aa7feeeb5e26e01b344161d9aa1b5d64177
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -150,7 +153,7 @@ F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30
 F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f
 F src/os_unix.c bdd6ca0932dcb51c344081aff430bcc71c14db7f
 F src/os_win.c 5ffab20249a61e0625f869efe157fa009747039b
-F src/pager.c a5c0fa9bc0dd6d04b304a35aeedee9ebd0dc2948
+F src/pager.c b2a564bbd28efef24b7598ce007d964e172f253b
 F src/pager.h 1b32faf2e578ac3e7bcf9c9d11217128261c5c54
 F src/parse.y f785d814562a14dc19202f61abb4372845f64752
 F src/pcache.c 3b079306376e0e04c0d3df40c0a4b750a1839310
@@ -772,7 +775,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 39214aee6553db76309851e7aa74fcc02d4f59b7
-R 673f464af9f0a676a75a7dfadac3e11c
-U dan
-Z 0e8b7d6b7e381316eea3c397c4c24db2
+P a4380ab326e4b0de29271c824d041193e86b7139
+R e9edc0086f1c75d2d64b3dbdf0fc928b
+U drh
+Z 3b0ef23d140f2cb75c84af6f193ec6e6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFLCrFjoxKgR168RlERAsBGAJ9G0mhiLXC2fl2M09RCMI6yrjNQSwCZAZa2
+9pyVKRh0m6cYDxcr3Z7Iumo=
+=7OxL
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 44154a4bb8a9d0c3d59e1967a5c793eb39893ec0..66009455d2d1a46165ece12ee50aebc051f9af85 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a4380ab326e4b0de29271c824d041193e86b7139
\ No newline at end of file
+6ce6ff4402241d5c76acd0c60c85097dfcd7fd7c
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 2afb79080e493144bb0b5dcad2aefa66673e3196..2bbfeb2143dccb11da847918e3e11b0479ee40ec 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -3838,7 +3838,7 @@ int sqlite3PagerAcquire(
       goto pager_acquire_err;
     }
 
-    if( nMax<(int)pgno || MEMDB || noContent ){
+    if( MEMDB || nMax<(int)pgno || noContent ){
       if( pgno>pPager->mxPgno ){
        rc = SQLITE_FULL;
        goto pager_acquire_err;