SQLite: Check-in [d980c5b2]

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

Overview

Comment:	Avoid a harmless reference to an uninitialized variable following an error in FTS3. This is not a bug. The change is to silence a valgrind warning.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	d980c5b22fd700afb3cac5de5501c9350f2f589e
User & Date:	drh 2011-10-22 21:00:46

Context

2011-10-27
15:19		If an error occurs within sqlite3_step() on a statement prepared using sqlite3_prepare_v2(), transfer both the error code and error message to the database handle before sqlite3_step() returns (so that they are available via sqlite3_errcode() and sqlite3_errmsg(). Prior to this commit, only the error code was transfered. The error message was not available until after either sqlite3_reset() or sqlite3_finalize() had been called on the statement handle. check-in: 8f88cc4e user: dan tags: trunk
2011-10-22
21:00		Avoid a harmless reference to an uninitialized variable following an error in FTS3. This is not a bug. The change is to silence a valgrind warning. check-in: d980c5b2 user: drh tags: trunk
2011-10-21
19:06		Purge lingering references to SQLITE_STAT2 from the code and test scripts. check-in: aed2bf7a user: drh tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbe.c.

  4300   4300     BtCursor *pCrsr;
  4301   4301     int res;
  4302   4302   
  4303   4303     assert( pOp->p1>=0 && pOp->p1<p->nCursor );
  4304   4304     pC = p->apCsr[pOp->p1];
  4305   4305     assert( pC!=0 );
  4306   4306     pCrsr = pC->pCursor;
  4307         -  if( NEVER(pCrsr==0) ){
  4308         -    res = 1;
  4309         -  }else{
         4307  +  res = 0;
         4308  +  if( ALWAYS(pCrsr!=0) ){
  4310   4309       rc = sqlite3BtreeLast(pCrsr, &res);
  4311   4310     }
  4312   4311     pC->nullRow = (u8)res;
  4313   4312     pC->deferredMoveto = 0;
  4314   4313     pC->rowidIsValid = 0;
  4315   4314     pC->cacheStatus = CACHE_STALE;
  4316   4315     if( pOp->p2>0 && res ){