diff options
| -rw-r--r-- | ext/rtree/rtree.c | 2 | ||||
| -rw-r--r-- | manifest | 16 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/msvc.h | 3 | ||||
| -rw-r--r-- | src/vdbe.c | 4 |
5 files changed, 14 insertions, 13 deletions
diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c index 57b38de03..058dc96a4 100644 --- a/ext/rtree/rtree.c +++ b/ext/rtree/rtree.c @@ -2806,6 +2806,8 @@ static int rtreeUpdate( rtreeReference(pRtree); assert(nData>=1); + cell.iRowid = 0; /* Used only to suppress a compiler warning */ + /* Constraint handling. A write operation on an r-tree table may return ** SQLITE_CONSTRAINT for two reasons: ** @@ -1,5 +1,5 @@ -C Fix\ssome\sharmless\scompiler\swarnings. -D 2015-01-12T18:38:02.224 +C Get\sthings\scompiling\scleanly\swith\sMSVC\sand\sW4. +D 2015-01-12T18:52:41.112 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 33a180534a9ba2cf80f5f87e8288c26423d0a8d1 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -124,7 +124,7 @@ F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95 F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 -F ext/rtree/rtree.c a03ebd2480a1a4969cb363bb696d9d911e5a6ecd +F ext/rtree/rtree.c b61e9eab7229a443d0d2029da7624299e19301a2 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e F ext/rtree/rtree1.test 541bbcab74613907fea08b2ecdcdd5b7aa724cc9 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba @@ -203,7 +203,7 @@ F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3 F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534 F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85 -F src/msvc.h f9a7b17a5fbc4ddaca0339128e56aed20256d309 +F src/msvc.h 546453caaf5227521f1fb87a5033b37e00675608 F src/mutex.c 19bf9acba69ca2f367c3761080f8a9f0cf4670a8 F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85 F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1 @@ -292,7 +292,7 @@ F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73 F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c -F src/vdbe.c 1a9e671c9cfc259e4d2affc71f7df4a4c00a842c +F src/vdbe.c ddfc977981cd6324668aa6b114045eb1c677421a F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3 F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78 F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71 @@ -1236,7 +1236,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 43b6b4cc051e5a801a992c56d2c82abcdcf45cec -R bba3af3a356e680f16cb17ee14d2767c +P 2b8eecbfe7935d3d9826fbcd473dd3a49138ad11 +R 23426bb53239eb240dd8df9d0d219aeb U mistachkin -Z d67b74d2cb1318ffa320cad7c97c91ba +Z 96c406dd077f9e953d8ddb5aba51e0dd diff --git a/manifest.uuid b/manifest.uuid index 6c016889c..9fb5a9bb7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2b8eecbfe7935d3d9826fbcd473dd3a49138ad11
\ No newline at end of file +c8725fa5fa361959b0f0a3fb36f204905d6f0ae9
\ No newline at end of file diff --git a/src/msvc.h b/src/msvc.h index c14437d1e..85951c846 100644 --- a/src/msvc.h +++ b/src/msvc.h @@ -20,8 +20,7 @@ #pragma warning(disable : 4127) #pragma warning(disable : 4232) #pragma warning(disable : 4244) -/* #pragma warning(disable : 4701) */ #pragma warning(disable : 4706) -#endif +#endif /* defined(_MSC_VER) */ #endif /* _MSVC_H_ */ diff --git a/src/vdbe.c b/src/vdbe.c index 3dac74dfd..1e0ff96af 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -3823,8 +3823,8 @@ case OP_Found: { /* jump, in3 */ /* For the OP_NoConflict opcode, take the jump if any of the ** input fields are NULL, since any key with a NULL will not ** conflict */ - for(ii=0; ii<r.nField; ii++){ - if( r.aMem[ii].flags & MEM_Null ){ + for(ii=0; ii<pIdxKey->nField; ii++){ + if( pIdxKey->aMem[ii].flags & MEM_Null ){ pc = pOp->p2 - 1; VdbeBranchTaken(1,2); break; } |