aboutsummaryrefslogtreecommitdiff
path: root/src/where.c
diff options
context:
space:
mode:
authordanielk1977 <danielk1977@noemail.net>2006-01-18 16:51:35 +0000
committerdanielk1977 <danielk1977@noemail.net>2006-01-18 16:51:35 +0000
commit9e12800dec214b7ce95e5d4a16a66e37e65776be (patch)
tree91ef04a67e93512843040f3d9028308869cef678 /src/where.c
parent1de57847f8b9516f0048a991afe711d2add06487 (diff)
downloadsqlite-9e12800dec214b7ce95e5d4a16a66e37e65776be.tar.gz
sqlite-9e12800dec214b7ce95e5d4a16a66e37e65776be.zip
Use a global variable protected by a mutex instead of thread-specific-data to record malloc() failures. (CVS 2972)
FossilOrigin-Name: ac090f2ab3b5a792c2fdf897e10060f263e0d408
Diffstat (limited to 'src/where.c')
-rw-r--r--src/where.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/where.c b/src/where.c
index 9a7e59062..84cf3d1ba 100644
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
** so is applicable. Because this module is responsible for selecting
** indices, you might also think of this module as the "query optimizer".
**
-** $Id: where.c,v 1.198 2006/01/14 08:02:28 danielk1977 Exp $
+** $Id: where.c,v 1.199 2006/01/18 16:51:36 danielk1977 Exp $
*/
#include "sqliteInt.h"
@@ -567,7 +567,7 @@ static void exprAnalyze(
int nPattern;
int isComplete;
- if( sqlite3ThreadDataReadOnly()->mallocFailed ) return;
+ if( sqlite3MallocFailed() ) return;
prereqLeft = exprTableUsage(pMaskSet, pExpr->pLeft);
if( pExpr->op==TK_IN ){
assert( pExpr->pRight==0 );
@@ -1451,7 +1451,7 @@ WhereInfo *sqlite3WhereBegin(
** return value.
*/
pWInfo = sqliteMalloc( sizeof(WhereInfo) + pTabList->nSrc*sizeof(WhereLevel));
- if( sqlite3ThreadDataReadOnly()->mallocFailed ){
+ if( sqlite3MallocFailed() ){
goto whereBeginNoMem;
}
pWInfo->pParse = pParse;
@@ -1475,7 +1475,7 @@ WhereInfo *sqlite3WhereBegin(
createMask(&maskSet, pTabList->a[i].iCursor);
}
exprAnalyzeAll(pTabList, &maskSet, &wc);
- if( sqlite3ThreadDataReadOnly()->mallocFailed ){
+ if( sqlite3MallocFailed() ){
goto whereBeginNoMem;
}