From: dan <dan@noemail.net>
Date: Mon, 14 Apr 2014 08:45:32 +0000 (+0000)
Subject: Minor fixes so that builds with SQLITE_MAX_WORKER_THREADS=0 work.
X-Git-Tag: version-3.8.7~132^2~75^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92a20dde1f91f5485216dd10b51cc6de99fedd44;p=thirdparty%2Fsqlite.git

Minor fixes so that builds with SQLITE_MAX_WORKER_THREADS=0 work.

FossilOrigin-Name: e400bbbf26cdfe88f6cb231e96cdcddb9a6bcc0f
---

diff --git a/manifest b/manifest
index bb8ef3522e..eb0882e7ed 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\suse\sof\smultiple\sthreads\sin\ssqlite3VdbeSorterRewind().
-D 2014-04-14T07:30:39.899
+C Minor\sfixes\sso\sthat\sbuilds\swith\sSQLITE_MAX_WORKER_THREADS=0\swork.
+D 2014-04-14T08:45:32.394
 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 b047de6a9c89b122ad8649b083c848b6336b91cb
+F src/vdbesort.c 364cb94cf1eaefa1f79d86b7b1e4778c58192e1c
 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@ -1163,7 +1163,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 62c406a042d7246f6df6b943421182a88483b2e3
-R c3e4d1b3a81e551661cfec7b71fa4391
+P e1bdc4b810907cc0e55e0c923c8ebc777068cfe0
+R 15b762d2cb0315f25703d6fa43b514ac
 U dan
-Z 2f53ddd699d6387555ef072104853e10
+Z 8e0f4aca92a8e556e8d49ca399252be9
diff --git a/manifest.uuid b/manifest.uuid
index 1fc2ca4f8c..bd230a5f99 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e1bdc4b810907cc0e55e0c923c8ebc777068cfe0
\ No newline at end of file
+e400bbbf26cdfe88f6cb231e96cdcddb9a6bcc0f
\ No newline at end of file
diff --git a/src/vdbesort.c b/src/vdbesort.c
index 32305ed792..870e4e2e1c 100644
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -1771,6 +1771,7 @@ static int vdbeIncrInit2(PmaReader *pIter, int eMode){
   return rc;
 }
 
+#if SQLITE_MAX_WORKER_THREADS>0
 static void *vdbeIncrInit2Thread(void *pCtx){
   PmaReader *pReader = (PmaReader*)pCtx;
   void *pRet = SQLITE_INT_TO_PTR( vdbeIncrInit2(pReader, INCRINIT2_TASK) );
@@ -1784,6 +1785,7 @@ static int vdbeIncrBgInit2(PmaReader *pIter){
       &pIter->pIncr->thread, vdbeIncrInit2Thread, pCtx
   );
 }
+#endif
 
 /*
 ** Allocate a new MergeEngine object to merge the contents of nPMA level-0
@@ -1948,7 +1950,9 @@ static int vdbePmaReaderIncrInit(VdbeSorter *pSorter, PmaReader *pIter){
       pIter->pIncr = vdbeIncrNew(pLast, pMain);
       if( pIter->pIncr==0 ){
         rc = SQLITE_NOMEM;
-      }else{
+      }
+#if SQLITE_MAX_WORKER_THREADS>0
+      else{
         vdbeIncrSetThreads(pIter->pIncr, pSorter->bUseThreads);
         for(iTask=0; iTask<(pSorter->nTask-1); iTask++){
           IncrMerger *pIncr;
@@ -1965,6 +1969,7 @@ static int vdbePmaReaderIncrInit(VdbeSorter *pSorter, PmaReader *pIter){
           }
         }
       }
+#endif
     }
   }
   if( rc==SQLITE_OK ){