Merge the shared-cache related fixes from the shared-cache-fix branch to the trunk.

FossilOrigin-Name: 698ec7769d4feea1782401479c61ce67d2113fd4

diff --cc manifest
index e198ba9848f12da01e1ae282a19a3b3097575d42,00aaa5060f825d058beb3ae08208a08012fa7e51..a68030c33fd83aad4dfa5d949f7f1a6f68c001b1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Consolidate\sall\soccurrences\sof\sthe\s"no\ssuch\scollation\ssequence"\serror\smessage\ninto\sa\ssingle\sspot.
- D 2012-10-05T14:43:40.494
 -C Add\sa\stest\sfor\sthe\scollation-sequence/CHECK\sconstraint\sproblem\sfixed\sby\sthe\sprevious\scommit.
 -D 2012-10-05T17:18:16.288
++C Merge\sthe\sshared-cache\srelated\sfixes\sfrom\sthe\sshared-cache-fix\sbranch\sto\sthe\strunk.
++D 2012-10-05T17:44:51.191
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -124,8 -124,8 +124,8 @@@ F src/btmutex.c 976f45a12e37293e32cae02
  F src/btree.c 14de53ebb334633ee632ab3c5b9262cfe7cbe455
  F src/btree.h 078f76b28c338ab6eb6dd7324d63ee54463aeb6c
  F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
- F src/build.c b87aff4aa847680b90556d639dedac829ad9363a
 -F src/build.c 74baa2d6d63535c9fc82e0d51d3e5d1145614473
 -F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
++F src/build.c aaff8dbeb50c4a7fc48c4f9b65e633b991755ccf
 +F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
@@@ -179,7 -179,7 +179,7 @@@ F src/shell.c 8ee5a3cb502e2d574f97b4397
  F src/sqlite.h.in c7be05ad191d2634292fcc77bdb2bcfa4526eb98
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 6066ed7dac3824c0b362e789863622f1589a94d2
 -F src/sqliteInt.h 27105bbf399f65842fb8eb9e343123a628cc6e5a
++F src/sqliteInt.h 1c5c35cc835e4c4e26be43e663661a237db74c59
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1018,7 -1019,7 +1019,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P 43155b1543bddbb84a8bc13a5b7344b228ddacb9
- R 1ba72200797152f8f0b84e511e307440
- U drh
- Z 6fe8cb59728e23f06e655a7d282a5a09
 -P c2c776ab73828374836af008aa320cc670c081b5
 -R 944a2743bc72c249d323dde91a15aa61
++P 8ea67522fb03134f355ecb776b70c6917241cab2 82b6aa77c8d8de4c6fad1960f5958457a929a821
++R 25900bb7c1310d28535793e9cff3e6d9
+ U dan
 -Z fb89a86dbc14aadae3bf562a37bf56e5
++Z 6fd03f9d2f9680aaf35bc79001b16899

diff --cc manifest.uuid
index ce97c943d42234e208c1baedacb1974599a00962,65775bb214d2820eb21f0e749d0c9e457bd9e1ae..3e7db5616a3ff0610868772105525969fd850892
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8ea67522fb03134f355ecb776b70c6917241cab2
 -82b6aa77c8d8de4c6fad1960f5958457a929a821
++698ec7769d4feea1782401479c61ce67d2113fd4

diff --cc src/build.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge