From: drh <drh@noemail.net>
Date: Mon, 5 Mar 2018 18:20:35 +0000 (+0000)
Subject: Merge session fixes from trunk.
X-Git-Tag: version-3.23.0~85^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f11120328777a6ac7432672873e4b7520aeff8d0;p=thirdparty%2Fsqlite.git

Merge session fixes from trunk.

FossilOrigin-Name: 99c02aeecf47bfa5be5ce38a7ec20818ea0f9fb960b136184e1cb6f8fb8b70e5
---

f11120328777a6ac7432672873e4b7520aeff8d0
diff --cc manifest
index ad80e19ef4,d4eea35cf9..78794d1cd8
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Allow\sthe\szSchema\sargument\sto\ssqlite3_serialize()\sto\sbe\sNULL\sto\smean\sthe\nmain\sdatabase.
- D 2018-03-01T22:18:26.726
 -C In\ssqlite3_checker,\swrap\sthe\scall\sto\s"SELECT\scheckfreelist()"\sin\sa\ntransaction.
 -D 2018-03-02T20:00:42.454
++C Merge\ssession\sfixes\sfrom\strunk.
++D 2018-03-05T18:20:35.650
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in a2d2fb8d17c39ab5ec52beb27850b903949080848236923f436156b72a958737
 +F Makefile.in 1d5a68043cc4d8a6e45b37e2639b148cdd7973aa75e90ec71e12d55cd95e32c0
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc bf19d3a0eb849bd3b114653b0e455aa5b2799a96f413287a5866013db0e47f30
 +F Makefile.msc 28df1e20dd77b9613ce5b65659a4ab9ab19a1f0d885f1eae2399baf0ebc43f46
  F README.md 1d5342ebda97420f114283e604e5fe99b0da939d63b76d492eabbaae23488276
  F VERSION cdf91ac446255ecf3d8f6d8c3ee40d64123235ae5b3cef29d344e61b45ec3759
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1710,7 -1708,7 +1710,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 c8083de14b54fba1071385f8530d03d5684efd4963fde0f83ddc53ae3118a75b
- R 4b7ab64dd9b0ddcbf834b7f0ea1bb2ba
 -P 044b0b65e716bffeddedbd1b0360c4c332f6d2359167c1d327a5ff96539474cb
 -R 5617c0cb2b4786d2069667d5badd72e3
 -U dan
 -Z c724546c7342e99a479e8d8eca82215b
++P 5b01b9914fb612ceece34f40d45c7eb97c3504fc5a0a5ff0e67120bdee67f6ee 02906e55d73ea3521ad1e6807cffed5c759147f7b2d89efc4add984e53e3ad49
++R c50a0ec911b16056beef7733c1a550bb
 +U drh
- Z fef65347c0470682ba0a8e9f51beb02d
++Z c820d6d723c0d68ddeca86df29314b95
diff --cc manifest.uuid
index a69ed8658a,eb557b9a5b..56f3aebbe7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5b01b9914fb612ceece34f40d45c7eb97c3504fc5a0a5ff0e67120bdee67f6ee
 -02906e55d73ea3521ad1e6807cffed5c759147f7b2d89efc4add984e53e3ad49
++99c02aeecf47bfa5be5ce38a7ec20818ea0f9fb960b136184e1cb6f8fb8b70e5