/ Check-in [cf114c18]
Login

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

Overview
Comment:Remove a comment that is no longer accurate.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | mutexInitIsInitReCheck
Files: files | file ages | folders
SHA1: cf114c18953044bd50c050c662cef256fddcef9c
User & Date: mistachkin 2015-09-14 22:54:52
Context
2015-09-23
16:35
Merge updates from trunk. check-in: 0a75ebd2 user: mistachkin tags: mutexInitIsInitReCheck
2015-09-14
22:54
Remove a comment that is no longer accurate. check-in: cf114c18 user: mistachkin tags: mutexInitIsInitReCheck
22:53
Merge updates from trunk. check-in: 25c15771 user: mistachkin tags: mutexInitIsInitReCheck
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/main.c.

173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
  sqlite3_mutex_enter(pMaster);
  if( sqlite3GlobalConfig.isInit ){
    assert( sqlite3GlobalConfig.isMutexInit );
    assert( sqlite3GlobalConfig.isMallocInit );
    sqlite3_mutex_leave(pMaster);
    return SQLITE_OK;
  }
  sqlite3GlobalConfig.isMutexInit = 1; /* possibly redundant */
  if( !sqlite3GlobalConfig.isMallocInit ){
    rc = sqlite3MallocInit();
  }
  if( rc==SQLITE_OK ){
    sqlite3GlobalConfig.isMallocInit = 1;
    if( !sqlite3GlobalConfig.pInitMutex ){
      sqlite3GlobalConfig.pInitMutex =







|







173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
  sqlite3_mutex_enter(pMaster);
  if( sqlite3GlobalConfig.isInit ){
    assert( sqlite3GlobalConfig.isMutexInit );
    assert( sqlite3GlobalConfig.isMallocInit );
    sqlite3_mutex_leave(pMaster);
    return SQLITE_OK;
  }
  sqlite3GlobalConfig.isMutexInit = 1;
  if( !sqlite3GlobalConfig.isMallocInit ){
    rc = sqlite3MallocInit();
  }
  if( rc==SQLITE_OK ){
    sqlite3GlobalConfig.isMallocInit = 1;
    if( !sqlite3GlobalConfig.pInitMutex ){
      sqlite3GlobalConfig.pInitMutex =