diff options
| author | drh <drh@noemail.net> | 2007-08-22 00:39:19 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2007-08-22 00:39:19 +0000 |
| commit | 86f8c197ddd6972a1bd37cdfcca01a19c7c1aada (patch) | |
| tree | 4d049d45dae245f2d0a168035a6acd2419210d4a /src/main.c | |
| parent | 32bc3f6e01750d6b730efd372952156d7d62b066 (diff) | |
| download | sqlite-86f8c197ddd6972a1bd37cdfcca01a19c7c1aada.tar.gz sqlite-86f8c197ddd6972a1bd37cdfcca01a19c7c1aada.zip | |
Reenable the memory management logic. The quick.test script now runs with
SQLITE_MEMDEBUG and SQLITE_ENABLE_MEMORY_MANAGEMENT. 7 minor errors. (CVS 4265)
FossilOrigin-Name: 1914044b8832041f13b20ead613bd13725425d7a
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c index 69e49752b..1793911a5 100644 --- a/src/main.c +++ b/src/main.c @@ -14,7 +14,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id: main.c,v 1.393 2007/08/21 19:33:56 drh Exp $ +** $Id: main.c,v 1.394 2007/08/22 00:39:20 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -771,10 +771,10 @@ const char *sqlite3_errmsg(sqlite3 *db){ return sqlite3ErrStr(SQLITE_NOMEM); } sqlite3_mutex_enter(db->mutex); - assert( !db->mallocFailed ); if( sqlite3SafetyCheck(db) || db->errCode==SQLITE_MISUSE ){ return sqlite3ErrStr(SQLITE_MISUSE); } + assert( !db->mallocFailed ); z = (char*)sqlite3_value_text(db->pErr); if( z==0 ){ z = sqlite3ErrStr(db->errCode); |