Index: src/vdbesort.c
==================================================================
--- src/vdbesort.c
+++ src/vdbesort.c
@@ -734,14 +734,14 @@
 static int vdbeSorterJoinAll(VdbeSorter *pSorter, int rcin){
   int rc = rcin;
   int i;
   for(i=0; i<pSorter->nTask; i++){
     SortSubtask *pTask = &pSorter->aTask[i];
-    if( pTask->pTask ){
+    if( pTask->pThread ){
       void *pRet;
-      int rc2 = sqlite3ThreadJoin(pTask->pTask, &pRet);
-      pTask->pTask = 0;
+      int rc2 = sqlite3ThreadJoin(pTask->pThread, &pRet);
+      pTask->pThread = 0;
       pTask->bDone = 0;
       if( rc==SQLITE_OK ) rc = rc2;
       if( rc==SQLITE_OK ) rc = SQLITE_PTR_TO_INT(pRet);
     }
   }
@@ -1310,13 +1310,13 @@
     int iTest = (pSorter->iPrev + i + 1) % nWorker;
     pTask = &pSorter->aTask[iTest];
 #if SQLITE_MAX_WORKER_THREADS>0
     if( pTask->bDone ){
       void *pRet;
-      assert( pTask->pTask );
-      rc = sqlite3ThreadJoin(pTask->pTask, &pRet);
-      pTask->pTask = 0;
+      assert( pTask->pThread );
+      rc = sqlite3ThreadJoin(pTask->pThread, &pRet);
+      pTask->pThread = 0;
       pTask->bDone = 0;
       if( rc==SQLITE_OK ){
         rc = SQLITE_PTR_TO_INT(pRet);
       }
     }
@@ -1354,11 +1354,11 @@
           if( pSorter->aMemory==0 ) return SQLITE_NOMEM;
         }else{
           pSorter->nMemory = sqlite3MallocSize(pSorter->aMemory);
         }
       }
-      rc = sqlite3ThreadCreate(&pTask->pTask, vdbeSortSubtaskMain, pCtx);
+      rc = sqlite3ThreadCreate(&pTask->pThread, vdbeSortSubtaskMain, pCtx);
     }else
 #endif
     {
       /* Use the foreground thread for this operation */
       rc = vdbeSorterRunTask(pTask);
@@ -1529,11 +1529,11 @@
         pTask->eWork = SORT_SUBTASK_CONS;
 
 #if SQLITE_MAX_WORKER_THREADS>0
         if( i<(pSorter->nTask-1) ){
           void *pCtx = (void*)pTask;
-          rc = sqlite3ThreadCreate(&pTask->pTask,vdbeSortSubtaskMain,pCtx);
+          rc = sqlite3ThreadCreate(&pTask->pThread, vdbeSortSubtaskMain, pCtx);
         }else
 #endif
         {
           rc = vdbeSorterRunTask(pTask);
         }