Merge updates from trunk.

FossilOrigin-Name: 1138815c625a1a1721e0efdad6a5abca1e3c7299

diff --cc manifest
index b0ed5d0717cbdb8d21f648f7367719e174ecd7b1,f15d875432242f4dd1c659f85ad8cacbb4cdb267..1ac13e51a765f9197d9ef61a63e1a1319916d970
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sexperimental\ssqlite3_reconfig()\sinterface\sto\smore\sfully\ssupport\sthe\sSQLITE_CONFIG_READONLY\soption.
- D 2012-10-03T20:20:15.903
 -C Fix\san\sout-of-order\smemset()\sthat\soccurs\sbefore\sall\svariable\sdeclarations\nare\sfinished.\s\sAlso\sfix\sa\sline\sthat\sexceeds\sthe\s80-character\sline\slength\nlimit.
 -D 2012-10-03T18:09:32.822
++C Merge\supdates\sfrom\strunk.
++D 2012-10-03T20:25:58.732
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -143,7 -143,7 +143,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 e538e0d91faf92a163bebb3d7e3183be92a99e78
 -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
@@@ -174,12 -174,12 +174,12 @@@ F src/printf.c 4a9f882f1c1787a8b494a298
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 1fad66b73a69c4004c9969a95b46d1f03390677d
+ F src/select.c 75c5e37cc882c468383c9d9e07496b9a16cfae3e
  F src/shell.c 8ee5a3cb502e2d574f97b43972e6c1e275e7bec7
- F src/sqlite.h.in 7a8c818775136fa20f8cd5d2a5ab2e15723f375f
 -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 a07fdc863510639b287d0721ba16a8d130af2c3e
 -F src/sqliteInt.h c29395d6e68cfbcb2661787ae4820e5e256c916a
++F src/sqliteInt.h 387103b56fba2992a2fdc50ec2eca7102a64066f
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -633,7 -633,9 +633,9 @@@ 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/orderby2.test bc11009f7cd99d96b1b11e57b199b00633eb5b04
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
  F test/pager1.test 2163c6ef119f497a71a84137c957c63763e640ab
  F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
@@@ -1016,7 -1018,7 +1018,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 4a470741b65938dd38418c9c1a6e87dad6a84fc7
- R 3a95b597f4b95f489ae5426e808d1d1a
 -P 956e4d7f8958e7065ff2d61cd71519d6f4113d4a
 -R 9f4b1a764df6137e6f14304dffc8ad1d
 -U drh
 -Z a3c3e4f99944b9339f658e73f3668f5f
++P 9dc2eaa64b6a9f69bd6f3ff28de2c97682a69e0a ba2f492f957ab5556cd540e21a76ebb75efea725
++R 86a5cb8954b10d17bf99d382ffc699aa
 +U mistachkin
- Z 77430a21fa898fed0cc20a439fb47dc9
++Z 1397bb8f36c39363f3eac315e532cd6c

diff --cc manifest.uuid
index e20c1c316d24cadb825d2db753f35d141e995c9e,d51ad9182c57a14804777bdb67f43a23a4bf1d5c..c8dadc1be7ba8df57d08e788cfb4fc0a2afe1952
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9dc2eaa64b6a9f69bd6f3ff28de2c97682a69e0a
 -ba2f492f957ab5556cd540e21a76ebb75efea725
++1138815c625a1a1721e0efdad6a5abca1e3c7299

diff --cc src/main.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge