From: dan Date: Tue, 24 Mar 2015 18:21:41 +0000 (+0000) Subject: Merge the latest trunk changes into this branch. X-Git-Tag: version-3.8.11~252^2~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6da7a0a93da31b48081f50e92d4e7b5ffe19522d;p=thirdparty%2Fsqlite.git Merge the latest trunk changes into this branch. FossilOrigin-Name: 9d9b6c883b4f7d69c615cedfb59a2385aac47b74 --- 6da7a0a93da31b48081f50e92d4e7b5ffe19522d diff --cc manifest index f5a7bb25c8,d1020a6d13..31331069b3 --- a/manifest +++ b/manifest @@@ -1,9 -1,9 +1,9 @@@ - C When\sthe\sOTA\smodule\supdates\sor\sdeletes\sa\srow,\ssave\sonly\sthose\sfields\sthat\sare\spart\sof\san\sindex\sor\sprimary\skey\sto\sthe\sota\supdate\sdatabase. - D 2015-03-24T18:03:29.870 -C Prevent\sa\svirtual\stable\sfrom\sbeing\sdestroyed\swhile\sit\sis\sin\suse.\nAlso:\sreplace\sVdbe.inVtabMethod\swith\ssqlite3.nVDestroy.\s\sSimplify\sthe\nEXPLAIN\soutput\sfor\sP4.pVtab\sto\sonly\sshow\sthe\ssqlite3_vtab\spointer. -D 2015-03-24T16:43:34.928 ++C Merge\sthe\slatest\strunk\schanges\sinto\sthis\sbranch. ++D 2015-03-24T18:21:41.611 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 2f643d6968dfc0b82d2e546a0525a39079f9e928 + F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc 529e61cd9d29a3934758b4b3a0bb649b6c653481 + F Makefile.msc cd626b52ebeec0e2c0dd929243bdd25b0df19a71 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858 F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866 F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60 @@@ -248,16 -230,16 +248,16 @@@ F src/printf.c 8da9a2687a396daa19860f4d F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e - F src/select.c 94e016b6733b1d39a2f4c8d431155b4c2897d907 - F src/shell.c cce82ca26392578a4a1ee927dfe55ea3411c7c92 - F src/sqlite.h.in 95df7ba81981e1de0729ba14d1acbd8c4c6a9697 + F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5 + F src/shell.c 3ae1e53878d2804fe77b8c8f1f6ca287a0e5d80e -F src/sqlite.h.in 2f9606a682af372415ce9d1f244183c5cc8385aa ++F src/sqlite.h.in 8ee1be5d82b093354c418e06e272deeb29f6f5c0 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d - F src/sqliteInt.h fae682c2b4dfbe489b134d74521c41c088f16ab1 + F src/sqliteInt.h bedf15914c09bfb5fe3ec4e3f211a4a6fc42cd33 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 - F src/status.c 81712116e826b0089bb221b018929536b2b5406f + F src/status.c 2e5c86866ff2f30988ce10ddbaa7ba2eaf6d4146 F src/table.c e7a09215315a978057fb42c640f890160dbcc45e - F src/tclsqlite.c fb310fcbb6f8b6c9af0cb3efda805fd04a6faf45 -F src/tclsqlite.c fa72a7c5278662357c105ba7925c1d0972506ff9 ++F src/tclsqlite.c 796b427293e8f0e2769d3956c23df66880fe5535 F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585 F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622 @@@ -311,22 -293,22 +311,22 @@@ F src/update.c 3c4ecc282accf12d39edb8d5 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec - F src/vdbe.c 94cbc2115075b1a562a2a702c29ba48e74f85d34 + F src/vdbe.c bbfede5a8a6908b3ddcd55fdb0b2301288dd4754 F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3 - F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a - F src/vdbeapi.c dac0d0d8009a8aa549cd77d9c29da44c0344f0c4 - F src/vdbeaux.c 97911edb61074b871ec4aa2d6bb779071643dee5 + F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0 + F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75 + F src/vdbeaux.c 413dc496248ac18eb0c19e35e86bb1ffd47b8907 F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90 - F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f - F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2 + F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9 + F src/vdbesort.c 919717d7599fa31d343ec28bffd0f9e91a4ff5f6 F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010 - F src/vtab.c 699f2b8d509cfe379c33dde33827875d5b030e01 + F src/vtab.c 62d49237bd8f3be4863815a39387b0f9897fa5e1 F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb - F src/wal.c 39303f2c9db02a4e422cd8eb2c8760420c6a51fe + F src/wal.c 878c8e1a51cb2ec45c395d26b7d5cd9e1a098e4a F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804 - F src/where.c 67c115096fac6c286ab517939d368cfb12ed0d2d -F src/where.c 85d832efa5ef57de542db7f430b72fecd3af8b38 -F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c ++F src/where.c d336e91893370787853733e177d4dcd4db0a0283 +F src/whereInt.h c1fd5690f91d9551c0c42aa44205248bbd3f7650 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7 @@@ -1261,7 -1246,9 +1265,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P 858de8a5e7925bd96d7b9c0f00bc16358cf3b295 - R 8b55a1f50bfcaf2003b1038217883d03 -P 0ee2d38deb35aefc55395e86984a9a773caf6218 85610bbbc60cb4a6ec856123447fdb2ba948e52f 5ee625b1980f9fab6294d308349dfd9ba960b60b -R 5e10f0a3ec239c969328e02883201fd9 -T +closed 5ee625b1980f9fab6294d308349dfd9ba960b60b -T +closed 85610bbbc60cb4a6ec856123447fdb2ba948e52f -U drh -Z 4c6da71fa5b7897deec943a0cbeb333e ++P 6326fd3249bee267da0172f8afd1e7b3f71521b9 cbeb9a1aed8ce3fb569a7717ad03c7c058b68de6 ++R 1fefa9d8d8de814a981dd2146a1968d2 +U dan - Z 9f88de65f5585dc798e54fceff613e97 ++Z 463c60d6ebf3658e4a29b2b71d7b17dd diff --cc manifest.uuid index c8d380d77e,83e3226971..a32f7fa4ff --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 6326fd3249bee267da0172f8afd1e7b3f71521b9 -cbeb9a1aed8ce3fb569a7717ad03c7c058b68de6 ++9d9b6c883b4f7d69c615cedfb59a2385aac47b74 diff --cc src/sqlite.h.in index 1326a8793b,8e2727f6ae..591700693b --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@@ -945,10 -952,13 +952,16 @@@ struct sqlite3_io_methods ** pointed to by the pArg argument. This capability is used during testing ** and only needs to be supported when SQLITE_TEST is defined. ** -**
  • [[SQLITE_FCNTL_WAL_BLOCK]] ++*
  • [[SQLITE_FCNTL_WAL_BLOCK]] + ** The [SQLITE_FCNTL_WAL_BLOCK] is a signal to the VFS layer that it might + ** be advantageous to block on the next WAL lock if the lock is not immediately + ** available. The WAL subsystem issues this signal during rare + ** circumstances in order to fix a problem with priority inversion. + ** Applications should not use this file-control. + ** +**
  • [[SQLITE_FCNTL_ZIPVFS]] +** The [SQLITE_FCNTL_ZIPVFS] opcode is implemented by zipvfs only. All other +** VFS should return SQLITE_NOTFOUND for this opcode. - ** ** */ #define SQLITE_FCNTL_LOCKSTATE 1 @@@ -973,8 -983,7 +986,9 @@@ #define SQLITE_FCNTL_SYNC 21 #define SQLITE_FCNTL_COMMIT_PHASETWO 22 #define SQLITE_FCNTL_WIN32_SET_HANDLE 23 - #define SQLITE_FCNTL_ZIPVFS 24 - #define SQLITE_FCNTL_OTA 25 + #define SQLITE_FCNTL_WAL_BLOCK 24 ++#define SQLITE_FCNTL_ZIPVFS 25 ++#define SQLITE_FCNTL_OTA 26 /* deprecated names */ #define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE