From: drh <drh@noemail.net>
Date: Thu, 15 May 2014 16:56:56 +0000 (+0000)
Subject: Use #ifdef to omit code that is not used when SQLITE_MAX_WORKER_THREADS is zero.
X-Git-Tag: version-3.8.7~132^2~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cc375938318a5a68a2fe5e6a79bcc6beb208b38;p=thirdparty%2Fsqlite.git

Use #ifdef to omit code that is not used when SQLITE_MAX_WORKER_THREADS is zero.

FossilOrigin-Name: 2e8d287d4f41d395a488bf65b20e956b0e311177
---

diff --git a/manifest b/manifest
index 0a8a624dbd..2bf8b35c71 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\ssorter,\sonly\suse\slarge\smemory\sallocations\sif\sscratch\smemory\shas\snot\nbeen\sconfigured.\s\sAdd\s#ifdefs\sto\sdisable\sunused\scode\swhen\s\nSQLITE_MAX_WORKER_THREADS\sis\szero.\s\sOther\ssorter\schanges\sin\ssupport\nof\stestability.
-D 2014-05-12T15:30:00.944
+C Use\s#ifdef\sto\somit\scode\sthat\sis\snot\sused\swhen\sSQLITE_MAX_WORKER_THREADS\sis\szero.
+D 2014-05-15T16:56:56.755
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de92112472618cb869d27249966bad1783e4a853
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -289,7 +289,7 @@ F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 F src/vdbeaux.c 44d4d1f5711f71eaf0d624de5c3e4976fe4e180b
 F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
 F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
-F src/vdbesort.c 0daa029978b50d9c1d103d179ac1e2b38d9daa20
+F src/vdbesort.c 0cb40c336c04e2ada936fc4e17a6c6cb885af8c6
 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@ -1175,7 +1175,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
-P 9ac8f1e7115bc50663235adedeb0d3e1234c5740
-R 6fb72f0b0bf6c011a8428254c9753d68
+P d7e2b0d9cb099eda3341bc934bedff9facfe88bd
+R e9a885bf89bf1a3baa55ce358814bd90
 U drh
-Z 8d87c7cf2c9f964aeaecc8906e4a1927
+Z 872834e0bfb672176645b5e47ef04abb
diff --git a/manifest.uuid b/manifest.uuid
index 695d315026..9ae9c294db 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d7e2b0d9cb099eda3341bc934bedff9facfe88bd
\ No newline at end of file
+2e8d287d4f41d395a488bf65b20e956b0e311177
\ No newline at end of file
diff --git a/src/vdbesort.c b/src/vdbesort.c
index 01404e4f12..ef8e7f6349 100644
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -1077,11 +1077,14 @@ static void vdbeIncrFree(IncrMerger *pIncr){
 void sqlite3VdbeSorterReset(sqlite3 *db, VdbeSorter *pSorter){
   int i;
   (void)vdbeSorterJoinAll(pSorter, SQLITE_OK);
+  assert( pSorter->bUseThreads || pSorter->pReader==0 );
+#if SQLITE_MAX_WORKER_THREADS>0
   if( pSorter->pReader ){
     vdbePmaReaderClear(pSorter->pReader);
     sqlite3DbFree(db, pSorter->pReader);
     pSorter->pReader = 0;
   }
+#endif
   vdbeMergeEngineFree(pSorter->pMerger);
   pSorter->pMerger = 0;
   for(i=0; i<pSorter->nTask; i++){