]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Add the SQLITE_FCNTL_JOURNAL_POINTER file control.
authordrh <drh@noemail.net>
Wed, 13 Jan 2016 18:12:44 +0000 (18:12 +0000)
committerdrh <drh@noemail.net>
Wed, 13 Jan 2016 18:12:44 +0000 (18:12 +0000)
FossilOrigin-Name: ad3daa5427672d2d236939ad3285b765f4601801

1  2 
manifest
manifest.uuid
src/wal.c

diff --cc manifest
index 141b5d8f8ef02e90dc8e08f69ee73bb049f2fb07,8ad71efa12ab2b127e898538c6aa2bed4d87ca08..19016057ef93760cf398619a188e98b645e75fa6
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C When\sthe\s[https://www.sqlite.org/queryplanner.html#partialsort|block\ssorting\soptimization]\nis\sused\sin\sa\sscalar\ssubquery,\sbe\ssure\sto\sexit\sthe\sloop\sas\ssoon\sas\sthe\sfirst\nvalid\soutput\srow\sis\sreceived.\s\sFix\sfor\sticket\s[cb3aa0641d9a4].
- D 2016-01-13T17:50:10.253
 -C Add\sdocumentation\sfor\sthe\sSQLITE_FCNTL_JOURNAL_POINTER\sfile-control.
 -D 2016-01-13T18:06:08.461
++C Add\sthe\sSQLITE_FCNTL_JOURNAL_POINTER\sfile\scontrol.
++D 2016-01-13T18:12:44.833
  F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
@@@ -322,14 -317,14 +322,14 @@@ F src/os.c 8fd25588eeba74068d41102d2681
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c 0ca6d8710366fbb01a275160f018334cd347cbda
 +F src/os_unix.c b509b49b40a269e7b75ab511b6e92b2dc9444359
  F src/os_win.c 386fba30419e8458b13209781c2af5590eab2811
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 58d2593612acb6b542de6715b4af397ea1fa0a35
- F src/pager.h bf25005b4656cd805af43487c3139fca9678d0cc
+ F src/pager.c 5dda328a9a5e9405b6971d62d0d5e3ea85c6195a
+ F src/pager.h 1c2a49143dfba9e69cc8159ef019f472ed8d260b
  F src/parse.y caad1e98edeca6960493d0c60d31b76820dd7776
  F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
 -F src/pcache.h 1ff11adce609ba7de139b6abfabaf9a2bac947b5
 +F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
  F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
  F src/pragma.c f3e7147299ca05ef4304a36f1fd6e002729c72c6
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
@@@ -338,12 -333,12 +338,12 @@@ F src/printf.c af589a27b7d40f6f4f704e9e
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c f8fded11fc443a9f5a73cc5db069d06b34460e2f
 -F src/shell.c ed71dc7679e6f087a3f1ea3f9dae4b0fae7209c3
 +F src/select.c 5b0f2aa9f73ec7b65d1711d485471854d5bad23c
 +F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4
- F src/sqlite.h.in 7d87d71b9a4689c51fa092f48f16590ff71558e3
+ F src/sqlite.h.in 214476a62012e578f42133a9a3b4f97a9aa421a3
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
 -F src/sqliteInt.h 987b46b1d8089155caecbdb14b78850ae1e198ff
 +F src/sqliteInt.h b8ccd34a919e4b6bab8c4164046330002aa9a27a
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -407,17 -402,17 +407,17 @@@ F src/vdbe.c 6572d00eefeaa0b14b325fdf3a
  F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
  F src/vdbeInt.h 42eefa4f9e7432b9968d321b44e48821ec13b189
  F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c 5d8c7c04e0f677033efb1292248a5f9056bbc34c
 +F src/vdbeaux.c f2e6b4fae037db04323be8de7bcd266375746471
  F src/vdbeblob.c fdc4a81605ae7a35ae94a55bd768b66d6be16f15
  F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
 -F src/vdbesort.c a7ec02da4494c59dfd071126dd3726be5a11459d
 +F src/vdbesort.c 0971557e5d3c289e46f56a52aed2197c13251de7
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
 -F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 407f6f3929aeeb360f53a9279342940fe79823e1
 +F src/vxworks.h 974e7d9a98f602d6310d563e1dc4e08f9fc48e47
- F src/wal.c ec116eb4dd257561b0b910b422eb0fc459c82c28
- F src/wal.h 907943dfdef10b583e81906679a347e0ec6f1b1b
++F src/wal.c d21b99fd1458159d0b1ecdccc8ee6ada4fdc4c54
+ F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
 -F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
 -F src/where.c c6d3d2f6af57d574a7365ee2b225a5024f2a6bec
 +F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
 +F src/where.c bb69654f841ae7af0a20cc6fb8f0ac57901c31be
  F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
  F src/wherecode.c dfbfe198e418b01f208b489e088edd230c91a4e7
  F src/whereexpr.c eebba8340c90de73b3d3bbe8c43b84559b8e6e2c
@@@ -1412,8 -1406,7 +1412,8 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P a220e85fe535af5ef2da6ef5fb76abe5a96b5abf
- Q -2a74129a21f9745f1363f844807e2d10201a3f40
- R 413681dc8f5cf3f3175ce236e8b6c97f
 -P a02ace9a746ff02fc1a5969bf13939b568624f93
 -R 0f2c35be54361ea831426d444981cf27
++P cdbb0947f9ce18d6d7e29ffab5ea6a2ee5365fbb 807c5aee2e5e5c01eb33688a199755c345c3664e
++R 9f69ee1beb680eb7753159da9e58457d
++T +closed 807c5aee2e5e5c01eb33688a199755c345c3664e
  U drh
- Z fd0638b6043efd9e3f580e2c8b2c7054
 -Z f9a8aaf9aacff558b761ee4baaf7cc0d
++Z 158e43f82215274b7eb57ca9b5089c6b
diff --cc manifest.uuid
index 1133ef1cfbade4a387082bb0b3eba71e87a2bfd6,a1eb8cfe4f7b5a45a9cbebd1380dc91bfb470f68..92b929ad7598925c807ffbe231e3b2694f4157c3
@@@ -1,1 -1,1 +1,1 @@@
- cdbb0947f9ce18d6d7e29ffab5ea6a2ee5365fbb
 -807c5aee2e5e5c01eb33688a199755c345c3664e
++ad3daa5427672d2d236939ad3285b765f4601801
diff --cc src/wal.c
Simple merge