Fix minor errors causing compilation to fail with SQLITE_MAX_WORKER_THREADS set to...

FossilOrigin-Name: 0561272abf357a2f4709f6c02866e570d19cd344

diff --git a/manifest b/manifest
index a1d8fa4b087f6325dc482a4c666154528ea1016a..2e20875ba95e174fdcb90893ff11d45b7ff3d249 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refactor\slocal\sobject\sand\smethod\snames\sin\svdbesort.c\sso\sthat\stheir\snames\nmore\sclosely\sreflect\stheir\sactual\suse.
-D 2014-04-03T02:54:27.677
+C Fix\sminor\serrors\scausing\scompilation\sto\sfail\swith\sSQLITE_MAX_WORKER_THREADS\sset\sto\sa\svalue\sgreater\sthan\szero.
+D 2014-04-03T14:29:08.251
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -286,7 +286,7 @@ F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 F src/vdbeaux.c d8dc38965507a34b0e150c0d7fc82b02f8cf25ea
 F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
 F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
-F src/vdbesort.c a4e349ff62196dc3d98eacb0f9281e2468c44cab
+F src/vdbesort.c 5e7ed44bb4f2af809b6d229ae00f97825efab89a
 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@ -1161,7 +1161,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P eef60f1bf54fcdc7b32f96ebb87a9a0bf0776e8b
-R 0d1e8a8cee97e3fb0928896d3dcac011
-U drh
-Z 523d07a773fda305bad8a184629c5049
+P d284e30eb1db144965fa85566e4234e30464350b
+R 45d899d78ea7a6cd4a92080d8bb33ecf
+U dan
+Z 013157fb51930f7eb005a94358375580

diff --git a/manifest.uuid b/manifest.uuid
index 0af0f908902bdc8d241b4724f8d3e4fcb3218980..9cf01bf6ace8831abc5e7e95906cccfb4b1159aa 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d284e30eb1db144965fa85566e4234e30464350b
\ No newline at end of file
+0561272abf357a2f4709f6c02866e570d19cd344
\ No newline at end of file

diff --git a/src/vdbesort.c b/src/vdbesort.c
index 6b94ddfebff9df16a18364f1543c97c261f05423..78f5183b5d113b697c49e252c23c9d5444174d91 100644 (file)
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -736,10 +736,10 @@ static int vdbeSorterJoinAll(VdbeSorter *pSorter, int 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);
@@ -1312,9 +1312,9 @@ static int vdbeSorterFlushPMA(sqlite3 *db, const VdbeCursor *pCsr, int bFg){
 #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);
@@ -1356,7 +1356,7 @@ static int vdbeSorterFlushPMA(sqlite3 *db, const VdbeCursor *pCsr, int bFg){
           pSorter->nMemory = sqlite3MallocSize(pSorter->aMemory);
         }
       }
-      rc = sqlite3ThreadCreate(&pTask->pTask, vdbeSortSubtaskMain, pCtx);
+      rc = sqlite3ThreadCreate(&pTask->pThread, vdbeSortSubtaskMain, pCtx);
     }else
 #endif
     {
@@ -1531,7 +1531,7 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, const VdbeCursor *pCsr, int *pbEof){
 #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
         {