Import all the latest trunk changes into the sessions branch.

FossilOrigin-Name: 87a0eab5d98fff93aa2147c04c4af27be42fb365

diff --cc manifest
index 6d1343a809af563bdcdae3820ed370de07807c90,75fe99adec7ca7ddbbf46919e42f422c6aabdbda..0553e9c7a436527624d960a1fcf85224040b9ef4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2012-03-30T17:30:33.409
 -C Improved\shandling\sof\saggregate\ssubqueries\swithin\san\saggregate\squery.
 -D 2012-04-17T16:38:53.916
++C Import\sall\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2012-04-18T01:41:37.755
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -86,39 -86,27 +86,39 @@@ F ext/icu/README.txt bf8461d8cdc6b8f514
  F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 4c1878818fc50efe5c2c7b8809d5cd0d88c7d396
+ F ext/rtree/rtree.c 73502e5336162fdc8f5d1c4bdd4ec6b1299c2f2a
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
- F ext/rtree/rtree1.test 28e1b8da4da98093ce3210187434dd760a8d89d8
+ F ext/rtree/rtree1.test e474a2b5eff231496dbd073fe67e5fbaf7f444c9
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
  F ext/rtree/rtree3.test a494da55c30ee0bc9b01a91c80c81b387b22d2dc
- F ext/rtree/rtree4.test 0061e6f464fd3dc6a79f82454c5a1c3dadbe42af
- F ext/rtree/rtree5.test ce3d7ccae2cfd9d2e1052b462424964c9bdcda12
- F ext/rtree/rtree6.test 0b380bd9af93f3bc496eef42502a336f58949c1b
- F ext/rtree/rtree7.test bcb647b42920b3b5d025846689147778485cc318
+ F ext/rtree/rtree4.test c8fe384f60ebd49540a5fecc990041bf452eb6e0
+ F ext/rtree/rtree5.test 9a229678a00f40e6aedb40cb3a07ec5444af892c
+ F ext/rtree/rtree6.test 3ff9113b4a872fa935309e3511cd9b7cdb4d2472
+ F ext/rtree/rtree7.test 1fa710b9e6bf997a0c1a537b81be7bb6fded1971
  F ext/rtree/rtree8.test 9772e16da71e17e02bdebf0a5188590f289ab37d
- F ext/rtree/rtree9.test df9843d1a9195249c8d3b4ea6aedda2d5c73e9c2
+ F ext/rtree/rtree9.test d86ebf08ff6328895613ed577dd8a2a37c472c34
  F ext/rtree/rtreeA.test ace05e729a36e342d40cf94e9efc7b4723d9dcdf
- F ext/rtree/rtreeB.test b1916a9cecb86b02529c4cc5a546e8d6e7ff10da
+ F ext/rtree/rtreeB.test 983e567b49b5dca165940f66b87e161aa30e82b2
  F ext/rtree/rtree_perf.tcl 6c18c1f23cd48e0f948930c98dfdd37dfccb5195
  F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
- F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
+ F ext/rtree/sqlite3rtree.h c34c1e41d1ab80bb8ad09aae402c9c956871a765
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/session1.test 502086908e4144dfaccb1baa77bc29d75a9daace
 +F ext/session/session2.test 99ca0da7ddb617d42bafd83adccf99f18ae0384b
 +F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01
 +F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84
 +F ext/session/session5.test 8fdfaf9dba28a2f1c6b89b06168bdab1fef2d478
 +F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
 +F ext/session/session8.test 7d35947ad329b8966f095d34f9617a9eff52dc65
 +F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 891453e96630ee2915081487fc4b7226f0aa252f
 +F ext/session/sqlite3session.c 57d04e1d6a3579e673e61dea29f214fb4e0fc505
 +F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673
 +F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 -F main.mk a80771d44176a0c744d9d4e048497e7ed0b4040d
 +F main.mk a7a6511a621e89c25b59deb9614cf83611d724e1
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -146,8 -134,8 +146,8 @@@ F src/callback.c 0cb4228cdcd827dcc5def9
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
 +F src/delete.c 32041c65dc05a94914cf979fad7b82bc8a963fe9
- F src/expr.c 7e40ea9f6899e31134be3c1b88b8347cf9ec40d7
+ F src/expr.c 1b2383adc4391ddae38abb71fd4690a3af8efb01
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
  F src/func.c c6b3c94320253a35bda43fb69cc292618e3285d6
@@@ -155,7 -143,7 +155,7 @@@ F src/global.c 4cfdca5cb0edd33c4d021bae
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 56f11d8c1de32e90fd76f92e998267557f1ec5ce
 -F src/insert.c 0bbffe75c254c62a5686ab5e7f88e29235e16174
++F src/insert.c e32d8d0b761ae5e57d804948bb4e01029a9653b0
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
@@@ -191,13 -179,13 +191,13 @@@ F src/pragma.c e708b3bb5704605816f617e0
  F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
  F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 3d3e80a98f203ac6b9329e9621e29eda85ddfd40
- F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c f6f141cb1ea13f1e6564d3e162700e4937baa2a1
- F src/shell.c abf18d6ee54f2631860a98fdd7ab1327f470db67
- F src/sqlite.h.in 984b1a39bc5f977aaf7ae1a7895ba2fdd5c4302a
+ F src/resolve.c 969ec2bc52db1b068054ecf5ddc74f244102a71d
+ F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
+ F src/select.c d7b9018b7dd2e821183d69477ab55c39b8272335
+ F src/shell.c 11185a9a4574f363bd4268a2780d37480ae00040
 -F src/sqlite.h.in 4338f299fc83dada8407358d585c0e240ecb76a3
++F src/sqlite.h.in ad55acc42422c461719f3adaee434836ab00677b
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 0ad8c0d6978532be268b2cf33ba713773ee4183a
 -F src/sqliteInt.h c5e917c4f1453f3972b1fd0c81105dfe4f09cc32
++F src/sqliteInt.h 572c5e6aca50256bdbc34919ece5f660dabf25cc
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -215,7 -203,7 +215,7 @@@ F src/test_async.c 0612a752896fad42d55c
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
- F src/test_config.c 576d3d9450fb009ccd8be581eaab7c7e3458cc40
 -F src/test_config.c 0de329e736eb4aa5845069bed630e5c72f012264
++F src/test_config.c 52aa8cab6e20e9de078a0fb4a6f45a0466fbae2a
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c 6232d722a4ddb193035aa13a03796bf57d6c12fd
@@@ -253,13 -241,13 +253,13 @@@ F src/update.c 89de085a0bf4da448472029d
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c 4f6cfad661b2e3454b0cdd5b1b9d39a54942d0e3
  F src/vacuum.c bfd53f9bd20a8fdb70b0fa8e77182b866875c0d8
- F src/vdbe.c 9c6251931bc32ca8824dd7b89e06eba358a4a536
 -F src/vdbe.c e1d26b98288889c22f00cf4851ec351ee67ad8b9
 -F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 -F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
 -F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
 -F src/vdbeaux.c d52c8a424fdd4b1d5cf1ac93cc7cd20da023ec5c
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c b79d6de881aeec7d22e944238fa0d9bd5a3ef5ae
 +F src/vdbe.h 87b8ff40de3f55dbcdc33029416862f517c37a2f
 +F src/vdbeInt.h f1956902b06b4f05ce965aafab6fe220a5477f9c
 +F src/vdbeapi.c 2fc381f651738feb2495cb001cf2114dea596cc3
- F src/vdbeaux.c 2803275ce14795549fd86a03474cac80f549a569
++F src/vdbeaux.c dcff925ee54f73a6a729ea56e4197c91b38645c4
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
- F src/vdbemem.c fb0ac964ccbcd94f595eb993c05bfd9c52468a4a
+ F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
  F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
  F src/vtab.c ab90fb600a3f5e4b7c48d22a4cdb2d6b23239847
@@@ -525,9 -513,9 +525,9 @@@ F test/fuzz_common.tcl a87dfbb88c2a6b08
  F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
  F test/fuzzer1.test 69cf1036b92fd3b8e1fd65bef4d7ee3f085c28fb
  F test/fuzzerfault.test ff2282c81797b6a355f0748d8b54c7287c5d2b25
 -F test/hook.test 5f3749de6462a6b87b4209b74adf7df5ac2df639
 +F test/hook.test 94b927b15883f5c1477ab09eecd16275addb08f4
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
- F test/in.test a7b8a0f43da81cd08645b7a710099ffe9ad1126b
+ F test/in.test 5941096407d8c133b9eff15bd3e666624b6cbde3
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
  F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
  F test/in4.test 64f3cc1acde1b9161ccdd8e5bde3daefdb5b2617
@@@ -1010,9 -998,9 +1011,9 @@@ F tool/symbols-mingw.sh 4dbcea7e7476830
  F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
+ F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 2277c70b6f14e2f8043112a5c49a8bc18b7504f3 196ca3a8b007b9f792e969893d981f6c5aa2fccc
- R 93da740959437ea907cbb7c5ae8abd7e
 -P 8e2363ad76446e863d03ead91fd621e59d5cb495
 -R f4f12ce6163c2f6bb1a71deb9cb7039c
++P fb9b9987de965e194fef56bca563ee65c49f0950 430bb59d798286a86c351de92c429345f016b3f0
++R 1079dce486da15e32db2d612434f8ab1
  U drh
- Z fef535844e3896614cb995edc2eb862f
 -Z 58b2a5ebe7a572f77bef677b95126ab0
++Z f39a0ebbcb374338bf5b614e6c1f4af3

diff --cc manifest.uuid
index a5cd03bade88a23f964f65468d78c45d959180d3,59d3d01d7789bb6b3baff951df9941f1c15b8b0e..ec8bba7e8a94571d38fa7c1a358e48b3b3f79fe0
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fb9b9987de965e194fef56bca563ee65c49f0950
 -430bb59d798286a86c351de92c429345f016b3f0
++87a0eab5d98fff93aa2147c04c4af27be42fb365

diff --cc src/insert.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge