/ Check-in [e3357728]
Login

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

Overview
Comment:Fix a typo inside an assert() statement introduced by the previous commit.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | exp-busy-snapshot-fix
Files: files | file ages | folders
SHA3-256: e3357728472d5e57db6d7eef0ce008bdee071b5b07b60e242f383440eebe85bd
User & Date: dan 2018-07-05 17:03:43
Context
2018-07-05
17:16
In wal mode, if a "BEGIN EXCLUSIVE" command (or any other command that upgrades from no transaction directly to a write transaction) hits an SQLITE_BUSY_SNAPSHOT error, change the error code to SQLITE_BUSY to indicate to the caller that the condition may be transient. check-in: e6108047 user: dan tags: trunk
17:03
Fix a typo inside an assert() statement introduced by the previous commit. Closed-Leaf check-in: e3357728 user: dan tags: exp-busy-snapshot-fix
15:46
In wal mode, if a "BEGIN EXCLUSIVE" command (or any other command that upgrades from no transaction directly to a write transaction) hits an SQLITE_BUSY_SNAPSHOT error, change the error code to SQLITE_BUSY to indicate to the caller that the condition may be transient. check-in: 221ff63e user: dan tags: exp-busy-snapshot-fix
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/btree.c.

  3426   3426       }
  3427   3427     }else if( rc==SQLITE_BUSY_SNAPSHOT && pBt->inTransaction==TRANS_NONE ){
  3428   3428       /* Even if there was no transaction opened when this function was
  3429   3429       ** called, a race condition may cause an SQLITE_BUSY_SNAPSHOT error
  3430   3430       ** in wal mode (since the code above opens a read-transaction and then
  3431   3431       ** upgrades it to a write-transaction - it does not take the write lock
  3432   3432       ** atomically). In this case change the error code to SQLITE_BUSY.  */
  3433         -    assert( wrFlag );
         3433  +    assert( wrflag );
  3434   3434       rc = SQLITE_BUSY;
  3435   3435     }
  3436   3436   
  3437   3437   
  3438   3438   trans_begun:
  3439   3439     if( rc==SQLITE_OK ){
  3440   3440       if( pSchemaVersion ){