diff options
| author | drh <drh@noemail.net> | 2014-11-18 20:49:30 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-11-18 20:49:30 +0000 |
| commit | 64b600ff13d4bac1d459cf54b649b45e520aba4c (patch) | |
| tree | b9d2242eea593c2834786c15c31d87cbb80dfdf0 /src/btree.c | |
| parent | bea3b976a95b00968d6f3ca496d5c1dfd3104527 (diff) | |
| parent | bb8f92529401b09dbc6e9df4ba3e38ae3a0789f3 (diff) | |
| download | sqlite-64b600ff13d4bac1d459cf54b649b45e520aba4c.tar.gz sqlite-64b600ff13d4bac1d459cf54b649b45e520aba4c.zip | |
Merge in all the other ROLLBACK fixes from the branch-3.8.7 branch.
I don't know why I was doing them one-by-one.
FossilOrigin-Name: 296b0c7397790ceadbdb330959e962f6491abc3e
Diffstat (limited to 'src/btree.c')
| -rw-r--r-- | src/btree.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/btree.c b/src/btree.c index 7a49fb1a7..9587e567a 100644 --- a/src/btree.c +++ b/src/btree.c @@ -3925,13 +3925,9 @@ int sqlite3BtreeCursorIsValid(BtCursor *pCur){ */ int sqlite3BtreeKeySize(BtCursor *pCur, i64 *pSize){ assert( cursorHoldsMutex(pCur) ); - assert( pCur->eState==CURSOR_INVALID || pCur->eState==CURSOR_VALID ); - if( pCur->eState!=CURSOR_VALID ){ - *pSize = 0; - }else{ - getCellInfo(pCur); - *pSize = pCur->info.nKey; - } + assert( pCur->eState==CURSOR_VALID ); + getCellInfo(pCur); + *pSize = pCur->info.nKey; return SQLITE_OK; } |