Merge updates from trunk.

FossilOrigin-Name: f021559d8a23934e3bdccad5b55fc7a91d185f53

diff --cc manifest
index 68bf504834effbb36be4eb970a26cd1c1993b3ef,be0f0a1ebcbed5b417bff9b681d462f16e447d4e..d49399a0cafc4004a62255397ad6f6ca7e16824b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Correct\scomments\sand\senhance\sreadability\sof\sthe\smkvsix\stool.
 -D 2012-10-15T20:28:22.029
 +C Merge\supdates\sfrom\strunk.
- D 2012-10-07T14:14:44.309
++D 2012-10-16T23:08:28.778
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -138,12 -138,12 +138,12 @@@ F src/global.c 617cf51a1c34d304e29843ed
  F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c b1d413e792e8f5e6747647625cb7c0e9f2e89e50
+ F src/insert.c ad0d8943d2a4f0b52ebf75b9e459f2da00117dbd
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
- F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
+ F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
 -F src/main.c ca6784455f3207524b82d24141676d641d44f137
 +F src/main.c 8636ce7c8cdb5d8da672faa5577dbb5da0c6f4ff
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -172,14 -172,14 +172,14 @@@ F src/pragma.c 015723c48072781d2740e310
  F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32
+ F src/resolve.c 7b986a715ac281643309c29257bb58cfae7aa810
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 2a82736faeca1fe93315eda20c691d68ec13bb6c
+ F src/select.c 9b759521f805e25e97baa2dd64037157fe365817
  F src/shell.c 8ee5a3cb502e2d574f97b43972e6c1e275e7bec7
 -F src/sqlite.h.in c7be05ad191d2634292fcc77bdb2bcfa4526eb98
 +F src/sqlite.h.in 702c03d8036b6e0a5fac2fcb704d9df628e3d097
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 57db1b9d5920725265e973a78549d7da25a57afe
 -F src/sqliteInt.h b49674b1c92173e9796c94fd6f15c1679e3b10cc
++F src/sqliteInt.h 3fad6e332ddd06b89de62c8f8abccfa61e63577b
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -633,11 -634,11 +634,11 @@@ F test/notify2.test 9503e51b9a272a5405c
  F test/notify3.test a86259abbfb923aa27d30f0fc038c88e5251488a
  F test/notnull.test cc7c78340328e6112a13c3e311a9ab3127114347
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
 -F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
 +F test/openv2.test 74c994537a13c7e31982d597eab555491133cee4
- F test/orderby1.test 4875a2a0a87d81920f3600a3405dc42f233b8c82
+ F test/orderby1.test ef4f7c40df81b9a4303a718433d34052f07db47d
  F test/orderby2.test bc11009f7cd99d96b1b11e57b199b00633eb5b04
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
- F test/pager1.test 2163c6ef119f497a71a84137c957c63763e640ab
+ F test/pager1.test 07116f72a61960b882952e7472cc2846d161d6e2
  F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442
@@@ -1019,7 -1021,7 +1021,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 1138815c625a1a1721e0efdad6a5abca1e3c7299 50679889c75cd3205253b1682abfbddc5ff09175
- R 1818ef3d08c3896e49092a32e494ce2e
 -P 629a42d47a0d8f73de900f469845ce800bdb8959
 -R c7830c7c0cb344c8cb6a175c95e5eb7f
++P bbb0d189b7b6aecfc0e0b6c2bcd9f49aaea8c34a 2c3af657fee6153842d660a6ce29aa7d791ebd38
++R 42f368ad563e093cbc431b2b6eab1115
  U mistachkin
- Z f699cfbfac79b2fe6b270f9f404921a4
 -Z f2086ddd83e8b281e8d53ba90c91d2db
++Z cf0b8626aab699edec5e3c0c8e82ca94

diff --cc manifest.uuid
index 592a80ba6fd5a55b0ceb37f4489085a6e1b461a6,915ba493680eb7e7ef9000908593c8d328a24e92..cd10ab6cf3cdc6b46a85906803501fc76f293aeb
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bbb0d189b7b6aecfc0e0b6c2bcd9f49aaea8c34a
 -2c3af657fee6153842d660a6ce29aa7d791ebd38
++f021559d8a23934e3bdccad5b55fc7a91d185f53

diff --cc src/sqliteInt.h
Simple merge