/ Check-in [b9af4ad2]
Login

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

Overview
Comment:Silently ignore errors trying to set the default journal_mode while doing an ATTACH.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: b9af4ad2efadfb2fb9e338dc081a6231f1536700
User & Date: drh 2010-05-15 01:09:39
Context
2010-05-15
10:24
Add a note to the documentation of sqlite3_wal_hook() to say not to return SQLITE_ROW or SQLITE_DONE. Or any other value that is not a valid SQLite error code. check-in: 2f0b6cbf user: dan tags: trunk
01:09
Silently ignore errors trying to set the default journal_mode while doing an ATTACH. check-in: b9af4ad2 user: drh tags: trunk
2010-05-14
20:15
Fix a typo that (by bad luck) was not a syntax error but which caused some important lines of code to be skipped when SQLITE_DEBUG was not used. check-in: 9ef99d97 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/vdbe.c.

5289
5290
5291
5292
5293
5294
5295

5296
5297
5298
5299
5300
5301
5302
5303
        ** mode, this transaction always uses a rollback journal.
        */
        assert( sqlite3BtreeIsInTrans(pBt)==0 );
        if( rc==SQLITE_OK ){
          rc = sqlite3BtreeSetVersion(pBt, 
                                      (eNew==PAGER_JOURNALMODE_WAL ? 2 : 1));
          if( rc==SQLITE_BUSY && pOp->p5==0 ) goto abort_due_to_error;

        }else if( rc==SQLITE_BUSY ){
          eNew = PAGER_JOURNALMODE_QUERY;
          rc = SQLITE_OK;
        }
      }
    }
  }
#endif /* ifndef SQLITE_OMIT_WAL */







>
|







5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
        ** mode, this transaction always uses a rollback journal.
        */
        assert( sqlite3BtreeIsInTrans(pBt)==0 );
        if( rc==SQLITE_OK ){
          rc = sqlite3BtreeSetVersion(pBt, 
                                      (eNew==PAGER_JOURNALMODE_WAL ? 2 : 1));
          if( rc==SQLITE_BUSY && pOp->p5==0 ) goto abort_due_to_error;
        }
        if( rc==SQLITE_BUSY ){
          eNew = PAGER_JOURNALMODE_QUERY;
          rc = SQLITE_OK;
        }
      }
    }
  }
#endif /* ifndef SQLITE_OMIT_WAL */