Change an unreachable branch into an assert().

FossilOrigin-Name: fb076b28c36975ff2e41440f22fe5de115c195da

diff --git a/manifest b/manifest
index 48427f05a39fbac0ce5c3a095c85838e1b3fa607..6fdfb0ad409f5ec1b0d98bc29769ec5db2c87229 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\ssaveCursorPosition()\sroutine\sin\sbtree.c\sso\sthat\sit\sworks\ncorrectly\sfor\sa\seState=CURSOR_SKIPNEXT\scursor.
-D 2015-03-25T17:35:01.825
+C Change\san\sunreachable\sbranch\sinto\san\sassert().
+D 2015-03-25T18:29:10.982
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -173,7 +173,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
-F src/btree.c 933ab4ad883546193f5fd55f840299165adb8069
+F src/btree.c 4f305e554d7d207375c3e29ab0335bd5a473a125
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 2bfefc01875d8da066504c233ec259fcb3b2ef72
 F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a
@@ -1247,7 +1247,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 1e96520ac1d12ca83f019a60482efa0a074f2f94
-R 0d2b32f8ac05ffe0443a79d106bd4efe
+P 37866b4d483296ab9b7fcb9f5486695d4c2b8ddd
+R 6f3611ab9d4988693f727ae20dc9c9e5
 U drh
-Z 2f58ba8b67469927a3c7d533210b0ef3
+Z 3f028f44e21ab0b1619e9687cba7cf7a

diff --git a/manifest.uuid b/manifest.uuid
index 90856bf9ee9aa7451c2da8f3633561ff990204c2..849f782137b5178c2001e3e5cd50b23f24d2ac93 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-37866b4d483296ab9b7fcb9f5486695d4c2b8ddd
\ No newline at end of file
+fb076b28c36975ff2e41440f22fe5de115c195da
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index dd10f6a09acff032da61a3c2c3d1519799bd8ca4..52f29428f7e271fcda6dfcfdf483f1a29f4d15d2 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -815,9 +815,10 @@ int sqlite3BtreeCursorRestore(BtCursor *pCur, int *pDifferentRow){
     *pDifferentRow = 1;
     return rc;
   }
-  if( pCur->eState!=CURSOR_VALID || pCur->skipNext!=0 ){
+  if( pCur->eState!=CURSOR_VALID ){
     *pDifferentRow = 1;
   }else{
+    assert( pCur->skipNext==0 );
     *pDifferentRow = 0;
   }
   return SQLITE_OK;