diff options
Diffstat (limited to 'src/vdbe.c')
| -rw-r--r-- | src/vdbe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vdbe.c b/src/vdbe.c index 8fefed830..04bf97d53 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -43,7 +43,7 @@ ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** -** $Id: vdbe.c,v 1.522 2006/01/10 19:45:49 drh Exp $ +** $Id: vdbe.c,v 1.523 2006/01/11 21:41:22 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -412,7 +412,7 @@ int sqlite3VdbeExec( for(pc=p->pc; rc==SQLITE_OK; pc++){ assert( pc>=0 && pc<p->nOp ); assert( pTos<=&p->aStack[pc] ); - if( sqlite3ThreadData()->mallocFailed ) goto no_mem; + if( sqlite3ThreadDataReadOnly()->mallocFailed ) goto no_mem; #ifdef VDBE_PROFILE origPc = pc; start = hwtime(); @@ -1167,7 +1167,7 @@ case OP_Function: { if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse; (*ctx.pFunc->xFunc)(&ctx, n, apVal); if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse; - if( sqlite3ThreadData()->mallocFailed ) goto no_mem; + if( sqlite3ThreadDataReadOnly()->mallocFailed ) goto no_mem; popStack(&pTos, n); /* If any auxilary data functions have been called by this user function, @@ -4020,7 +4020,7 @@ case OP_ParseSchema: { /* no-push */ sqlite3SafetyOff(db); assert( db->init.busy==0 ); db->init.busy = 1; - assert(0==sqlite3ThreadData()->mallocFailed); + assert(0==sqlite3ThreadDataReadOnly()->mallocFailed); rc = sqlite3_exec(db, zSql, sqlite3InitCallback, &initData, 0); sqliteFree(zSql); db->init.busy = 0; @@ -4616,7 +4616,7 @@ abort_due_to_misuse: */ abort_due_to_error: if( p->zErrMsg==0 ){ - if( sqlite3ThreadData()->mallocFailed ) rc = SQLITE_NOMEM; + if( sqlite3ThreadDataReadOnly()->mallocFailed ) rc = SQLITE_NOMEM; sqlite3SetString(&p->zErrMsg, sqlite3ErrStr(rc), (char*)0); } goto vdbe_halt; |