Update this branch with latest trunk changes.

FossilOrigin-Name: 9797482ded7de985e3b20aedec5e4d81f55065c8

diff --cc main.mk
Simple merge

diff --cc manifest
index 3007e261c87f1453ff13544cb8d2bef3f3136fb5,f62c28390317fa54df7318114418d99ca88c3944..151780783a521254d6ab4720879c9d4f6b8c91e2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Fix\sa\sproblem\sin\sfts5fault1.test.
- D 2015-04-21T20:13:38.631
 -C When\scompiling\sfor\sUAP,\slink\sagainst\sthe\snew\sminimal\sMSVC\sruntime.
 -D 2015-04-22T01:33:53.959
++C Update\sthis\sbranch\swith\slatest\strunk\schanges.
++D 2015-04-22T09:40:35.867
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
+ F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc cd626b52ebeec0e2c0dd929243bdd25b0df19a71
+ F Makefile.msc 32d8fe89ac5c130f9f14293fb4a59b120895c943
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
+ F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -78,9 -78,9 +78,9 @@@ F ext/fts3/README.content fdc666a70d525
  F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
  F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314
  F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
- F ext/fts3/fts3.c e2c7e61d676ce7b9383d1078c9774a2f22947d57
+ F ext/fts3/fts3.c 1b198ddb76cd706722dacbbaeb17a2fde6fca2cc
 -F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 +F ext/fts3/fts3.h 62a77d880cf06a2865052726f8325c8fabcecad7
- F ext/fts3/fts3Int.h 394858c12a17740f7a1f6bd372c4606d4425a8d1
+ F ext/fts3/fts3Int.h 3626655d6ba903a3919bb44e1c38e5f0f9d6be82
  F ext/fts3/fts3_aux.c 5c211e17a64885faeb16b9ba7772f9d5445c2365
  F ext/fts3/fts3_expr.c 40123785eaa3ebd4c45c9b23407cc44ac0c49905
  F ext/fts3/fts3_hash.c 29b986e43f4e9dd40110eafa377dc0d63c422c60
@@@ -199,9 -152,9 +199,9 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk e481861d67f0030e2c86ca947f4a7abaedaf696c
 -F main.mk 60aba7d38b9bd73e249693344dd8405aa24ac02a
++F main.mk 0bdbbda2133675d0624b333f55e5d38a46ece577
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
- F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
+ F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -242,8 -195,8 +242,8 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c 350c13b7a12bab4a502b361455ec3a0bba7b161c
- F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
 -F src/main.c 40e333960d53f7d50ee8ce09d40431c87ea653f2
++F src/main.c 43cb916046dc9dfde761380a764190a4a4223bc6
+ F src/malloc.c 6a370b83d54e4bbf6f94021221c2a311cff26a18
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -261,32 -214,32 +261,32 @@@ F src/os.c 8fd25588eeba74068d41102d2681
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c cc903ecc6ebda90ef703d043ddaa7f33de0cab0f
- F src/os_win.c 8223e7db5b7c4a81d8b161098ac3959400434cdb
+ F src/os_unix.c 5ed7e2e453c2980909a6b2c80dc55764b50819a8
+ F src/os_win.c 03d27be3a20048ef52a648d5f0a15f5edda9f2a3
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
+ F src/pager.c 5283581c8ce8950ff483a0b3a3cab9cb4d25a21e
  F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
- F src/parse.y 1299c66e7b1707322ccd8af43a359b8fb0d46d72
+ F src/parse.y c4e0387bc88c8e21e5ba653e2578959a1f3cdbc7
  F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
- F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf
- F src/pragma.c ac4f3f856b4234e85f55b0f069698a4766011100
+ F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9
+ F src/pragma.c c1f4d012ea9f6b1ce52d341b2cd0ad72d560afd7
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
- F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
- F src/printf.c 8da9a2687a396daa19860f4dc90975d319304744
+ F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3
+ F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
+ F src/resolve.c 53486a98c17b7ae09b8c2b398013e973ce4c1aae
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5
- F src/shell.c 9c1589c8271c04c02d23cdbc2c07bb40752fa9eb
- F src/sqlite.h.in c7c9111477b76c82c46bf851b619df4dd35cc095
+ F src/select.c 35433ea8894ac42594ddc31eb0165a6d6401cfe5
+ F src/shell.c 78eabce4c16c45e36fea2368f95118116399ba8a
+ F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h f2300529f3592323a98fd7acccec63d0e9082dc5
+ F src/sqliteInt.h 8abcea1295138f10ef8f7ed38db5f1b573b93ece
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
- F src/status.c 81712116e826b0089bb221b018929536b2b5406f
+ F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c a1c728bf8abe39b24ed16951c8e5ba004fe8803c
 -F src/tclsqlite.c 14f1992dd6100bfeb1a3dec7e7f449e1c814b8ee
++F src/tclsqlite.c 3d89752d9a58039c2e82412a85387fe49eec6f72
  F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
@@@ -334,27 -287,27 +334,27 @@@ F src/test_vfs.c 3b65d42e18b262805716bd
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
- F src/tokenize.c 05e52378c46efbc1fd63cbbbf7f3c555f840f4bf
- F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
+ F src/tokenize.c b7fb584c2be5ec39b6fdf04b185e7c6f33f8dc15
+ F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
  F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
- F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
- F src/vdbe.c bd793ed436edccaf264ec969ac92c9b5f4b41d64
- F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
- F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
+ F src/util.c a6431c92803b975b7322724a7b433e538d243539
+ F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
+ F src/vdbe.c f0cf3cf527d5a40b8d5d2324fdbb31da6c90cd8b
+ F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d
+ F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
  F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
- F src/vdbeaux.c 23390670e64f011f3fed8f38a2f25aaccacb74d2
+ F src/vdbeaux.c 03591cca98ec50e1493043f0ff7abbece0b9c83d
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
- F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
- F src/vdbesort.c 919717d7599fa31d343ec28bffd0f9e91a4ff5f6
- F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c 6206db6ca9eff2e7f0076816a8ff8a3c0bfd7a7b
+ F src/vdbemem.c b5256445b318b0f2b3bc429028469cfbb08f19a5
+ F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
+ F src/vdbetrace.c f95c2dff9041fcf07f871789c22ebb0648ea0b7c
 -F src/vtab.c 5f81f8a59c1f5ddb94c918f25ed5d83578fcc633
++F src/vtab.c fcbf338e0e8a91906aaf24bda8120e9f00cb4576
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 878c8e1a51cb2ec45c395d26b7d5cd9e1a098e4a
+ F src/wal.c 753995db83247f20361a8e8a874990b21a75abd9
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 85d832efa5ef57de542db7f430b72fecd3af8b38
+ F src/where.c 32fe265e3dc74ef3b27deb9e6eb5fc3c71409612
  F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -838,12 -794,12 +841,12 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1
 +F test/permutations.test 62ff8c49738c72a70b034ecc31957bee437f76ff
- F test/pragma.test ad99d05e411c7687302124be56f3b362204be041
+ F test/pragma.test be7195f0aa72bdb8a512133e9640ac40f15b57a2
  F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
- F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
- F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a
+ F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
+ F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
  F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
  F test/queryonly.test 5f653159e0f552f0552d43259890c1089391dcca
@@@ -1251,20 -1208,19 +1255,20 @@@ F tool/fuzzershell.c 00c12b1e95095f4398
  F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
  F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
  F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
- F tool/lemon.c 1864c4fe4a72b1bb28f1792b60504804fe82c5d2
+ F tool/lemon.c b9109f59b57e7b6f101c4fe644c8361ba6dee969
  F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 +F tool/loadfts.c 76b6589ab5efcdc9cfe16d43ab5a6c2618e44bd4
  F tool/logest.c eef612f8adf4d0993dafed0416064cf50d5d33c6
  F tool/mkautoconfamal.sh d1a2da0e15b2ed33d60af35c7e9d483f13a8eb9f
  F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c-noext.tcl 9ef48e1748dce7b844f67e2450ff9dfeb0fb4ab5
- F tool/mksqlite3c.tcl d7e4b042022fae78a70a8e64f534c1b22afd7c94
- F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
+ F tool/mksqlite3c-noext.tcl 69bae8ce4aa52d2ff82d4a8a856bf283ec035b2e
 -F tool/mksqlite3c.tcl 52a3352f7aa15f1db851e45ac3a5e2173d6fe93c
++F tool/mksqlite3c.tcl e3136f007fcdaac00c207306ef4b352ca87bf9af
+ F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
- F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
+ F tool/mkvsix.tcl 3b58b9398f91c7dbf18d49eb87cefeee9efdbce1
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1294,7 -1252,7 +1300,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P e50e8031d6f804ebe50e0eec9a8b6e7f0152ecc3
- R 60eea8ec1517faa88921988ca09638c5
 -P 623ddbdbf48d26dac58c593bcb9e7b184334ddfc
 -R 647b9c5f348c3c64b56250400a815823
 -U mistachkin
 -Z 2676785d203eabdaf7fb118930189562
++P a21d60cb2ac6463c012d82d1970d90da5da2a14a 2cb945116e7a5b78741b19839899826b539d5868
++R ce8dc868a2df13b90cea4f2e6b631af2
 +U dan
- Z b632ef0339d92005d6b22a3d7746ce59
++Z da83630e09cb54023a2663ea2cafcf24

diff --cc manifest.uuid
index e8e16db49a68fb10dc591e3b893198eaf977d281,9362726267d8c328c7c37b17f244d6995efa9f7e..98e5186972b5bc97e801a0be027efdff5d452f19
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a21d60cb2ac6463c012d82d1970d90da5da2a14a
 -2cb945116e7a5b78741b19839899826b539d5868
++9797482ded7de985e3b20aedec5e4d81f55065c8

diff --cc src/main.c
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/vtab.c
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge