/ Check-in [31f54d7b]
Login

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

Overview
Comment:Add an assert() to check that the database mutex is held in sqlite3BtreeLeave().
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 31f54d7b0798e70da6a60b8ea3c5d9e35dce164c
User & Date: dan 2015-03-19 15:04:23
Context
2015-03-19
15:52
Silently ignore any attempt to add a prefix index for prefixes zero bytes in size to an fts3/4 table. Or any prefix index size so large that it overflows a 32-bit signed integer. check-in: ad4b19d2 user: dan tags: trunk
15:04
Add an assert() to check that the database mutex is held in sqlite3BtreeLeave(). check-in: 31f54d7b user: dan tags: trunk
14:48
Fix typo in shell error message. check-in: 775a02d5 user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/btmutex.c.

137
138
139
140
141
142
143

144
145
146
147
148
149
150
}


/*
** Exit the recursive mutex on a Btree.
*/
void sqlite3BtreeLeave(Btree *p){

  if( p->sharable ){
    assert( p->wantToLock>0 );
    p->wantToLock--;
    if( p->wantToLock==0 ){
      unlockBtreeMutex(p);
    }
  }







>







137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
}


/*
** Exit the recursive mutex on a Btree.
*/
void sqlite3BtreeLeave(Btree *p){
  assert( sqlite3_mutex_held(p->db->mutex) );
  if( p->sharable ){
    assert( p->wantToLock>0 );
    p->wantToLock--;
    if( p->wantToLock==0 ){
      unlockBtreeMutex(p);
    }
  }