database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Minor fixes so that builds with SQLITE_MAX_WORKER_THREADS=0 work.

Browse Source 
FossilOrigin-Name: e400bbbf26cdfe88f6cb231e96cdcddb9a6bcc0f
This commit is contained in:
dan
2014-04-14 08:45:32 +00:00
parent be3018c18f
commit 92a20dde1f
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vdbesort.c
View File

@@ -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 ){