Increase the default PMA size from 10 to 250 pages and provide the

SQLITE_SORTER_PMASZ compile-time option to change this default.  Add
needed mutex call when clearing the KeyInfo cache in shared-cache mode.

FossilOrigin-Name: 6e2da589ad562e0e412eb6572a8681225259b46e

diff --cc manifest
index 0d314c17dd79d8ae3a70364ffb40afd8ca9b6968,0542dbf99d0f64dff955a9f73926c973f727a6e2..1b2dbb0d781a9a238e23ab3f5beb41f81823d070
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sthe\sshared-cache\sKeyInfo\sfix\sfrom\strunk.
- D 2014-12-05T20:16:52.803
 -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 Increase\sthe\sdefault\sPMA\ssize\sfrom\s10\sto\s250\spages\sand\sprovide\sthe\nSQLITE_SORTER_PMASZ\scompile-time\soption\sto\schange\sthis\sdefault.\s\sAdd\nneeded\smutex\scall\swhen\sclearing\sthe\sKeyInfo\scache\sin\sshared-cache\smode.
++D 2014-12-09T15:01:07.090
  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
@@@ -176,7 -173,7 +176,7 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c da9a40fdf900e9384df3957500a48418324bef91
 -F src/btree.c ea6692ce58bfba55b12c75d2947fec0906d1ef7a
++F src/btree.c e8325955bd7f6e9e55b695b8e56f541b7637e831
  F src/btree.h e31a3a3ebdedb1caf9bda3ad5dbab3db9b780f6e
  F src/btreeInt.h 3363e18fd76f69a27a870b25221b2345b3fd4d21
  F src/build.c 67bb05b1077e0cdaccb2e36bfcbe7a5df9ed31e8
@@@ -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 0e8100f7758d1432b58b1845afe9efc5fa5e9763
 -F src/main.c 27c102143048802af53a8e55919ea3f6d9072951
++F src/main.c 02f8f92211f8a277b60a42bfcee3765311c030f1
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -242,7 -238,7 +242,7 @@@ F src/sqliteLimit.h 164b0e6749d31e0daa1
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
  F src/tclsqlite.c 0a874655dd39a9875e39c5d3c464db662171d228
- F src/test1.c 1116f898f5ad4fc2bfa2ff9f943e3a03a44c6a14
 -F src/test1.c ebb8cd3c94a2ac8851b7b0b1349284e73a8b4c7a
++F src/test1.c 6ee15f0a993b33514879560d18ba42f0bd4410a4
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -295,22 -291,22 +295,22 @@@ F src/update.c 3c4ecc282accf12d39edb8d5
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
 -F src/vdbe.c 1a9e671c9cfc259e4d2affc71f7df4a4c00a842c
 +F src/vdbe.c 9f43973c08d115f5fbe46fe30663e536018d7b43
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
  F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 -F src/vdbeapi.c 07acb615d1e4170e71fc1b0d087f3c53a1ad8e83
 -F src/vdbeaux.c 6f7f39c3fcf0f5923758df8561bb5d843908a553
 +F src/vdbeapi.c 55cd14500f305264983952b816d3d3ce91501b3a
 +F src/vdbeaux.c 6f91a25abf07dbbda79c155e5ae8860816dcef13
  F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
- 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
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 75f2d8b18c846910406da9700e7dd4fc67b76030
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 8877b55e6803eaa856254875bca8d12fff3681cf
+ F src/where.c e914fdb9159bb36af4a673193bbda08aaf9e5a73
  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
@@@ -1229,7 -1226,7 +1231,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 5437e0534a9647b449474df140a88bb8e4e42791 fdb667335c2250239a66143aec4235325dec8274
- R 1ee6daf466ae19c33c5cdc1ee9839310
 -P e97b7a8b4df784d148fefb9554da0f511e351d9f
 -R bd26f6a52391b4ad1637a19c173d9967
++P 8a9b43f930de9c789b230909233eee64ad1db93d b05340fe3cd5f1676a55023228dc8d1a92de5936
++R 459846a9088bf83459128c7ec2ff80a6
  U drh
- Z faabb16058d3a9239d21ab839a40cd11
 -Z c16d1b57c275f469d491c230a3c4e6f8
++Z 5aa3333e205b6c4facb3ed20507b268f

diff --cc manifest.uuid
index 3dd603dbf121554e2785a9fe5754a2e1777de481,b381d7ac7e468cd518dd605255c283271749710e..b8071350288d7169bc928783eb5a9266e324eda2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8a9b43f930de9c789b230909233eee64ad1db93d
 -b05340fe3cd5f1676a55023228dc8d1a92de5936
++6e2da589ad562e0e412eb6572a8681225259b46e

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/test1.c
Simple merge