Merge the KeyInfo cache mutex fix from trunk.

FossilOrigin-Name: f0940c73bd13cb49a3d229ce2517736324392cfb

diff --cc manifest
index 4b4242ebe2ad79ffae99d94a9c396c5a1efb4f5a,0542dbf99d0f64dff955a9f73926c973f727a6e2..25939330c87b183d0a274cf6c8d85191b69fdfa2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\sfix\sfor\sthe\sshared-cache\sKeyInfo\scache\sbug\sfrom\strunk.
- D 2014-12-05T20:05:10.426
 -C Increase\sthe\sdefault\sminimum\sPMA\ssize\sfor\smulti-threaded\ssorting\sfrom\s10x\nthe\spage\ssize\sto\s250x\sthe\spage\ssize.\s\sProvide\sthe\sSQLITE_SORTER_PMASZ\ncompile-time\soption\sto\schange\sthis\sdefault.
 -D 2014-12-09T14:42:49.215
++C Merge\sthe\sKeyInfo\scache\smutex\sfix\sfrom\strunk.
++D 2014-12-09T14:54:26.273
  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 d13290bb1592cd7651a3b416a99850c652337e32
 -F src/main.c 27c102143048802af53a8e55919ea3f6d9072951
++F src/main.c 6614381d96520d7c73d0fb2eb5291533a6b04d16
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -254,8 -237,8 +254,8 @@@ F src/sqliteInt.h aff67183ad2b5d29f71a3
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
 -F src/tclsqlite.c 0a874655dd39a9875e39c5d3c464db662171d228
 +F src/tclsqlite.c 05be57620509060e85064b9495256c05d56e76b0
- F src/test1.c c24d7f67252348d756773a6dbe23a61b4552f709
+ F src/test1.c ebb8cd3c94a2ac8851b7b0b1349284e73a8b4c7a
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -308,14 -291,14 +308,14 @@@ F src/update.c d207deb7a031f698104bee87
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
 -F src/vdbe.c 1a9e671c9cfc259e4d2affc71f7df4a4c00a842c
 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 -F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 -F src/vdbeapi.c 07acb615d1e4170e71fc1b0d087f3c53a1ad8e83
 -F src/vdbeaux.c 6f7f39c3fcf0f5923758df8561bb5d843908a553
 -F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
 -F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
 +F src/vdbe.c c02217423a807dc97c743f5fff493cd55dffa77d
 +F src/vdbe.h b434bb75fbec973d18d49225a59833ae39ee2afc
 +F src/vdbeInt.h dc69f0351bef56456fdba3e09d3387ba4f1b1520
 +F src/vdbeapi.c 3d4d2a2b24055ce2cb029fa73067c56616264b51
 +F src/vdbeaux.c ccf6b7ca6c7361bdb71d12385b4cff70b395486c
 +F src/vdbeblob.c cb7359c2d99df92c35cdaedc12af6d4f83854cb7
 +F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
- F src/vdbesort.c 42c166f7ca78cb643c7f4e4bdfa83c59d363d1a6
+ F src/vdbesort.c db015e20a77b25eca4d1e125815f4998a3ca1354
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
  F src/wal.c 847692349eb6e1fb8543dbc97e69ddbfa4cc7ea7
@@@ -1242,7 -1226,7 +1244,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 c9f20eb2fbba0868df85ebb98877f9bb969be8a4 fdb667335c2250239a66143aec4235325dec8274
- R 5f307fe542c2e256cd3ca2580b7cd173
 -P e97b7a8b4df784d148fefb9554da0f511e351d9f
 -R bd26f6a52391b4ad1637a19c173d9967
++P 5a73da6a3083926a3dafd28c0604122296dc9184 b05340fe3cd5f1676a55023228dc8d1a92de5936
++R 2816a79c9fe6d224099c23041d3622b2
  U drh
- Z d2fac6b276a39da7118e93eb39e0e62a
 -Z c16d1b57c275f469d491c230a3c4e6f8
++Z 5d345254f96163549bdbecca703eb3ee

diff --cc manifest.uuid
index 708a694e4f063070f771eb40fd95b0a6df096628,b381d7ac7e468cd518dd605255c283271749710e..85c416a6749c684366d24fb0d1f7b89bf54869c3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5a73da6a3083926a3dafd28c0604122296dc9184
 -b05340fe3cd5f1676a55023228dc8d1a92de5936
++f0940c73bd13cb49a3d229ce2517736324392cfb

diff --cc src/main.c
Simple merge