diff options
Diffstat (limited to 'src/3rdparty/sqlite/pager.c')
-rw-r--r-- | src/3rdparty/sqlite/pager.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/3rdparty/sqlite/pager.c b/src/3rdparty/sqlite/pager.c index 32dcf19b2..8b6a15465 100644 --- a/src/3rdparty/sqlite/pager.c +++ b/src/3rdparty/sqlite/pager.c @@ -463,7 +463,7 @@ static void pager_reset(Pager *pPager){ /* ** When this routine is called, the pager has the journal file open and ** a write lock on the database. This routine releases the database -** write lock and actquires a read lock in its place. The journal file +** write lock and acquires a read lock in its place. The journal file ** is deleted and closed. ** ** TODO: Consider keeping the journal file open for temporary databases. @@ -1286,9 +1286,9 @@ static PgHdr *pager_get_all_dirty_pages(Pager *pPager){ } /* -** Actquire a page. +** Acquire a page. ** -** A read lock on the disk file is obtained when the first page is actquired. +** A read lock on the disk file is obtained when the first page is acquired. ** This read lock is dropped when the last page is released. ** ** A _get works for any page number greater than 0. If the database @@ -1297,13 +1297,13 @@ static PgHdr *pager_get_all_dirty_pages(Pager *pPager){ ** all zeros. The extra data appended to a page is always initialized ** to zeros the first time a page is loaded into memory. ** -** The actquisition might fail for several reasons. In all cases, +** The acquisition might fail for several reasons. In all cases, ** an appropriate error code is returned and *ppPage is set to NULL. ** ** See also sqlitepager_lookup(). Both this routine and _lookup() attempt ** to find a page in the in-memory cache first. If the page is not already ** in memory, this routine goes to disk to read it in whereas _lookup() -** just returns 0. This routine actquires a read-lock the first time it +** just returns 0. This routine acquires a read-lock the first time it ** has to go to disk, and could also playback an old journal if necessary. ** Since _lookup() never goes to disk, it never has to deal with locks ** or journal files. @@ -1366,7 +1366,7 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ pPager->journalStarted = 0; /* Playback and delete the journal. Drop the database write - ** lock and reactquire the read lock. + ** lock and reacquire the read lock. */ rc = pager_playback(pPager, 0); if( rc!=SQLITE_OK ){ @@ -1544,7 +1544,7 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ } /* -** Actquire a page if it is already in the in-memory cache. Do +** Acquire a page if it is already in the in-memory cache. Do ** not read the page from disk. Return a pointer to the page, ** or 0 if the page is not in cache. ** @@ -1692,7 +1692,7 @@ static int pager_open_journal(Pager *pPager){ } /* -** Actquire a write-lock on the database. The lock is removed when +** Acquire a write-lock on the database. The lock is removed when ** the any of the following happen: ** ** * sqlitepager_commit() is called. @@ -1702,7 +1702,7 @@ static int pager_open_journal(Pager *pPager){ ** ** The parameter to this routine is a pointer to any open page of the ** database file. Nothing changes about the page - it is used merely -** to actquire a pointer to the Pager structure and as proof that there +** to acquire a pointer to the Pager structure and as proof that there ** is already a read-lock on the database. ** ** A journal file is opened if this is not a temporary file. For @@ -1739,8 +1739,8 @@ int sqlitepager_begin(void *pData){ ** changes to a page. ** ** The first time this routine is called, the pager creates a new -** journal and actquires a write lock on the database. If the write -** lock could not be actquired, this routine returns SQLITE_BUSY. The +** journal and acquires a write lock on the database. If the write +** lock could not be acquired, this routine returns SQLITE_BUSY. The ** calling routine must check for that return value and be careful not to ** change any page data until this routine returns SQLITE_OK. ** |