diff options
| author | drh <drh@noemail.net> | 2001-09-23 02:35:53 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2001-09-23 02:35:53 +0000 |
| commit | ecdc7530dda7a793c96df4010313792de4a6390c (patch) | |
| tree | eaef12ba2ead1e93fd05f62f34ba7cb0f0cf39cc /src/util.c | |
| parent | beae319476c5d81e8f399010dc7dc5a2336f0606 (diff) | |
| download | sqlite-ecdc7530dda7a793c96df4010313792de4a6390c.tar.gz sqlite-ecdc7530dda7a793c96df4010313792de4a6390c.zip | |
Fixes to the locking and rollback behavior. (CVS 261)
FossilOrigin-Name: 337b3d3b2a903328d9744c111979909a284b8348
Diffstat (limited to 'src/util.c')
| -rw-r--r-- | src/util.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/util.c b/src/util.c index 02f9443e2..e12c0a9e9 100644 --- a/src/util.c +++ b/src/util.c @@ -14,7 +14,7 @@ ** This file contains functions for allocating memory, comparing ** strings, and stuff like that. ** -** $Id: util.c,v 1.27 2001/09/19 13:22:40 drh Exp $ +** $Id: util.c,v 1.28 2001/09/23 02:35:53 drh Exp $ */ #include "sqliteInt.h" #include <stdarg.h> @@ -973,7 +973,8 @@ const char *sqliteErrStr(int rc){ case SQLITE_INTERNAL: z = "internal SQLite implementation flaw"; break; case SQLITE_PERM: z = "access permission denied"; break; case SQLITE_ABORT: z = "callback requested query abort"; break; - case SQLITE_BUSY: z = "database in use by another process"; break; + case SQLITE_BUSY: z = "database is locked"; break; + case SQLITE_LOCKED: z = "database table is locked"; break; case SQLITE_NOMEM: z = "out of memory"; break; case SQLITE_READONLY: z = "attempt to write a readonly database"; break; case SQLITE_INTERRUPT: z = "interrupted"; break; |