diff options
author | drh <drh@noemail.net> | 2015-08-20 23:54:25 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2015-08-20 23:54:25 +0000 |
commit | 89a10b2d5312ce304906e2ee2f9932302ed2b85b (patch) | |
tree | efa18c5656cf051fb0d10a1576ec6f12f957dfc7 /src/vdbeapi.c | |
parent | 87c44ef2f76229eeb5086e8e5ddb41a0fc6db150 (diff) | |
parent | 0fee5969c8928e4043416fdc6cdfff738ce40f55 (diff) | |
download | sqlite-89a10b2d5312ce304906e2ee2f9932302ed2b85b.tar.gz sqlite-89a10b2d5312ce304906e2ee2f9932302ed2b85b.zip |
Merge recent trunk enhancements, include table-valued functions.
FossilOrigin-Name: e9196d566690de0e9815f8cd85be7844322b5a79
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 2c75bbf2a..c9d1cb830 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 ){ |