/ Check-in [23667f3b]
Login

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

Overview
Comment:Remove a test from sqlite3VdbeMemFromBtree() which was unnecessary, and after the recent OP_Column refactoring, unreachable.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:23667f3ba09b7e839d76c42669dc9247a91262c8
User & Date: drh 2013-11-21 19:05:04
Context
2013-11-21
19:27
Add the --timer option to the wordcount test program. check-in: a89fdf87 user: drh tags: trunk
19:05
Remove a test from sqlite3VdbeMemFromBtree() which was unnecessary, and after the recent OP_Column refactoring, unreachable. check-in: 23667f3b user: drh tags: trunk
17:24
Make sure the OP_Next and OP_NextIfOpen opcodes are numbered close together for efficiency in switch() statements. OP_Prev and OP_PrevIfOpen too. check-in: d4ccf0f5 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbemem.c.

   913    913     if( key ){
   914    914       zData = (char *)sqlite3BtreeKeyFetch(pCur, &available);
   915    915     }else{
   916    916       zData = (char *)sqlite3BtreeDataFetch(pCur, &available);
   917    917     }
   918    918     assert( zData!=0 );
   919    919   
   920         -  if( offset+amt<=available && (pMem->flags&MEM_Dyn)==0 ){
          920  +  if( offset+amt<=available ){
   921    921       sqlite3VdbeMemRelease(pMem);
   922    922       pMem->z = &zData[offset];
   923    923       pMem->flags = MEM_Blob|MEM_Ephem;
   924    924     }else if( SQLITE_OK==(rc = sqlite3VdbeMemGrow(pMem, amt+2, 0)) ){
   925    925       pMem->flags = MEM_Blob|MEM_Dyn|MEM_Term;
   926    926       pMem->enc = 0;
   927    927       pMem->type = SQLITE_BLOB;