diff --git a/manifest b/manifest index c32b58cc1f..ae4458bea3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Optimizations\son\sthe\sSELECT\scode\sgenerator.\s(CVS\s1926) -D 2004-09-01T03:06:35 +C Work\saround\sa\sbug\sin\sthe\sBorland\sC++\scompiler.\s\sTicket\s#881.\s(CVS\s1927) +D 2004-09-01T16:12:25 F Makefile.in 65a7c43fcaf9a710d62f120b11b6e435eeb4a450 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -28,7 +28,7 @@ F sqlite3.def 84215604aa7b547d75e0f7b437966e7ad18fa8b2 F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a F src/attach.c 0bd4f11da6999665da30625665a4096ba7898de6 F src/auth.c 60db23b98bb94c8b0178180faaf49dc116674217 -F src/btree.c 7437310f8add1709252c755f02bca37e957516a9 +F src/btree.c 598e7eccfa93194851f570c0ea146f6efe098ac3 F src/btree.h 94dfec0a1722d33359b23e7e310f2b64ffedf029 F src/build.c 35275654d9c5ce6c1c0c78e391f85e6915a8a66b F src/date.c edff4aa851eeca8abbc737dc3933a2f0671156ce @@ -246,7 +246,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P 68a712f3728587ee20f6f15900e9826eeeaaa0de -R f53925f0e4c6a8f88635f4df0bffa0ca +P 9c411c3c8dde2061c98513a413ef58c5c2de45af +R 54ca511e52d24afac36ea482ae4bc8ec U drh -Z 2051ba3a1de049c2a1d8955c57b2b831 +Z 888aa66dde2c6dec44c62c3082b0fba4 diff --git a/manifest.uuid b/manifest.uuid index 1542cdc61c..b0ae7163c5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9c411c3c8dde2061c98513a413ef58c5c2de45af \ No newline at end of file +18af6ba580a5ad50a20955bfe2ebce8e30b1d39e \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 0dfd89c46d..75343d1a26 100644 --- a/src/btree.c +++ b/src/btree.c @@ -9,7 +9,7 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id: btree.c,v 1.184 2004/08/31 13:45:11 drh Exp $ +** $Id: btree.c,v 1.185 2004/09/01 16:12:25 drh Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** For a detailed discussion of BTrees, refer to @@ -349,6 +349,12 @@ struct BtCursor { u8 status; /* Set to SQLITE_ABORT if cursors is invalidated */ }; +/* +** Forward declaration +*/ +static int checkReadLocks(Btree*,Pgno,BtCursor*); + + /* ** Read or write a two- and four-byte big-endian integer values. */ @@ -1560,7 +1566,6 @@ int sqlite3BtreeCursor( *ppCur = 0; if( wrFlag ){ - static int checkReadLocks(Btree*,Pgno,BtCursor*); if( pBt->readOnly ){ return SQLITE_READONLY; }