Remove vestiges of the SQLITE_PROTOCOL error. (CVS 3773)
FossilOrigin-Name: 6dfd4a12a8a03c204505e7a211e179b7dd47e4fb
This commit is contained in:
drh
parent
0e3a6f3f53
commit
4f0ee686c5
18
manifest
18
manifest
@ -1,5 +1,5 @@
|
||||
C Fix\sa\smemory\sleak\sthat\soccurs\safter\sa\smalloc\sfailure\sin\strigger\sparsing.\s(CVS\s3772)
|
||||
D 2007-03-30T20:40:34
|
||||
C Remove\svestiges\sof\sthe\sSQLITE_PROTOCOL\serror.\s(CVS\s3773)
|
||||
D 2007-03-30T20:43:41
|
||||
F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530
|
||||
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
|
||||
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
|
||||
@ -58,7 +58,7 @@ F src/alter.c 2c79ec40f65e33deaf90ca493422c74586e481a3
|
||||
F src/analyze.c 4bbf5ddf9680587c6d4917e02e378b6037be3651
|
||||
F src/attach.c a16ada4a4654a0d126b8223ec9494ebb81bc5c3c
|
||||
F src/auth.c 902f4722661c796b97f007d9606bd7529c02597f
|
||||
F src/btree.c 931d8d6eb3e669d6e42305dce3f196bf071a53b6
|
||||
F src/btree.c ef4a874b7b45dbfd26753088084594c39f3a1703
|
||||
F src/btree.h 9b2cc0d113c0bc2d37d244b9a394d56948c9acbf
|
||||
F src/build.c ad3374b5409554e504300f77e1fbc6b4c106a57f
|
||||
F src/callback.c 31d22b4919c7645cbcbb1591ce2453e8c677c558
|
||||
@ -73,7 +73,7 @@ F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
|
||||
F src/insert.c aa61e77807becb8b6c3ffcf53be98d20b0e6f107
|
||||
F src/legacy.c 2631df6a861f830d6b1c0fe92b9fdd745b2c0cd6
|
||||
F src/loadext.c 146fb9b9dc6133e763888d710205c32ebf8eeca2
|
||||
F src/main.c e9ea17d6f16f658bf987dc660309d44771725e63
|
||||
F src/main.c a02581f5076a49f18f67b00fdc4c7ae338adc679
|
||||
F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
|
||||
F src/os.c 5a194b9b9a10dc66543d4ca22bc0db40c5cc5ef1
|
||||
F src/os.h 506acdfd0a63802434ceacdbfd7c006e5d90fc53
|
||||
@ -86,7 +86,7 @@ F src/os_unix.c 4291be23eec73d1ec04010ae702364b781b5f773
|
||||
F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
|
||||
F src/os_win.c c3a8403ea28bbb89d6507fa984c5919bd3fe7539
|
||||
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
|
||||
F src/pager.c 15118c2b519e4969e77d356b9d4ed6ca5839b196
|
||||
F src/pager.c 70de94d2681ea8f677fead0e21fcc39efb6bebb5
|
||||
F src/pager.h e79a24cf200b8771366217f5bca414f5b7823f42
|
||||
F src/parse.y 207ab04273ae13aa4a729b96008d294d5f334ab3
|
||||
F src/pragma.c 3b992b5b2640d6ae25cef05aa6a42cd1d6c43234
|
||||
@ -96,7 +96,7 @@ F src/random.c 6119474a6f6917f708c1dee25b9a8e519a620e88
|
||||
F src/select.c 30af458c6a0a4a283c67b56c70ff0712b67d42ae
|
||||
F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
|
||||
F src/shell.c 3ae4654560e91220a95738a73d135d91d937cda1
|
||||
F src/sqlite.h.in 02d1159bc8f7387008df9766c79038fce8a9d3a7
|
||||
F src/sqlite.h.in e429f66f9245c7f8675db24b230c950b8672ad1c
|
||||
F src/sqlite3ext.h 7d0d363ea7327e817ef0dfe1b7eee1f171b72890
|
||||
F src/sqliteInt.h c8d0e5ce27a862836de70fc3eadc1e65cea7e3d8
|
||||
F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06
|
||||
@ -447,7 +447,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
|
||||
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
|
||||
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
|
||||
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
|
||||
P 28c7ed1eb799203a569cdae97da974b347f39579
|
||||
R a0905c32cd90b0b80a1bc1360611ccd5
|
||||
P 407a85e69b7a1229218a5ce9a9e31255c7070294
|
||||
R 8cc4fbe4ed28e5ec8da4461ea49f7b7b
|
||||
U drh
|
||||
Z bf54325597d09c764d008fa62cbdee79
|
||||
Z 50a277b3c966fe2fc239035aa22b6aaf
|
||||
|
||||
@ -1 +1 @@
|
||||
407a85e69b7a1229218a5ce9a9e31255c7070294
|
||||
6dfd4a12a8a03c204505e7a211e179b7dd47e4fb
|
||||
@ -9,7 +9,7 @@
|
||||
** May you share freely, never taking more than you give.
|
||||
**
|
||||
*************************************************************************
|
||||
** $Id: btree.c,v 1.347 2007/03/30 14:06:34 drh Exp $
|
||||
** $Id: btree.c,v 1.348 2007/03/30 20:43:41 drh Exp $
|
||||
**
|
||||
** This file implements a external (disk-based) database using BTrees.
|
||||
** For a detailed discussion of BTrees, refer to
|
||||
@ -1840,8 +1840,7 @@ int sqlite3BtreeGetAutoVacuum(Btree *p){
|
||||
** SQLITE_OK is returned on success. If the file is not a
|
||||
** well-formed database file, then SQLITE_CORRUPT is returned.
|
||||
** SQLITE_BUSY is returned if the database is locked. SQLITE_NOMEM
|
||||
** is returned if we run out of memory. SQLITE_PROTOCOL is returned
|
||||
** if there is a locking protocol violation.
|
||||
** is returned if we run out of memory.
|
||||
*/
|
||||
static int lockBtree(BtShared *pBt){
|
||||
int rc, pageSize;
|
||||
|
||||
@ -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.365 2007/03/30 11:29:32 drh Exp $
|
||||
** $Id: main.c,v 1.366 2007/03/30 20:43:42 drh Exp $
|
||||
*/
|
||||
#include "sqliteInt.h"
|
||||
#include "os.h"
|
||||
@ -260,7 +260,6 @@ const char *sqlite3ErrStr(int rc){
|
||||
case SQLITE_CORRUPT: z = "database disk image is malformed"; break;
|
||||
case SQLITE_FULL: z = "database or disk is full"; break;
|
||||
case SQLITE_CANTOPEN: z = "unable to open database file"; break;
|
||||
case SQLITE_PROTOCOL: z = "database locking protocol failure"; break;
|
||||
case SQLITE_EMPTY: z = "table contains no data"; break;
|
||||
case SQLITE_SCHEMA: z = "database schema has changed"; break;
|
||||
case SQLITE_CONSTRAINT: z = "constraint failed"; break;
|
||||
|
||||
11
src/pager.c
11
src/pager.c
@ -18,7 +18,7 @@
|
||||
** file simultaneously, or one process from reading the database while
|
||||
** another is writing.
|
||||
**
|
||||
** @(#) $Id: pager.c,v 1.310 2007/03/30 17:18:51 drh Exp $
|
||||
** @(#) $Id: pager.c,v 1.311 2007/03/30 20:43:42 drh Exp $
|
||||
*/
|
||||
#ifndef SQLITE_OMIT_DISKIO
|
||||
#include "sqliteInt.h"
|
||||
@ -215,7 +215,7 @@ struct PgHistory {
|
||||
/*
|
||||
** A open page cache is an instance of the following structure.
|
||||
**
|
||||
** Pager.errCode may be set to SQLITE_IOERR, SQLITE_CORRUPT, SQLITE_PROTOCOL
|
||||
** Pager.errCode may be set to SQLITE_IOERR, SQLITE_CORRUPT, or
|
||||
** or SQLITE_FULL. Once one of the first three errors occurs, it persists
|
||||
** and is returned as the result of every major pager API call. The
|
||||
** SQLITE_FULL return code is slightly different. It persists only until the
|
||||
@ -475,7 +475,7 @@ static u32 retrieve32bits(PgHdr *p, int offset){
|
||||
** second the error-code about to be returned by a pager API function.
|
||||
** The value returned is a copy of the second argument to this function.
|
||||
**
|
||||
** If the second argument is SQLITE_IOERR, SQLITE_CORRUPT or SQLITE_PROTOCOL,
|
||||
** If the second argument is SQLITE_IOERR, SQLITE_CORRUPT, or SQLITE_FULL
|
||||
** the error becomes persistent. All subsequent API calls on this Pager
|
||||
** will immediately return the same error code.
|
||||
*/
|
||||
@ -485,8 +485,7 @@ static int pager_error(Pager *pPager, int rc){
|
||||
if(
|
||||
rc2==SQLITE_FULL ||
|
||||
rc2==SQLITE_IOERR ||
|
||||
rc2==SQLITE_CORRUPT ||
|
||||
rc2==SQLITE_PROTOCOL
|
||||
rc2==SQLITE_CORRUPT
|
||||
){
|
||||
pPager->errCode = rc;
|
||||
}
|
||||
@ -3790,7 +3789,7 @@ int sqlite3PagerCommitPhaseTwo(Pager *pPager){
|
||||
** The journal is deleted.
|
||||
**
|
||||
** This routine cannot fail unless some other process is not following
|
||||
** the correct locking protocol (SQLITE_PROTOCOL) or unless some other
|
||||
** the correct locking protocol or unless some other
|
||||
** process is writing trash into the journal file (SQLITE_CORRUPT) or
|
||||
** unless a prior malloc() failed (SQLITE_NOMEM). Appropriate error
|
||||
** codes are returned for all these occasions. Otherwise,
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
** This header file defines the interface that the SQLite library
|
||||
** presents to client programs.
|
||||
**
|
||||
** @(#) $Id: sqlite.h.in,v 1.200 2007/03/28 13:07:41 drh Exp $
|
||||
** @(#) $Id: sqlite.h.in,v 1.201 2007/03/30 20:43:42 drh Exp $
|
||||
*/
|
||||
#ifndef _SQLITE3_H_
|
||||
#define _SQLITE3_H_
|
||||
@ -182,7 +182,7 @@ int sqlite3_exec(
|
||||
#define SQLITE_NOTFOUND 12 /* NOT USED. Table or record not found */
|
||||
#define SQLITE_FULL 13 /* Insertion failed because database is full */
|
||||
#define SQLITE_CANTOPEN 14 /* Unable to open the database file */
|
||||
#define SQLITE_PROTOCOL 15 /* Database lock protocol error */
|
||||
#define SQLITE_PROTOCOL 15 /* NOT USED. Database lock protocol error */
|
||||
#define SQLITE_EMPTY 16 /* Database is empty */
|
||||
#define SQLITE_SCHEMA 17 /* The database schema changed */
|
||||
#define SQLITE_TOOBIG 18 /* NOT USED. Too much data for one row */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user