From: drh <drh@noemail.net>
Date: Fri, 5 Dec 2014 20:05:10 +0000 (+0000)
Subject: Merge the fix for the shared-cache KeyInfo cache bug from trunk.
X-Git-Tag: version-3.13.0~148^2~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd2921ec1d885aff6c5ae5725d3d5de588748e41;p=thirdparty%2Fsqlite.git

Merge the fix for the shared-cache KeyInfo cache bug from trunk.

FossilOrigin-Name: 5a73da6a3083926a3dafd28c0604122296dc9184
---

dd2921ec1d885aff6c5ae5725d3d5de588748e41
diff --cc manifest
index fdd0b729ea,dc82a51063..4b4242ebe2
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Import\sfrom\strunk\sthe\sfix\sthe\s"test"\starget\son\sthe\sautoconf\sand\sMSVC\smakefiles\nand\ssome\sminor\scompiler\swarning\sfixes.
- D 2014-12-05T00:41:17.266
 -C Make\ssure\sthe\sWhereTerm\sobjects\sare\sfully\szeroed\swhen\sthey\sare\sallocated.
 -D 2014-12-05T19:50:58.294
++C Merge\sthe\sfix\sfor\sthe\sshared-cache\sKeyInfo\scache\sbug\sfrom\strunk.
++D 2014-12-05T20:05:10.426
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
 +F Makefile.in 0869fe2a3b7853f048a945fd9cdf671a329b7351
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 10720782f88648bf2b5dcedf4c1524b067d43e47
 +F Makefile.msc 212dc90adfad8988134bf3d901a78270d7a9c267
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -212,7 -195,7 +212,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
- F src/main.c 962eac230ec5c619ebccafa498bcfb617af0cc79
 -F src/main.c e50203613fb77e2f28deb51425ee52b3879e85f8
++F src/main.c d13290bb1592cd7651a3b416a99850c652337e32
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -1241,7 -1224,7 +1242,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 34ffa3b3c002b0e87d8382ad76e87dbaec0b2bc6 e9955c0e14d13ba1411f013acb4979958dae2516
- R 4ae9fe307118343dad082c4eb733ef9c
 -P 7ed3346e8c10dbf52fd44ab69900699d4f7ad3fd
 -R 4b33ce7227bf5d27f48a35be658eb882
++P c9f20eb2fbba0868df85ebb98877f9bb969be8a4 fdb667335c2250239a66143aec4235325dec8274
++R 5f307fe542c2e256cd3ca2580b7cd173
  U drh
- Z 9623b2dce920052ac42bbb47ec4723c7
 -Z 1360efaa2c5f7305d23abadc41fbb137
++Z d2fac6b276a39da7118e93eb39e0e62a
diff --cc manifest.uuid
index 5ae151d720,437ab02c1f..708a694e4f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c9f20eb2fbba0868df85ebb98877f9bb969be8a4
 -fdb667335c2250239a66143aec4235325dec8274
++5a73da6a3083926a3dafd28c0604122296dc9184