diff --git a/manifest b/manifest index 203ca8b54b..e8448c0a75 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sfile\slegacy.c\swith\sold\sAPIs.\s(CVS\s1456) -D 2004-05-26T00:01:35 +C Minor\scode\sfixes\sin\sbtree.c\sand\spragma.c\sto\shelp\swith\swatcom\sC.\s(CVS\s1457) +D 2004-05-26T00:01:54 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -24,7 +24,7 @@ F sqlite.def fc4f5734786fe4743cfe2aa98eb2da4b089edb5f F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2 F src/attach.c c315c58cb16fd6e913b3bfa6412aedecb4567fa5 F src/auth.c 5c2f0bea4729c98c2be3b69d6b466fc51448fe79 -F src/btree.c 51dfa34da5f42762b228d7360cf3273ee403bce8 +F src/btree.c 6db76fbf63efd6008c5e6cb038ea40f94abffcf7 F src/btree.h b65140b5ae891f30d2a39e64b9f0343225553545 F src/build.c 35cbeb439b49cca5eb5e8a1de010a5194f4523e8 F src/copy.c 3c4ee52cc6ab3dea44ddfa8426c19155b2bbf242 @@ -50,7 +50,7 @@ F src/os_win.h 5d41af24caaef6c13a2d8e2399caa1c57d45c84d F src/pager.c 6ff6b906427d4824099140776cb8768f922f3dc5 F src/pager.h 78a00ac280899bcba1a89dc51585dcae6b7b3253 F src/parse.y 567718866b94d58a6c7681cc45ba7987771d583a -F src/pragma.c 399feca7ce0fc364859a7ecef48795179a33b738 +F src/pragma.c 02b57adda458874eddc2bd71d56d02e496759a97 F src/printf.c ef750e8e2398ca7e8b58be991075f08c6a7f0e53 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3 F src/select.c 867cab23c0577d4ac0510c925a85b8e032cfe139 @@ -203,7 +203,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P 9385ad5ca82c82d9ef699102ca0b53661d02a052 -R c7261e32f74427f74b17e0e0b0e6d6f2 -U danielk1977 -Z db7575fd9fa9fef8fcd2c82fe508a21b +P ae18fcb7ad91096f8029605b54d71ec225f31f32 +R 47dad5a8dd6b54a73599bfb643e19e5f +U drh +Z 5fd7d5705c8bcbb7d653c6f399f44fb3 diff --git a/manifest.uuid b/manifest.uuid index dc1558935e..ab2146946c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ae18fcb7ad91096f8029605b54d71ec225f31f32 \ No newline at end of file +143c502a59e727975f61c8d13b6c5a90dad038f3 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index c253d54de2..ce482fd0d0 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.146 2004/05/22 02:55:23 drh Exp $ +** $Id: btree.c,v 1.147 2004/05/26 00:01:54 drh Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** For a detailed discussion of BTrees, refer to @@ -2399,7 +2399,7 @@ static int fillInCell( int *pnSize /* Write cell size here */ ){ int nPayload; - const void *pSrc; + const u8 *pSrc; int nSrc, n, rc; int spaceLeft; MemPage *pOvfl = 0; diff --git a/src/pragma.c b/src/pragma.c index 2e0f8103a5..1c45aa653b 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to implement the PRAGMA command. ** -** $Id: pragma.c,v 1.29 2004/05/25 23:35:18 danielk1977 Exp $ +** $Id: pragma.c,v 1.30 2004/05/26 00:01:54 drh Exp $ */ #include "sqliteInt.h" #include @@ -295,12 +295,12 @@ void sqlite3Pragma(Parse *pParse, Token *pLeft, Token *pRight, int minusFlag){ { OP_AddImm, -1, 0, 0}, /* 10 */ { OP_Callback, 1, 0, 0} }; + int addr; if( pRight->z==pLeft->z ){ sqlite3VdbeSetNumCols(v, 1); - int addr = sqlite3VdbeAddOpList(v, ArraySize(getSync), getSync); + addr = sqlite3VdbeAddOpList(v, ArraySize(getSync), getSync); sqlite3VdbeChangeP2(v, addr+3, addr+10); }else{ - int addr; int size = db->cache_size; if( size<0 ) size = -size; sqlite3BeginWriteOperation(pParse, 0, 0);