SQLite: Check-in [fb076b28]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Change an unreachable branch into an assert().
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	fb076b28c36975ff2e41440f22fe5de115c195da
User & Date:	drh 2015-03-25 18:29:10

Context

2015-03-26
14:29		Fix a harmless compiler warning in FTS3. (check-in: 1688f60c user: drh tags: trunk)
11:55		Optimize cases where all the sorter is sorting a set of records that all begin with integer values, or that all begin with text values to be compared using BINARY. (check-in: ce5ad17c user: dan tags: sorter-opt)
2015-03-25
18:29		Change an unreachable branch into an assert(). (check-in: fb076b28 user: drh tags: trunk)
17:35		Fix the saveCursorPosition() routine in btree.c so that it works correctly for a eState=CURSOR_SKIPNEXT cursor. (check-in: 37866b4d user: drh tags: trunk)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/btree.c.

   811    811     assert( pCur!=0 );
   812    812     assert( pCur->eState!=CURSOR_VALID );
   813    813     rc = restoreCursorPosition(pCur);
   814    814     if( rc ){
   815    815       *pDifferentRow = 1;
   816    816       return rc;
   817    817     }
   818         -  if( pCur->eState!=CURSOR_VALID || pCur->skipNext!=0 ){
          818  +  if( pCur->eState!=CURSOR_VALID ){
   819    819       *pDifferentRow = 1;
   820    820     }else{
          821  +    assert( pCur->skipNext==0 );
   821    822       *pDifferentRow = 0;
   822    823     }
   823    824     return SQLITE_OK;
   824    825   }
   825    826   
   826    827   #ifndef SQLITE_OMIT_AUTOVACUUM
   827    828   /*