Merge the latest trunk changes into tree-explain branch.

FossilOrigin-Name: 1a360da0f8314f232c224c71829646bc7558892b

diff --cc manifest
index 3aac83707ea93f0e2dc7cbe0660458ba0d422a5d,ec33d4e62523bebe35e1a9c06eb8a245ebcd69be..2040e56124527f765b1ac225906ec6558bc7f213
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Additional\sdetail\sadded\sto\sthe\stree-explain\soutput\sfor\sSELECT\sstatements.
- D 2011-12-07T22:49:42.588
 -C Always\suse\s_msize()\sto\sget\smemory\sallocation\ssizes\son\swindows,\swithout\shaving\nto\sdo\sanything\sspecial\sin\sthe\smakefile.
 -D 2011-12-10T13:49:44.752
++C Merge\sthe\slatest\strunk\schanges\sinto\stree-explain\sbranch.
++D 2011-12-10T14:44:31.699
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -134,7 -134,7 +134,7 @@@ F src/complete.c dc1d136c0feee03c2f7550
  F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c 51d32f0a9c880663e54ce309f52e40c325d5e112
- F src/expr.c 59a530af612b95d4d29c066bf81f12def813d16d
 -F src/expr.c b5920f108d6955b262f8db8e38f40f59b2bfcd7d
++F src/expr.c d3a969a22368077b0efcb6028faa1c48ba7d2598
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
  F src/func.c 6261ce00aad9c63cd5b4219249b05683979060e9
@@@ -147,10 -147,10 +147,10 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c d0d2022a5a07274d408820b978b9e549189d314f
 -F src/main.c 8be1ee70dd90ef7562c801dbe946a4f9f93bb128
 +F src/main.c 0e0b9dd5b054ed1aa3861b257035910aff9e1842
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c 7456e2ca0524609ebc06a9befeda5289d4575ad4
+ F src/mem1.c 7998e7003a3047e323c849a26dda004debc04d03
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -167,10 -167,10 +167,10 @@@ F src/os.h 549b1a2e5e0ed1e1499f252dac12
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
  F src/os_unix.c 4fbb91726165e105c1679a2660f49a3f4c376e4f
- F src/os_win.c 6efe66a38215c38eaa7603ee5f76848159f8669d
+ F src/os_win.c 8af100f78f157eb6185fd9153d7f35b829c4da04
  F src/pager.c d981f3bfcc0e4460537d983899620700ccf8f539
  F src/pager.h 5cd760857707529b403837d813d86b68938d6183
 -F src/parse.y d02cc7bdb9ba11fb7aa212f55f99e59e4ee55439
 +F src/parse.y fabb2e7047417d840e6fdb3ef0988a86849a08ba
  F src/pcache.c 1fdd77978c1525d1ca4b9ef48eb80abca710cb4c
  F src/pcache.h b1d8775a9bddf44e65edb0d20bfc57a4982f840f
  F src/pcache1.c 9d735349ac87ef08076c6b1230f04cd83b15c6da
@@@ -180,11 -180,11 +180,11 @@@ F src/printf.c 7ffb4ebb8b341f67e049695b
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 365ab1c870e38596d6869e76fb544fe6e4ffc809
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 912bea602425df403c464c7da9a89a56281623a3
 -F src/select.c fd3046fb39a1de8dce269e9b5ecbf58fe7e7e480
 -F src/shell.c 29812a900a780eb0f835c4bc65e216272689def8
 -F src/sqlite.h.in 57081d8e6b53ce29541d7437c93bce6087ac53b5
++F src/select.c 97275df6f40f1df1c389e275c2185a4edf202ad2
 +F src/shell.c a1eadb2fdbfa45e54307263f0c8da8ee8cd61b8b
 +F src/sqlite.h.in 1dc07194eb1a2c69c8ef75f88022b170be08024a
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 96041958f4508dbc588c82298f75559ac683fe75
 -F src/sqliteInt.h de3db02a1e4762a6ec9e1ab604ebc02d77948030
++F src/sqliteInt.h d781d89415ada4815794fc2587601cd44272f94d
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -239,20 -239,20 +239,20 @@@ F src/update.c d3076782c887c10e88299655
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c 01238e2b0f24a14779181dbf991fe02620a80e31
  F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
- F src/vdbe.c a7ab9993ec5a4d9479dc99671faec061fbf9b889
- F src/vdbe.h f0725ee997db869ecae5bb70a71612aabeca7755
- F src/vdbeInt.h a2b8f17783c85995f64432d6cbd546a9183a56f3
+ F src/vdbe.c 029add0c5197a61db588824a58570547330b9d8f
+ F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 -F src/vdbeInt.h 23a9506c9ab31e7823d7257d1828d2d7843443a0
++F src/vdbeInt.h 72222af1a52bcdfa94e1165e083734484fc0863f
  F src/vdbeapi.c 86189ebba2c49791d75eaa12929f3ce6527596bd
- F src/vdbeaux.c ed7205125304fd8aab32ab0ea975f2c1088cace5
 -F src/vdbeaux.c 71a0cd6ae14ddb2e2a6d6b97d5b54ae753272682
++F src/vdbeaux.c 1b99a1f6c56aecfebc172ff6985ba9818f6c8caa
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
  F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
 -F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
 +F src/vdbetrace.c 7e5946109138ff6f7f94e79fc702755bf79373a8
  F src/vtab.c e9318d88feac85be8e27ee783ac8f5397933fc8a
- F src/wal.c 5fe1ba55b8fab9d3936bc9093af61ab9f1c580a1
+ F src/wal.c 7e6e7fe68ee649505dca38c8ab83eda0d0d96ae5
  F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c f73752ca85c0ed221753fda98aeaf6b9d4616e0e
+ F src/where.c af623942514571895818b9b7ae11db95ae3b3d88
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -977,7 -978,7 +978,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 0eb3f8b1e3a196811fb54a5e2645debe6119610a
- R c8f99de136cf931e1dc991f6945ded2c
 -P 0064bab77149768640d7758a3e271d5a1d63b256
 -R 24b1670e7f54ceef1719656e8887fd23
++P 7b457ea4551ba411a4747d74fb78b795cc8d9ee6 256e27bd118ed3ab6ecb19ad6a6494b71ac9bdd5
++R aa2b80b8c93dd58f9be82d377cb63c4d
  U drh
- Z 90b0a98552fa9f4d4fff3f8a611f18ca
 -Z 1195788bf6e0e867e75c58852af50db9
++Z 940f9f8f15ab9108dec876188e59d100

diff --cc manifest.uuid
index 3c8a88f6d353fab3e533a491a0835dbaddd3369f,77180fe99e3ec0fecf94989495a228de1e89af1b..253949ba53001348eedaca4fdbbc5f4234db56c4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7b457ea4551ba411a4747d74fb78b795cc8d9ee6
 -256e27bd118ed3ab6ecb19ad6a6494b71ac9bdd5
++1a360da0f8314f232c224c71829646bc7558892b

diff --cc src/expr.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge