From: drh <drh@noemail.net>
Date: Fri, 5 Dec 2014 20:16:52 +0000 (+0000)
Subject: Merge the shared-cache KeyInfo fix from trunk.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=417f98ddc9ef616963901c07cb20e630a7f8bc24;p=thirdparty%2Fsqlite.git

Merge the shared-cache KeyInfo fix from trunk.

FossilOrigin-Name: 8a9b43f930de9c789b230909233eee64ad1db93d
---

417f98ddc9ef616963901c07cb20e630a7f8bc24
diff --cc manifest
index 543c3a9c05,dc82a51063..0d314c17dd
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Import\scompiler\swarning\sand\sautoconf\smakefile\sfixes\sfrom\strunk.
- D 2014-12-05T00:49:47.900
 -C Make\ssure\sthe\sWhereTerm\sobjects\sare\sfully\szeroed\swhen\sthey\sare\sallocated.
 -D 2014-12-05T19:50:58.294
++C Merge\sthe\sshared-cache\sKeyInfo\sfix\sfrom\strunk.
++D 2014-12-05T20:16:52.803
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
 +F Makefile.in 4551c03de49c2a4d400016f9007df2528d79e3cd
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 10720782f88648bf2b5dcedf4c1524b067d43e47
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
@@@ -195,10 -192,10 +195,10 @@@ F src/hash.h c8f3c31722cf3277d037139097
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 5b9243a33726008cc4132897d2be371db12a13be
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
- F src/main.c 5855a994c415e29aeb7b97f410468dec61bf2338
 -F src/main.c e50203613fb77e2f28deb51425ee52b3879e85f8
++F src/main.c 0e8100f7758d1432b58b1845afe9efc5fa5e9763
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -305,12 -301,12 +305,12 @@@ F src/vdbemem.c 31d8eabb0cd78bfeab4e512
  F src/vdbesort.c 42c166f7ca78cb643c7f4e4bdfa83c59d363d1a6
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
 -F src/wal.c 847692349eb6e1fb8543dbc97e69ddbfa4cc7ea7
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 75f2d8b18c846910406da9700e7dd4fc67b76030
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c d67fe69dd1bb32ad3d488a8c5bc803a29814f357
+ F src/where.c 8877b55e6803eaa856254875bca8d12fff3681cf
  F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -1228,7 -1224,7 +1229,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 463ad971d2a427f50564b409a021a910004c1423 e9955c0e14d13ba1411f013acb4979958dae2516
- R 48381641a946ccc7349c72449b00abc0
 -P 7ed3346e8c10dbf52fd44ab69900699d4f7ad3fd
 -R 4b33ce7227bf5d27f48a35be658eb882
++P 5437e0534a9647b449474df140a88bb8e4e42791 fdb667335c2250239a66143aec4235325dec8274
++R 1ee6daf466ae19c33c5cdc1ee9839310
  U drh
- Z a7b383b16545d202cd6347c755161847
 -Z 1360efaa2c5f7305d23abadc41fbb137
++Z faabb16058d3a9239d21ab839a40cd11
diff --cc manifest.uuid
index b957f9624f,437ab02c1f..3dd603dbf1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5437e0534a9647b449474df140a88bb8e4e42791
 -fdb667335c2250239a66143aec4235325dec8274
++8a9b43f930de9c789b230909233eee64ad1db93d