diff options
| author | drh <drh@noemail.net> | 2010-03-04 00:53:32 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2010-03-04 00:53:32 +0000 |
| commit | a64fa9123ee97975c66f78ebe77e5c99c039ef36 (patch) | |
| tree | 50810d30d0965450821f5f64703e7110d895bb6c /src | |
| parent | ccd0489baada31392da6539855093b75540176bf (diff) | |
| download | sqlite-a64fa9123ee97975c66f78ebe77e5c99c039ef36.tar.gz sqlite-a64fa9123ee97975c66f78ebe77e5c99c039ef36.zip | |
Increase the maximum length of an sqlite3_log() result string. Provide more
details on the statement abort log message.
FossilOrigin-Name: 5322d1df5ba981001d248b7fb2ee02281e4f9723
Diffstat (limited to 'src')
| -rw-r--r-- | src/printf.c | 12 | ||||
| -rw-r--r-- | src/vdbe.c | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/printf.c b/src/printf.c index a0bae3873..ab2cfcc64 100644 --- a/src/printf.c +++ b/src/printf.c @@ -606,9 +606,7 @@ void sqlite3VXPrintf( while( nPad-- ) bufpt[i++] = '0'; length = width; } -#else - length = 0; -#endif /* SQLITE_OMIT_FLOATING_POINT */ +#endif break; case etSIZE: *(va_arg(ap,int*)) = pAccum->nChar; @@ -949,12 +947,8 @@ char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){ ** mutex is held. */ static void renderLogMsg(int iErrCode, const char *zFormat, va_list ap){ - StrAccum acc; /* String accumulator */ -#ifdef SQLITE_SMALL_STACK - char zMsg[150]; /* Complete log message */ -#else - char zMsg[400]; /* Complete log message */ -#endif + StrAccum acc; /* String accumulator */ + char zMsg[SQLITE_PRINT_BUF_SIZE*3]; /* Complete log message */ sqlite3StrAccumInit(&acc, zMsg, sizeof(zMsg), 0); acc.useMalloc = 0; diff --git a/src/vdbe.c b/src/vdbe.c index 7eae49898..c85531fa7 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -5703,7 +5703,9 @@ default: { /* This is really OP_Noop and OP_Explain */ vdbe_error_halt: assert( rc ); p->rc = rc; - sqlite3_log(rc, "prepared statement aborts at %d: [%s]", pc, p->zSql); + testcase( sqlite3GlobalConfig.xLog!=0 ); + sqlite3_log(rc, "statement aborts at %d: [%s] %s", + pc, p->zSql, p->zErrMsg); sqlite3VdbeHalt(p); if( rc==SQLITE_IOERR_NOMEM ) db->mallocFailed = 1; rc = SQLITE_ERROR; |