Move an assert() and testcase() into their correct position within

getAndInitPage().

FossilOrigin-Name: 18115164e12509ec21f34598089a7f1310048819

diff --git a/manifest b/manifest
index d8f09afc9d37a54befe12a730b2796428e9a0a73..b33b447eed64183b51f5e147defe55aed3400b47 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\stail\srecursion\sin\spcache1Unpin()\sto\sget\sa\ssmall\ssize\sreduction\sand\nspeed\simprovement.
-D 2015-06-29T00:21:00.874
+C Move\san\sassert()\sand\stestcase()\sinto\stheir\scorrect\sposition\swithin\ngetAndInitPage().
+D 2015-06-29T00:52:33.038
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -269,7 +269,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
 F src/bitvec.c 5eb7958c3bf65210211cbcfc44eff86d0ded7c9d
 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
-F src/btree.c 8f86dae090ec737d71c31c2ed79e767bd3638bcb
+F src/btree.c ce342e156716fb64b9cf5c040260d0b47989f37b
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 8ca7124af9ee2ce27747a4e5500c27a254dea8eb
 F src/build.c b3f15255d5b16e42dafeaa638fd4f8a47c94ed70
@@ -1364,7 +1364,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 94ef17012855b7be725594c34bcea75f34c40190
-R 33d15daee3cafade223d75c1a4d78a0b
+P fde70472aebc09b34a517131f676e6847d02b747
+R 2759f4b6497579e6ac5cdd2dfc68ef6f
 U drh
-Z 83eec004ab67e81db298053e8cf0783c
+Z 7a56a5c524bee1a78dcf76e001f644d9

diff --git a/manifest.uuid b/manifest.uuid
index 8003997611fe8ecccef7784614bb9c517a92abcc..cbb6f696597fa90b98299cfbd04b3bd6dfc7fe0d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fde70472aebc09b34a517131f676e6847d02b747
\ No newline at end of file
+18115164e12509ec21f34598089a7f1310048819
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index a23bd853fc5828b6e0d7bf278f8ec26c095a301d..027012e33aab949f8549325b0e3de821b254d76d 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -1961,13 +1961,12 @@ static int getAndInitPage(
     releasePage(*ppPage);
     goto getAndInitPage_error;
   }
-
-  testcase( pgno==0 );
-  assert( pgno!=0 || rc==SQLITE_CORRUPT );
   return SQLITE_OK;
 
 getAndInitPage_error:
   if( pCur ) pCur->iPage--;
+  testcase( pgno==0 );
+  assert( pgno!=0 || rc==SQLITE_CORRUPT );
   return rc;
 }