Merge updates from trunk.

FossilOrigin-Name: 4ab1ffd45d4c25368b9b393a3336068b747d8b22

diff --cc manifest
index 71eeeacff378f7e9c3eaff6a42cfff1b4ba3cc87,50503f5402d0e2ae5d15fc0761ec70d3738fbc2c..56cd5158795e4c4d1f3d954b38f1fc5752d4e1c4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\stypo,\suse\sthe\ssyscall\stable\sfor\sosOutputDebugStringA.
- D 2012-03-19T23:28:35.056
 -C Add\sadditional\stest\scases\sto\se_insert.test.\s\sUpdate\sevidence\smarks.\nno\schanges\sto\score\scode.
 -D 2012-03-19T17:42:46.646
++C Merge\supdates\sfrom\strunk.
++D 2012-03-19T23:32:26.041
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -147,7 -147,7 +147,7 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c fbb345088f5719f1842056e0613ea3f9a889f4fa
 -F src/main.c 91458c713e9b7f8dbc98d79e78f1150f0ca9c2a1
++F src/main.c 57b7ebf64804621a3d783a359d8a4c6a4d256573
  F src/malloc.c 15afac5e59b6584efe072e9933aefb4230e74f97
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
@@@ -182,14 -182,14 +182,14 @@@ F src/resolve.c 3d3e80a98f203ac6b9329e9
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c 44ccdcb5d2a1c48622c179b2d72167b716388581
  F src/shell.c aa28f117033ba3e44b5eaaf2ad572222bcdfd66e
- F src/sqlite.h.in 733a91460165e21b868c6b716318637b893abb2c
 -F src/sqlite.h.in 6af2d92925bfed3dfd2c022fef48469762ccd435
++F src/sqlite.h.in a3516084e920db2599c76f1286123adec5b20c37
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h b013dab7d43fb67c3ca2f0253d7863abb37e233c
+ F src/sqliteInt.h e65429a6f19b41720561b9434b2192574a91cfa2
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 2aeb69958965dad0842d5ea1456f1a958ef296e6
- F src/test1.c 8e1e72e09d7941d9d22fd6a544df39e2e3f4efd9
 -F src/test1.c 07f30e8714bab94d8de8a88865d9c59bc512a1a8
++F src/test1.c 1a1df7eed3e8b58987b5716de7a37cc79a10f3f2
  F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
  F src/test3.c 91d3f1a09cfae3533ef17d8b484a160f3d1f1a21
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -625,7 -625,7 +625,7 @@@ F test/notnull.test cc7c78340328e6112a1
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
  F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
- F test/pager1.test 4be3dacf48b767929112626be1b358a7f84e0eae
 -F test/pager1.test cf8f40cf77b5c4f762b1e8492390d61b46a81623
++F test/pager1.test 41995062277f6b9c5d57ce074e814ea4285a5c76
  F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442
@@@ -992,7 -992,7 +992,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 32b5c20e54474fcc33ba937293e97566a555e733
- R d32fb1b5cd1fab5ff76f40d56d49b5b8
 -P bc03d99a78e90c02b69037e5f5f81537b5a3ac60
 -R 69afcc9757d71d53b13c043daaf0c06c
 -U drh
 -Z e41b3b1650d5b16145f025deed2994e7
++P 9598c2a398a6e7d9c3ee8b2ae32c21538ad3e15a 036395c0a8e08883b11df025e3da9e2461e4b1eb
++R 4006015c648fef4fba98d6e258af08ad
 +U mistachkin
- Z 80d32efbf3550d0f32e83e5f5c098d24
++Z 2aee651a229c029a1a978eb8aa068968

diff --cc manifest.uuid
index 6ada58a753f1c556f69db0be205c3db896fc6b11,0d3f57ac8d412fe116f170cce5a4ed52d01944b8..3343b4c646e5074fea980ed2adafe7a6179acf07
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9598c2a398a6e7d9c3ee8b2ae32c21538ad3e15a
 -036395c0a8e08883b11df025e3da9e2461e4b1eb
++4ab1ffd45d4c25368b9b393a3336068b747d8b22

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc test/pager1.test
Simple merge