Merge in the latest trunk changes.

FossilOrigin-Name: ff86875ca35e04cea6c3d5e1b5117a4f227a6b15

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index 408205ca6d6585512a67f49d5a55eb904af2db9f,258b28d30245176721faff0fabb899fa576b40b8..6b587a1394d0a7e2b02a30d6843a739b34d72b0f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Pull\sall\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2012-02-10T17:54:52.604
 -C Merge\sthe\sfts4-languageid\sbranch\swith\sthe\strunk.
 -D 2012-03-05T15:33:32.751
++C Merge\sin\sthe\slatest\strunk\schanges.
++D 2012-03-05T16:26:00.280
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 340b6d1bb4553c389d6837aa437d7c25dc03f980
 -F Makefile.msc 3a5582a858b8071af43cd459bd757f7d0748f66a
++F Makefile.msc ceec8f4ac0f7f463f5ec241dc0115de7a84daba2
  F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION bb4c2a86abe53ea3c1d6ea515b69a426040e2414
@@@ -159,10 -147,10 +159,10 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c 166f9571341f7084172f87e1931f0833778576eb
 -F src/main.c dcb4a15254dca9cc59dba63e813a8c140c021832
++F src/main.c 18ef52feda1f9e151d1dcd032d0c7b95275a7397
  F src/malloc.c 15afac5e59b6584efe072e9933aefb4230e74f97
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c c953f3bfc8fcd31d4de2078697caefeb1dcfd7ff
+ F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -192,11 -180,11 +192,11 @@@ F src/printf.c 7ffb4ebb8b341f67e049695b
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 3d3e80a98f203ac6b9329e9621e29eda85ddfd40
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 232283a2e60d91cbd9a5ddf2f6f7ecf53d590075
+ F src/select.c 44ccdcb5d2a1c48622c179b2d72167b716388581
  F src/shell.c aa28f117033ba3e44b5eaaf2ad572222bcdfd66e
- F src/sqlite.h.in e805ca92bb66d958423dfcef12879e16bf547209
 -F src/sqlite.h.in f46e368d1a28b09d876e35444785674d170f2d62
++F src/sqlite.h.in fc8237a04a17cb31addc670bc9abc99c6712d6d8
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h b62e6f8dfc335f78e89721d54172fa12909e8f2e
 -F src/sqliteInt.h b013dab7d43fb67c3ca2f0253d7863abb37e233c
++F src/sqliteInt.h 3242e4adac818351aed6306a679df3390c771c8b
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -248,16 -236,16 +248,16 @@@ F src/test_wholenumber.c 6129adfbe7c744
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
  F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
 -F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
 +F src/update.c 89de085a0bf4da448472029d0420a2b1cf1824ee
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
- F src/util.c 9e07bd67dfafe9c75b1da78c87ba030cebbb5388
- F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
- F src/vdbe.c a24b861d9de4e26220c4656b6db22103b7e5f39f
+ F src/util.c 906731099c4397bf8adf3fa90a833355e7472af0
+ F src/vacuum.c bfd53f9bd20a8fdb70b0fa8e77182b866875c0d8
 -F src/vdbe.c 32720e873ed0a23e6ee928b676cd995864b984d6
 -F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 -F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
 -F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
 -F src/vdbeaux.c 79cf42b70e211a52d664fc4d585ee2da0a64deac
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c 2591c28c3b11d67a80ff8fca6ceca7c72c140456
 +F src/vdbe.h 87b8ff40de3f55dbcdc33029416862f517c37a2f
 +F src/vdbeInt.h f1956902b06b4f05ce965aafab6fe220a5477f9c
 +F src/vdbeapi.c 2fc381f651738feb2495cb001cf2114dea596cc3
- F src/vdbeaux.c b7c245fe73ed15090cf626f1250dcb7cdcfb1bd6
++F src/vdbeaux.c 2803275ce14795549fd86a03474cac80f549a569
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c fb0ac964ccbcd94f595eb993c05bfd9c52468a4a
  F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
  F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
@@@ -516,10 -505,11 +517,11 @@@ F test/fuzz2.test 207d0f9d06db3eaf47a6b
  F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5
  F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
  F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
- F test/fuzzer1.test ddfb04f3bd5cfdda3b1aa15b78d3ad055c9cc50f
+ 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 19b642bb134308980a92249750ea4ce3f6c75c2d
+ F test/in.test a7b8a0f43da81cd08645b7a710099ffe9ad1126b
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
  F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
  F test/in4.test 64f3cc1acde1b9161ccdd8e5bde3daefdb5b2617
@@@ -645,8 -635,8 +647,8 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test ab9fbb673617734869af2fc4cbdb04baa3339d1c
- F test/pragma.test 7fa35e53085812dac94c2bfcbb02c2a4ad35df5e
 -F test/permutations.test 2b5a1b64a8e5114757457fbce9010387d1fe7682
++F test/permutations.test 24f0e5141b6aea74d023ac1d688c78df845d02dc
+ F test/pragma.test f11c59ec935a52edb4d3d5676d456588121fcefa
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -688,11 -678,10 +690,11 @@@ F test/select8.test 391de11bdd52339c305
  F test/select9.test 74c0fb2c6eecb0219cbed0cbe3df136f8fbf9343
  F test/selectA.test 06d1032fa9009314c95394f2ca2e60d9f7ae8532
  F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
- F test/selectC.test f9bf1bc4581b5b8158caa6e4e4f682acb379fb25
+ F test/selectC.test 871fb55d884d3de5943c4057ebd22c2459e71977
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 +F test/session.test c1a17c11ef7d01c24fe2b9f7871190d949a8e718
  F test/shared.test 34945a516532b11182c3eb26e31247eee3c9ae48
- F test/shared2.test 8f71d4eb4d5261280de92284df74172545c852cc
+ F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test ebf77f023f4bdaa8f74f65822b559e86ce5c6257
  F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d
  F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
@@@ -1002,7 -992,7 +1005,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 2845654d425164de143e82b9fdb255d81a01af56 92131195d0c24c0116992db51ed5d8316626ba57
- R f655afae9aef18c1ea6dcf2304669fd0
 -P 4f34d7077b9acf7926c5e7375ca870d4ed3c60b9 f8e9c445dd358c40e5a7bf3756b9f291909dbea7
 -R 6e003d0f8aa6b8eacd50254a31c50e6a
 -U dan
 -Z c6f6d9c6291c4c182b564ddd4b9e0a68
++P 361fb66a799f4f253e61ca94d999accde2c75b2c 99a9073b5e411ce94f38ce49608baaa15de8b850
++R 73eef84d2253d0c1c19d15becb5073fc
 +U drh
- Z 91074916592f2b739d5ac72d0cab45cc
++Z 84b512c9c826efc22484fef61936c099

diff --cc manifest.uuid
index c689c5bd17f01bb7529bfe4c878f9b2fb7cf25c0,0025deab2917fa7a081ae79ec3c3cc3c5cf174af..dbe8f15c1f1479cf80b2d6b73ed1fac15cb240de
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 361fb66a799f4f253e61ca94d999accde2c75b2c
 -99a9073b5e411ce94f38ce49608baaa15de8b850
++ff86875ca35e04cea6c3d5e1b5117a4f227a6b15

diff --cc src/main.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/permutations.test
Simple merge