From: drh Date: Wed, 6 Mar 2013 01:41:53 +0000 (+0000) Subject: Fix an operator precedence problem on the [1d8086902e] check-in. X-Git-Tag: version-3.7.16~14^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fex-robust-open;p=thirdparty%2Fsqlite.git Fix an operator precedence problem on the [1d8086902e] check-in. FossilOrigin-Name: 4f5f3aebe81c3cbe539db3e33ec38fa3de47e90b --- diff --git a/manifest b/manifest index 4b5b831042..c496616be0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\sexperimental\sbranch\swith\strunk. -D 2013-03-05T16:54:45.725 +C Fix\san\soperator\sprecedence\sproblem\son\sthe\s[1d8086902e]\scheck-in. +D 2013-03-06T01:41:53.549 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -160,7 +160,7 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30 F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 -F src/os_unix.c d8ab3f4bae870ebd8032a08be10501213487c6e1 +F src/os_unix.c f6387eef0cf8f6b808738f4f3aa47e6132af0940 F src/os_win.c f7da4dc0a2545c0a430080380809946ae4d676d6 F src/pager.c 582f8da52d0bd4b43d3bdaeba0ea7702c1f23702 F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0 @@ -1036,7 +1036,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac -P 717863fca6d58828bf9321bc8b169e385ad4263f 1d8086902ee96347491bce5ec04dc92ccd42efa1 -R cdff7116ca1269af949fd381129331e4 -U dan -Z 096a27b1e7348ccd7fb11b376ce2d88a +P 4e6e07a60e543d5d1727cde27ab11e156202a1b8 +R 4624808bc8666139dd43b7c21e0d98ea +U drh +Z 778831793a4a16e588dea29c8ecebc95 diff --git a/manifest.uuid b/manifest.uuid index 7f87da50b6..1f727ac74b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4e6e07a60e543d5d1727cde27ab11e156202a1b8 \ No newline at end of file +4f5f3aebe81c3cbe539db3e33ec38fa3de47e90b \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index ee13ae8ad7..8f094bdc19 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -554,7 +554,7 @@ static int robust_open(const char *z, int f, mode_t m){ struct stat statbuf; if( osFstat(fd, &statbuf)==0 && statbuf.st_size==0 - && statbuf.st_mode&0777!=m + && (statbuf.st_mode&0777)!=m ){ osFchmod(fd, m); }