Merge in the permutation changes from trunk.

FossilOrigin-Name: b30a5e307fd5485d23e4c4f8ed1c47525a0fe6d3

diff --cc manifest
index e298f1e67f046907d109fab761cf71a0379e4de3,b2ac7449256289262a272f8efe383bebd872a63f,b694564c7b839c3358fc581e883a06df892974a1..e172838233b8d7f14a154586c56dbe5b6fb5d7f9
--- 1/manifest
--- 2/manifest
--- 3/manifest
+++ b/manifest
@@@@ -1,5 -1,5 -1,5 +1,5 @@@@
-  C Merge\sthe\slatest\strunk\schanges\sinto\sthe\swinopen-retry-logic\sbranch.
-  D 2011-08-02T19:42:38.461
 - C Omit\sbackcompat.test\sfrom\sthe\sjournaltest\spermutation\sbecause\sit\suses\sWAL\nmode\swhich\sis\sincompatible\swith\sjournaltest.
 - D 2011-08-02T19:30:20.260
  -C Also\sexclude\sbackcompat.test\sfrom\sinmemory_journal\ssince\sinmemory_journal\nis\snot\scompatible\swith\sWAL\smode.
  -D 2011-08-02T19:59:39.002
+++C Merge\sin\sthe\spermutation\schanges\sfrom\strunk.
+++D 2011-08-02T20:01:06.809
   F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
   F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
   F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@@ -613,12 -613,12 -613,12 +613,12 @@@@ F test/pagerfault.test 452f2cc23e3bfcfa
   F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
   F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
   F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
 --F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
 ++F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
   F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
 --F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
 - F test/permutations.test 434b3c91168969cee1385663748106f5f13b2f9c
 - F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
 - F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 ++F test/pcache2.test 9f9357bb0f463b87bdf695646024ed2031a0c85a
-  F test/permutations.test 434b3c91168969cee1385663748106f5f13b2f9c
++ F test/permutations.test 2caebe3ac9c227b076fd58a9fbd818715ec59379
  -F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
  -F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 ++F test/pragma.test c8108e01da04f16e67e5754e610bc62c1b993f6c
 ++F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
   F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
   F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
   F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
@@@@ -954,7 -954,7 -954,7 +954,7 @@@@ F tool/symbols.sh caaf6ccc7300fd4335331
   F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
   F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
   F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
-  P 9007586fdabed8dbcc78581ea9821cfd1f9a4c8c 2bbf3150a4b7108e88ed81c1d40af6f06089e148
-  R ed676f9c5b5c5c1cb85f45ddea5340b8
 - P a55f4ab99952a731e4cd8f6ef17389062e5ed4c5
 - R 2ce41a9c949729a862f5ca8012f8f07d
  -P 2bbf3150a4b7108e88ed81c1d40af6f06089e148
  -R f51d9dedae8eb970656d48fdd226276d
+++P 8bef97a0eb2f56d0ac374d97e97e0a44c7f99aee 2bbf3150a4b7108e88ed81c1d40af6f06089e148 861a5b62430d0ada07a46d0e394fcf0b0faab1cd
+++R 71d14b2778e99286bdae280684de342f
   U drh
-  Z a5575159f660bba167a59a6dccad64eb
 - Z 9aaddca534c660973358cb12c28015e6
  -Z 87c30e1f6a8a2a4afd8eef59cabe937d
+++Z dc3b5053c70dc32d5e9154bd65bfd193

diff --cc manifest.uuid
index 04d765101d138da4aecc73688db90f7bf60a05c5,92e2001b23b2d8045bb797954f0762a78811b368,cfaaff04479c51b5a027138b3d62eea599a11467..c81095cac9ce4e85ac22fe0a4fd88649d74b6689
--- 1/manifest.uuid
--- 2/manifest.uuid
--- 3/manifest.uuid
+++ b/manifest.uuid
@@@@ -1,1 -1,1 -1,1 +1,1 @@@@
-  8bef97a0eb2f56d0ac374d97e97e0a44c7f99aee
 - 2bbf3150a4b7108e88ed81c1d40af6f06089e148
  -861a5b62430d0ada07a46d0e394fcf0b0faab1cd
+++b30a5e307fd5485d23e4c4f8ed1c47525a0fe6d3