diff options
| author | drh <drh@noemail.net> | 2014-04-18 01:10:05 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-04-18 01:10:05 +0000 |
| commit | a1a483d54e39272c16b5fa94e97578ccddee6a8a (patch) | |
| tree | b28bb3ea6cdff4cdefa08c26c870e415e996c730 /src/rowset.c | |
| parent | 652cc4b6dca02426e8d375a962bf8417850d9f7a (diff) | |
| parent | 71794dbaeb73f594ef704fa265715b207f98edc7 (diff) | |
| download | sqlite-a1a483d54e39272c16b5fa94e97578ccddee6a8a.tar.gz sqlite-a1a483d54e39272c16b5fa94e97578ccddee6a8a.zip | |
Merge recent trunk changes into sessions.
FossilOrigin-Name: 95e77efe076ab421bd246119c47dba5dacf9d087
Diffstat (limited to 'src/rowset.c')
| -rw-r--r-- | src/rowset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rowset.c b/src/rowset.c index 5761f9855..ba2e056bd 100644 --- a/src/rowset.c +++ b/src/rowset.c @@ -112,8 +112,8 @@ struct RowSet { struct RowSetEntry *pFresh; /* Source of new entry objects */ struct RowSetEntry *pForest; /* List of binary trees of entries */ u16 nFresh; /* Number of objects on pFresh */ - u8 rsFlags; /* Various flags */ - u8 iBatch; /* Current insert batch */ + u16 rsFlags; /* Various flags */ + int iBatch; /* Current insert batch */ }; /* @@ -447,7 +447,7 @@ int sqlite3RowSetNext(RowSet *p, i64 *pRowid){ ** on pRowSet->pEntry, then sort those entires into the forest at ** pRowSet->pForest so that they can be tested. */ -int sqlite3RowSetTest(RowSet *pRowSet, u8 iBatch, sqlite3_int64 iRowid){ +int sqlite3RowSetTest(RowSet *pRowSet, int iBatch, sqlite3_int64 iRowid){ struct RowSetEntry *p, *pTree; /* This routine is never called after sqlite3RowSetNext() */ |