From: dan <dan@noemail.net>
Date: Fri, 11 Jan 2019 15:22:27 +0000 (+0000)
Subject: Merge documentation changes from branch "begin-concurrent" into this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fbegin-concurrent-wal2;p=thirdparty%2Fsqlite.git

Merge documentation changes from branch "begin-concurrent" into this branch.

FossilOrigin-Name: 41e742bd0f94894b096b30474fb548f58951756d1ea47d0afb717a54802888f4
---

d55e8f5ff0b1594b0c06fda8cd52757fea44d1d3
diff --cc manifest
index 089e74eaed,50c4c0866b..1cc42b51e6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\swal2\schanges\s(documentation\sonly)\sinto\sthis\sbranch.
- D 2019-01-11T14:59:24.732
 -C Add\snew\sdocumentation\sfile\sbegin_concurrent.md.
 -D 2019-01-11T15:06:39.819
++C Merge\sdocumentation\schanges\sfrom\sbranch\s"begin-concurrent"\sinto\sthis\sbranch.
++D 2019-01-11T15:22:27.559
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in d8b254f8bb81bab43c340d70d17dc3babab40fcc8a348c8255881f780a45fee6
@@@ -598,8 -597,8 +599,8 @@@ F src/vdbesort.c 90aad5a92608f2dd771c96
  F src/vdbetrace.c 79d6dbbc479267b255a7de8080eee6e729928a0ef93ed9b0bfa5618875b48392
  F src/vtab.c 70188a745dc4e57d26e942681ff4b2912b7c8249ad5de3f60f0677b4337bcfaa
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 2d5771a64354e7a7ef926a38fec8c06193a50fda40cee027c5385c3330abb791
 -F src/wal.h ac2100eeda406a4492b8c183154507532d23ab9d5a8e32e208adfe4f9ea554f9
 +F src/wal.c d1908ffa514275dc6f27c4b27abc6d5a2ce18c89e98dce10925972266b960f37
- F src/wal.h 86a71244ad934135743cb50dd00cd380763ec5dca5b68012ea394731a369b741
++F src/wal.h c1a0f32c170634cf42908f8e978fa6bd8921f7364301fa34606cd171fce883b1
  F src/walker.c fb94aadc9099ff9c6506d0a8b88d51266005bcaa265403f3d7caf732a562eb66
  F src/where.c 981412c27abb9378d3024eae6f3040abd3c16db722f5ef8a7d613141ea2aea78
  F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
@@@ -1824,7 -1809,7 +1825,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P fcb7348ba190e48112a681f704313a733f7a377456e7c1d6845ba34c270d86b6 b495dce153f7f886f3dba09593f29ce2375718bf6508f2cfffd1af8071a995ae
- R 8fe5885e38031bc1cc352b2d1554601c
 -P 5bf212f1a754fde90af0af82dd76f636754829c7372e19df1fd4fa579f0926aa
 -R 7b08b63629f0fa82321f4b409f15d3b0
++P 820ba1cc7e374409f27d0f1e62ed17c9670ce0e1f6e1d39a02fa8d48319745e8 fdbf97e611ed23f86dc0df9d53421fb04226af0d1c7171d55c11acd0dbe935f0
++R 610cbf661872da3534d28d987e52b3ad
  U dan
- Z bc841668ca707a383d27e01ba9dc3dbc
 -Z ca9bd1f59646fbf4e9e98b47096634fe
++Z 9e1b3f1f4c1450011db0f9cc2ebfe96b
diff --cc manifest.uuid
index 59e7fffac5,3c0ded4061..c8e2d6290f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 820ba1cc7e374409f27d0f1e62ed17c9670ce0e1f6e1d39a02fa8d48319745e8
 -fdbf97e611ed23f86dc0df9d53421fb04226af0d1c7171d55c11acd0dbe935f0
++41e742bd0f94894b096b30474fb548f58951756d1ea47d0afb717a54802888f4
diff --cc src/wal.h
index d026458b66,9878852c76..de86c545bb
--- a/src/wal.h
+++ b/src/wal.h
@@@ -156,11 -155,8 +156,14 @@@ int sqlite3WalFramesize(Wal *pWal)
  /* Return the sqlite3_file object for the WAL file */
  sqlite3_file *sqlite3WalFile(Wal *pWal);
  
 +/* Return the journal mode (WAL or WAL2) used by this Wal object. */
 +int sqlite3WalJournalMode(Wal *pWal);
 +
 +/* sqlite3_wal_info() data */
 +int sqlite3WalInfo(Wal *pWal, u32 *pnPrior, u32 *pnFrame);
 +
+ /* sqlite3_wal_info() data */
+ int sqlite3WalInfo(Wal *pWal, u32 *pnPrior, u32 *pnFrame);
+ 
  #endif /* ifndef SQLITE_OMIT_WAL */
  #endif /* SQLITE_WAL_H */