diff --git a/manifest b/manifest index f2dc870c73..56f396e2c0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\ssome\scomments\sfor\ssqlite3_bind_*()\sAPIs.\s(CVS\s1411) -D 2004-05-20T01:40:19 +C VACUUM\sworks\sagain.\s(CVS\s1412) +D 2004-05-20T02:01:27 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -23,7 +23,7 @@ F sqlite.def fc4f5734786fe4743cfe2aa98eb2da4b089edb5f F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2 F src/attach.c c315c58cb16fd6e913b3bfa6412aedecb4567fa5 F src/auth.c 5c2f0bea4729c98c2be3b69d6b466fc51448fe79 -F src/btree.c b13a0e8b490fec76d4d2d6dedd01ba9232992dee +F src/btree.c 7abf1261c204e23aeeef12ec1bf75f5eca57d469 F src/btree.h b65140b5ae891f30d2a39e64b9f0343225553545 F src/btree_rb.c 9d7973e266ee6f9c61ce592f68742ce9cd5b10e5 F src/build.c 84a9b37700a18db370b9dbb77f1636df5cdf0290 @@ -120,7 +120,7 @@ F test/pager2.test 7ff175a28484fd324df9315dfe35f6fb159910ec F test/pragma.test 06c4e51998dd68115ef7a60abeeff7accf198f83 F test/printf.test 46b3d07d59d871d0831b4a657f6dfcafe0574850 F test/progress.test 701b6115c2613128ececdfe1398a1bd0e1a4cfb3 x -F test/quick.test b16e2c2e5ccf52af0e8b53ad3cda37fe320ee558 +F test/quick.test cbd8ee836d1e2e9e61e526508fb61e3c4018fcf7 F test/quote.test 08f23385c685d3dc7914ec760d492cacea7f6e3d F test/rowid.test 863e6e75878cccf03d166fe52023f20e09508683 F test/select1.test 3bfcccd2eadcddbb07f1f5da6550aee8484ea4fb @@ -193,7 +193,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P e8f980d842fcd793552acd32708db55c8f014634 -R ff1d476628b978b3ce61cabdfeaf9500 -U danielk1977 -Z 9e5c0dffac260fbbd261d4d8a7cf1b3b +P 46b0942239dde9982abaaa7f77d5cf8375eb4209 +R edbaa540380795e64aea48f7af64d6d8 +U drh +Z f1811767ec20f90795abc445172ab0b2 diff --git a/manifest.uuid b/manifest.uuid index f81f177b7d..bac4c49a7b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -46b0942239dde9982abaaa7f77d5cf8375eb4209 \ No newline at end of file +c4e1d02ffded1421c09b0c8e45954e69f3583297 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 658eb0024d..8ee854e354 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.143 2004/05/18 12:50:17 drh Exp $ +** $Id: btree.c,v 1.144 2004/05/20 02:01:27 drh Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** For a detailed discussion of BTrees, refer to @@ -4138,8 +4138,8 @@ int sqlite3BtreeCopyFile(Btree *pBtTo, Btree *pBtFrom){ if( !pBtTo->inTrans || !pBtFrom->inTrans ) return SQLITE_ERROR; if( pBtTo->pCursor ) return SQLITE_BUSY; - memcpy(pBtTo->pPage1, pBtFrom->pPage1, pBtFrom->usableSize); - rc = sqlite3pager_overwrite(pBtTo->pPager, 1, pBtFrom->pPage1); + memcpy(pBtTo->pPage1->aData, pBtFrom->pPage1->aData, pBtFrom->usableSize); + rc = sqlite3pager_overwrite(pBtTo->pPager, 1, pBtFrom->pPage1->aData); nToPage = sqlite3pager_pagecount(pBtTo->pPager); nPage = sqlite3pager_pagecount(pBtFrom->pPager); for(i=2; rc==SQLITE_OK && i<=nPage; i++){ diff --git a/test/quick.test b/test/quick.test index 9b57b572fa..ed2d45520f 100644 --- a/test/quick.test +++ b/test/quick.test @@ -10,7 +10,7 @@ #*********************************************************************** # This file runs all tests. # -# $Id: quick.test,v 1.15 2004/05/19 21:09:32 drh Exp $ +# $Id: quick.test,v 1.16 2004/05/20 02:01:27 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -32,7 +32,6 @@ lappend EXCLUDE interrupt.test ;# assert() fails in btree lappend EXCLUDE ioerr.test ;# seg-faults (?) lappend EXCLUDE memdb.test ;# fails - malformed database lappend EXCLUDE misc3.test ;# seg-faults (due to VACUUM?) -lappend EXCLUDE vacuum.test ;# seg-fault lappend EXCLUDE printf.test ;# sqlite3_XX vs sqlite_XX problem lappend EXCLUDE auth.test ;# Cannot attach empty databases.