From: drh Date: Thu, 24 Feb 2011 21:10:00 +0000 (+0000) Subject: Fix a typo in a comment. No changes to code. X-Git-Tag: version-3.7.6~127 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f0857c43721f7813dc7a060399bd8d4114a2e69;p=thirdparty%2Fsqlite.git Fix a typo in a comment. No changes to code. FossilOrigin-Name: af4756184a255f5d8a5cd276bf9f2fc3b38d9169 --- diff --git a/manifest b/manifest index 0cfe7bd298..5fdbf647a8 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Reserve\sa\srange\sof\sbits\sin\sthe\sSQLITE_OPEN_xxxx\sbit\svector\sfor\sfuture\nexpansion. -D 2011-02-23T22:39:23.202 +C Fix\sa\stypo\sin\sa\scomment.\s\sNo\schanges\sto\scode. +D 2011-02-24T21:10:00.747 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -166,7 +166,7 @@ F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f F src/os_os2.c 2e452c9f2ca507623ad351c33a8a8b27849b1863 F src/os_unix.c 33c062c56cd8a7e91b58750bcac2543be525f8de F src/os_win.c 9abdcdd925416d854eabb0996c96debd92abfef5 -F src/pager.c d62dfc1d77168c4415e7f3e23c6dbee4f3fdff60 +F src/pager.c 6aa906b60a59664ba58d3f746164bb010d407ce1 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58 F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa @@ -912,14 +912,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P af9ba2a6d2c37915e799eec52bb827de46afd34d -R 0ae1c418d27eca862f3e3752ba232d01 +P 9b9046546db5b060e37e7ba01c23bb7e9528d861 +R 71700e0b8dcb7b4be4cfe865cf8295cc U drh -Z 39b3a0a85d9d11269094838f6fc13889 +Z 5de97a851d3e5daf13c24fdbe242293d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFNZYyeoxKgR168RlERAhZOAKCGpEBvzInJPpys0/DCiCfVjcNwuwCfe0KD -n8lAxBaTMOc5Wvvsk3jmGCA= -=2S+y +iD8DBQFNZskroxKgR168RlERAqu8AJ9ERkQz+lFEREyW9Q1ySDsl4Ec4gwCeI+8X +d0mn1jsJFDHKj6omB9byn20= +=d8oT -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index b7ba00795b..1fb449aff7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9b9046546db5b060e37e7ba01c23bb7e9528d861 \ No newline at end of file +af4756184a255f5d8a5cd276bf9f2fc3b38d9169 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index 218429838b..da13ddc6fe 100644 --- a/src/pager.c +++ b/src/pager.c @@ -6640,8 +6640,8 @@ static int pagerExclusiveLock(Pager *pPager){ assert( pPager->eLock==SHARED_LOCK || pPager->eLock==EXCLUSIVE_LOCK ); rc = pagerLockDb(pPager, EXCLUSIVE_LOCK); if( rc!=SQLITE_OK ){ - /* If the attempt to grab the pending lock failed, release the - ** exclusive lock that may have been obtained instead. */ + /* If the attempt to grab the exclusive lock failed, release the + ** pending lock that may have been obtained instead. */ pagerUnlockDb(pPager, SHARED_LOCK); }