From: drh Date: Fri, 12 Apr 2013 13:53:50 +0000 (+0000) Subject: Fix the xCheckReservedLock() method on the windows VFS so that it cannot return a... X-Git-Tag: version-3.13.0~148^2~203 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bc8bfcb05ab15cac3c84b137b572350beb4de65;p=thirdparty%2Fsqlite.git Fix the xCheckReservedLock() method on the windows VFS so that it cannot return a false positive when two or more processes use it at the same time on the same file. Ticket [7ff3120e4fa54abb55]. Update to version 3.7.16.2. FossilOrigin-Name: 67b3c0efa7d5e0cb7cc0fc7606ab3f26ea5419fd --- 8bc8bfcb05ab15cac3c84b137b572350beb4de65 diff --cc manifest index 97541883c8,86f1645ca1..cad0902a3d --- a/manifest +++ b/manifest @@@ -1,12 -1,12 +1,12 @@@ - C Correct\sminor\stypo\sin\stwo\sregular\sexpressions. - D 2013-04-11T00:45:28.510 -C Version\s3.7.16.2 -D 2013-04-12T11:52:43.886 ++C Fix\sthe\sxCheckReservedLock()\smethod\son\sthe\swindows\sVFS\sso\sthat\sit\scannot\sreturn\sa\sfalse\spositive\swhen\stwo\sor\smore\sprocesses\suse\sit\sat\sthe\ssame\stime\son\sthe\ssame\sfile.\sTicket\s[7ff3120e4fa54abb55].\s\sUpdate\sto\sversion\s3.7.16.2. ++D 2013-04-12T13:53:50.045 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f -F Makefile.in df3e48659d80e1b7765785d8d66c86b320f72cc7 +F Makefile.in 174bfca74e57f38699e3412a984f6b38106750fa F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 -F Makefile.msc 0c1abc21c8deefc88e8a32ad6a07e5f96e158761 +F Makefile.msc 0ad7d4278a3b7e0c56d3ca7cc607b34acc1df516 F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 - F VERSION 05604ccde96fe1b37f922eddbdcb5654308261db + F VERSION 0dee4d2e0c64791ff0085277424fb5c07d79fc9a F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 @@@ -15,7 -15,7 +15,7 @@@ F art/sqlite370.jpg d512473dae7e378a67e F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977 F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55 - F configure 95daaa3491af6a63fdd0b99bd78b8b04fb9f8303 x -F configure 1a5f411b3c5053495a161609c274393281db12cc x ++F configure 22aa4520a498ef553e9386921913e498c3c45b56 x F configure.ac 81c43d151d0b0e406be056394cc9ff4cb3fd0444 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1 @@@ -247,16 -235,16 +247,16 @@@ F src/test_wholenumber.c 3d2b9ed1505c40 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12 F src/trigger.c cd95ac64efa60e39faf9b5597443192ff27a22fa -F src/update.c a2a5631d618cbe240fc83725fa9e95c56ae0084c +F src/update.c beef58f5fd66153ac9cdf6e9f6551f09ee68976c F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f - F src/util.c 550f2b6a5c0085153a4d00462719fb17ee242792 + F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9 F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3 -F src/vdbe.c 1d56617d816098a41bdbe73536a67dcdefad52bd -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d -F src/vdbeInt.h 3bb8531d6768379f086e1576b31d52331f6eb982 -F src/vdbeapi.c 56f9ad6329d093f54b5dd321a2b4a643f89a6cb6 -F src/vdbeaux.c ecb43014bcd3019e5aa2b5561e5c3a447f007a08 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb +F src/vdbe.c fee31825a8e287bb6ed2dacc33fb276c5e2ab7a5 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683 +F src/vdbeInt.h bd76014fa5051b9f33223e4cc6a76d00ce031944 +F src/vdbeapi.c 8245e8c2cdcf105871a4ccae365d3bd29bfca6d1 +F src/vdbeaux.c 426263e901f19d8fe6bc7124ee5dafc78a2feac3 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381 F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab F src/vdbesort.c 4fad64071ae120c25f39dcac572d716b9cadeb7f F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835 @@@ -1054,7 -1041,10 +1054,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac - P 53f5be74327162a2bd25a91eaf7c91b126294727 - R 135af717c2fd2e17b5a8c6896e5cb14f - U mistachkin - Z b1ea33e149cde9618b3874273f57fbc4 -P 86f26f9152988e47d7e1cfcca9eedf5e6265a225 -R c66fa2b9be1b92880a65bec11685cd9d -T +bgcolor * #d0c0ff -T +sym-release * -T +sym-version-3.7.16.2 * ++P f1eed92b7b0ef4ee22a11d8bb4f9a572b56ce019 cbea02d93865ce0e06789db95fd9168ebac970c7 ++R 0efc127a79bcb850db00f0f48c643639 + U drh -Z daf56eb23d2f90e92e4839bc9c04cfb7 ++Z a385c575da3bc80f399700b4e6cb7b5b diff --cc manifest.uuid index 642c124c19,af054d5354..4581bba7a0 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - f1eed92b7b0ef4ee22a11d8bb4f9a572b56ce019 -cbea02d93865ce0e06789db95fd9168ebac970c7 ++67b3c0efa7d5e0cb7cc0fc7606ab3f26ea5419fd