diff options
| author | dan <dan@noemail.net> | 2015-08-28 15:50:24 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-08-28 15:50:24 +0000 |
| commit | 8f9ea2dc70cc160b4cae49887aa54b9e1464a22c (patch) | |
| tree | e2b34af7e5f6173bb86cdcaf55a1ae9989820622 /src/vdbeapi.c | |
| parent | b8c7cfb8345831b58ee81f202580a557541c9472 (diff) | |
| parent | f6ec8d4f4cdd858c052f09091f2bac706ec9cde4 (diff) | |
| download | sqlite-8f9ea2dc70cc160b4cae49887aa54b9e1464a22c.tar.gz sqlite-8f9ea2dc70cc160b4cae49887aa54b9e1464a22c.zip | |
Merge latest trunk into this branch.
FossilOrigin-Name: ab93024da7bd577d8850b417aff8597a8b3807fc
Diffstat (limited to 'src/vdbeapi.c')
| -rw-r--r-- | src/vdbeapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vdbeapi.c b/src/vdbeapi.c index ebd5ef29a..15a8bba0d 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -611,7 +611,7 @@ end_of_step: ** were called on statement p. */ assert( rc==SQLITE_ROW || rc==SQLITE_DONE || rc==SQLITE_ERROR - || rc==SQLITE_BUSY || rc==SQLITE_MISUSE + || (rc&0xff)==SQLITE_BUSY || rc==SQLITE_MISUSE ); assert( (p->rc!=SQLITE_ROW && p->rc!=SQLITE_DONE) || p->rc==p->rcApp ); if( p->isPrepareV2 && rc!=SQLITE_ROW && rc!=SQLITE_DONE ){ |