diff options
| author | dan <dan@noemail.net> | 2010-08-03 18:29:04 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2010-08-03 18:29:04 +0000 |
| commit | d5e0101be04d7013650b3b5aa6e6b0d30be654b9 (patch) | |
| tree | 430c5f872f553c40057b62c67d605bb77f17e25f /src/vdbeaux.c | |
| parent | a42c66bdfb009404579af14a7ded35c03f5dab73 (diff) | |
| parent | a3e414cd4827402b7d877a9c368a0afdb9fbe637 (diff) | |
| download | sqlite-d5e0101be04d7013650b3b5aa6e6b0d30be654b9.tar.gz sqlite-d5e0101be04d7013650b3b5aa6e6b0d30be654b9.zip | |
Merge trunk changes into experimental branch.
FossilOrigin-Name: 15368a9f8523d5fb611cd576080daed2cf2f1500
Diffstat (limited to 'src/vdbeaux.c')
| -rw-r--r-- | src/vdbeaux.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/vdbeaux.c b/src/vdbeaux.c index 295a8c3a8..7729a85d4 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -2400,11 +2400,8 @@ int sqlite3VdbeCursorMoveto(VdbeCursor *p){ rc = sqlite3BtreeMovetoUnpacked(p->pCursor, 0, p->movetoTarget, 0, &res); if( rc ) return rc; p->lastRowid = p->movetoTarget; - p->rowidIsValid = ALWAYS(res==0) ?1:0; - if( NEVER(res<0) ){ - rc = sqlite3BtreeNext(p->pCursor, &res); - if( rc ) return rc; - } + if( res!=0 ) return SQLITE_CORRUPT_BKPT; + p->rowidIsValid = 1; #ifdef SQLITE_TEST sqlite3_search_count++; #endif |