/ Check-in [18d1b402]
Login

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

Overview
Comment:Fix a broken assert() in vdbesort.c.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | threads
Files: files | file ages | folders
SHA1:18d1b402f2dbe78f1a1113bb356b710e348365ef
User & Date: dan 2014-03-29 10:01:58
Context
2014-03-31
19:57
Add the SQLITE_MAX_WORKER_THREADS compile time option. And the SQLITE_CONFIG_WORKER_THREADS sqlite3_config() switch. check-in: 2774710d user: dan tags: threads
2014-03-29
19:48
Changes to make the multi-threaded sorter sort stably. Closed-Leaf check-in: 83a105c8 user: dan tags: threads-closed
10:01
Fix a broken assert() in vdbesort.c. check-in: 18d1b402 user: dan tags: threads
09:34
Fix a problem in vdbesort.c causing spurious SQLITE_NOMEM errors when using memsys3 or memsys5. check-in: a683c05f user: dan tags: threads
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbesort.c.

  1276   1276         pThread->aListMemory = pSorter->aMemory;
  1277   1277         pSorter->aMemory = aMem;
  1278   1278       }
  1279   1279   
  1280   1280       if( bUseFg==0 ){
  1281   1281         /* Launch a background thread for this operation */
  1282   1282         void *pCtx = (void*)pThread;
  1283         -      assert( pSorter->aMemory==0 || pThread->aListMemory==0 );
         1283  +      assert( pSorter->aMemory==0 || pThread->aListMemory!=0 );
  1284   1284         if( pThread->aListMemory ){
  1285   1285           if( pSorter->aMemory==0 ){
  1286   1286             pSorter->aMemory = sqlite3Malloc(pSorter->nMemory);
  1287   1287             if( pSorter->aMemory==0 ) return SQLITE_NOMEM;
  1288   1288           }else{
  1289   1289             pSorter->nMemory = sqlite3MallocSize(pSorter->aMemory);
  1290   1290           }