/ Check-in [13108ce1]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a broken assert() in pager.c.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:13108ce13c281f31aa60b403567710ae3d925797
User & Date: dan 2011-01-25 11:33:01
Context
2011-01-25
13:43
Fix a couple of typos in comments. No changes to actual code. check-in: 9167fdb3 user: dan tags: trunk
11:33
Fix a broken assert() in pager.c. check-in: 13108ce1 user: dan tags: trunk
09:54
Fix a problem in memsubsys1.test. Modifications to test code only. check-in: 7ef3f7cb user: dan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/pager.c.

5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630

5631
5632
5633

5634
5635
5636
5637
5638
5639
5640
** or pages with the Pager.noSync flag set.
**
** If successful, or if called on a pager for which it is a no-op, this
** function returns SQLITE_OK. Otherwise, an IO error code is returned.
*/
int sqlite3PagerSync(Pager *pPager){
  int rc;                              /* Return code */
  assert( !MEMDB );
  if( pPager->noSync ){
    rc = SQLITE_OK;
  }else{

    rc = sqlite3OsSync(pPager->fd, pPager->syncFlags);
  }
  if( isOpen(pPager->fd) ){

    sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_SYNC, (void *)&rc);
  }
  return rc;
}

/*
** This function may only be called while a write-transaction is active in







<



>



>







5620
5621
5622
5623
5624
5625
5626

5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
** or pages with the Pager.noSync flag set.
**
** If successful, or if called on a pager for which it is a no-op, this
** function returns SQLITE_OK. Otherwise, an IO error code is returned.
*/
int sqlite3PagerSync(Pager *pPager){
  int rc;                              /* Return code */

  if( pPager->noSync ){
    rc = SQLITE_OK;
  }else{
    assert( !MEMDB );
    rc = sqlite3OsSync(pPager->fd, pPager->syncFlags);
  }
  if( isOpen(pPager->fd) ){
    assert( !MEMDB );
    sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_SYNC, (void *)&rc);
  }
  return rc;
}

/*
** This function may only be called while a write-transaction is active in