diff --git a/manifest b/manifest index 927bd9ef71..13d580b533 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Change\sthe\sname\sof\sthe\s"tAttachMask"\sdatatype\sto\s"yDbMask". -D 2011-04-02T20:01:02.621 +C Fix\stypos\sin\scomments.\s\sNo\schanges\sto\scode. +D 2011-04-03T02:41:00.238 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -120,10 +120,10 @@ F src/attach.c 438ea6f6b5d5961c1f49b737f2ce0f14ce7c6877 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34 F src/backup.c 537f89c7ef5021cb580f31f782e556ffffcb2ed1 F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef -F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff -F src/btree.c 2b9c81ff64da339a67dda4f94c0d763627be0b67 +F src/btmutex.c 5ba4ca0216bd9406eccbf50aaf35fef6912c4e2c +F src/btree.c 107723ed4f9bdb55213ba6164c30c49af75f4bf9 F src/btree.h 8d36f774ec4b1d0027b8966f8c03d9a72a518c14 -F src/btreeInt.h 20f73dc93b1eeb83afd7259fbc6bd7dcf2df7fe4 +F src/btreeInt.h 29ab8a4172f12b04fac34c5a0b76d0df750ddc34 F src/build.c 3a8c6c4b1e16798755d46e699b7fcc12b9f27b2b F src/callback.c 5069f224882cbdccd559f591271d28d7f37745bc F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac @@ -926,7 +926,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 3b91eaaa0b3c25022332ba3d1a5651848fc5d84c -R e5d6d2ab5437a135179f043b3faf09c4 +P 3d6f2e82358c0d8c0ca04e0da20b84fc65c3f7fa +R 1103ef46d2beca5f9008b7e7268f91fc U drh -Z cdbe2872c525d3ae3a361db4be775f20 +Z 2ee794956e08f440e3a2557effd86b8a diff --git a/manifest.uuid b/manifest.uuid index 6c4bffcf25..eb10573089 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3d6f2e82358c0d8c0ca04e0da20b84fc65c3f7fa \ No newline at end of file +28c5f12e98655d5c6167b13e8a15085eca43dd5b \ No newline at end of file diff --git a/src/btmutex.c b/src/btmutex.c index 201291a3e9..d772f4b50f 100644 --- a/src/btmutex.c +++ b/src/btmutex.c @@ -195,7 +195,7 @@ void sqlite3BtreeEnterAll(sqlite3 *db){ if( !p->locked ){ assert( p->wantToLock==1 ); while( p->pPrev ) p = p->pPrev; - /* Reason for ALWAYS: There must be at least on unlocked Btree in + /* Reason for ALWAYS: There must be at least one unlocked Btree in ** the chain. Otherwise the !p->locked test above would have failed */ while( p->locked && ALWAYS(p->pNext) ) p = p->pNext; for(pLater = p->pNext; pLater; pLater=pLater->pNext){ diff --git a/src/btree.c b/src/btree.c index 088c555fc6..d86b9edad1 100644 --- a/src/btree.c +++ b/src/btree.c @@ -7990,7 +7990,7 @@ int sqlite3BtreeIsInBackup(Btree *p){ ** ** Just before the shared-btree is closed, the function passed as the ** xFree argument when the memory allocation was made is invoked on the -** blob of allocated memory. This function should not call sqlite3_free() +** blob of allocated memory. The xFree function should not call sqlite3_free() ** on the memory, the btree layer does that. */ void *sqlite3BtreeSchema(Btree *p, int nBytes, void(*xFree)(void *)){ diff --git a/src/btreeInt.h b/src/btreeInt.h index 0e71195b0a..a645f4fb97 100644 --- a/src/btreeInt.h +++ b/src/btreeInt.h @@ -336,7 +336,7 @@ struct BtLock { ** All fields in this structure are accessed under sqlite3.mutex. ** The pBt pointer itself may not be changed while there exists cursors ** in the referenced BtShared that point back to this Btree since those -** cursors have to do go through this Btree to find their BtShared and +** cursors have to go through this Btree to find their BtShared and ** they often do so without holding sqlite3.mutex. */ struct Btree {