diff options
| author | dan <dan@noemail.net> | 2014-09-15 15:34:31 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2014-09-15 15:34:31 +0000 |
| commit | d4a80e6742921478b369a9537302bc586c79d812 (patch) | |
| tree | 6731ece80e9d8851555cad39c555482f1db1a006 /src/rowset.c | |
| parent | ee8d0b4111b47bd91e9d3280e8540d3a560b0cc7 (diff) | |
| parent | 907214c8e83a3d1f35b6cce5768016089193b3c2 (diff) | |
| download | sqlite-d4a80e6742921478b369a9537302bc586c79d812.tar.gz sqlite-d4a80e6742921478b369a9537302bc586c79d812.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: 55b8011d5b455927f5b92a3cb911fd909fb0edab
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 ba2e056bd..ff5593892 100644 --- a/src/rowset.c +++ b/src/rowset.c @@ -50,7 +50,7 @@ ** No INSERTs may occurs after a SMALLEST. An assertion will fail if ** that is attempted. ** -** The cost of an INSERT is roughly constant. (Sometime new memory +** The cost of an INSERT is roughly constant. (Sometimes new memory ** has to be allocated on an INSERT.) The cost of a TEST with a new ** batch number is O(NlogN) where N is the number of elements in the RowSet. ** The cost of a TEST using the same batch number is O(logN). The cost @@ -443,8 +443,8 @@ int sqlite3RowSetNext(RowSet *p, i64 *pRowid){ ** Check to see if element iRowid was inserted into the rowset as ** part of any insert batch prior to iBatch. Return 1 or 0. ** -** If this is the first test of a new batch and if there exist entires -** on pRowSet->pEntry, then sort those entires into the forest at +** If this is the first test of a new batch and if there exist entries +** on pRowSet->pEntry, then sort those entries into the forest at ** pRowSet->pForest so that they can be tested. */ int sqlite3RowSetTest(RowSet *pRowSet, int iBatch, sqlite3_int64 iRowid){ |