Merge trunk changes with this branch.

FossilOrigin-Name: 142743918fd5a6d79fa10c44398360c3684a255a

diff --cc main.mk
Simple merge

diff --cc manifest
index d7abe658959f08311ebb5fa6e1b9bcbf0c5c9ca4,75771530bb950f471c894c08cc0214d4ad0ff7b6..e4061e619c259883362d97e89a78a652a0f09047
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C When\sscanning\sthe\sfull-text\sindex\sas\spart\sof\sthe\sfts5\sintegrity-check,\salso\srun\sa\spoint\squery\sfor\severy\sterm\sand\sverify\sthat\sthese\sresults\sare\sconsistent\swith\sthose\sfound\sby\sthe\slinear\sscan.
- D 2015-03-21T15:37:19.761
 -C Remove\san\sunreachable\sbranch\sfrom\sthe\sOP_VCreate\sopcode\s(merge\saccidental\sfork\sin\strunk).
 -D 2015-03-21T12:25:23.115
++C Merge\strunk\schanges\swith\sthis\sbranch.
++D 2015-03-21T15:45:24.062
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
+ F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 1edfd7dd45d98a04f9a2fa81a01c49faeb628578
+ F Makefile.msc cd626b52ebeec0e2c0dd929243bdd25b0df19a71
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION d846487aff892625eb8e75960234e7285f0462fe
+ F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -78,8 -78,8 +78,8 @@@ 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 56a78f7e65e9e59bd0e75a1e10ce406f62034ca8
+ F ext/fts3/fts3.c e2c7e61d676ce7b9383d1078c9774a2f22947d57
 -F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 +F ext/fts3/fts3.h 62a77d880cf06a2865052726f8325c8fabcecad7
  F ext/fts3/fts3Int.h 394858c12a17740f7a1f6bd372c4606d4425a8d1
  F ext/fts3/fts3_aux.c 5c211e17a64885faeb16b9ba7772f9d5445c2365
  F ext/fts3/fts3_expr.c 40123785eaa3ebd4c45c9b23407cc44ac0c49905
@@@ -96,58 -96,13 +96,58 @@@ F ext/fts3/fts3_tokenizer.h 64c6ef6c527
  F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
  F ext/fts3/fts3_unicode.c a93f5edc0aff44ef8b06d7cb55b52026541ca145
  F ext/fts3/fts3_unicode2.c c3d01968d497bd7001e7dc774ba75b372738c057
- F ext/fts3/fts3_write.c 9b3a32cbecf40a1f41cb08c00df8c066c23c7a25
+ F ext/fts3/fts3_write.c 7104ec015474ee61a8a570349b925f35c6b0a294
  F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
  F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
- F ext/fts3/tool/fts3view.c 3986531f2fc0ceca0c89c31ec7d0589b6adb19d6
+ F ext/fts3/tool/fts3view.c 8e53d0190a7b3443764bbd32ad47be2bd852026d
  F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c
  F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
 -F ext/fts3/unicode/mkunicode.tcl a2567f9d6ad6779879a2e394c120ad8718557e65
 +F ext/fts3/unicode/mkunicode.tcl 159c1194da0bc72f51b3c2eb71022568006dc5ad
 +F ext/fts5/extract_api_docs.tcl 55a6d648d516f35d9a1e580ac00de27154e1904a
 +F ext/fts5/fts5.c 1eb8ca073be5222c43e4eee5408764c2cbb4200b
 +F ext/fts5/fts5.h 24a2cc35b5e76eec57b37ba48c12d9d2cb522b3a
 +F ext/fts5/fts5Int.h 8d09f7894e83b00a18a7e2149354a153904002df
 +F ext/fts5/fts5_aux.c fcea18b1a2a3f95a498b52aba2983557d7678a22
 +F ext/fts5/fts5_buffer.c 29f79841bf6eef5220eef41b122419b1bcb07b06
 +F ext/fts5/fts5_config.c 0847facc8914f57ea4452c43ce109200dc65e894
 +F ext/fts5/fts5_expr.c 5215137efab527577d36bdf9e44bfc2ec3e1be98
 +F ext/fts5/fts5_hash.c 9959b5408f649487d4b0ee081416f37dc3cd8cdd
 +F ext/fts5/fts5_index.c 4adc5e18ab6d0648faeb18f18a89d6aec57d77be
 +F ext/fts5/fts5_storage.c ac0f0937059c8d4f38a1f13aa5f2c2cd7edf3e0d
 +F ext/fts5/fts5_tcl.c 617b6bb96545be8d9045de6967c688cd9cd15541
 +F ext/fts5/fts5_tokenize.c c07f2c2f749282c1dbbf46bde1f6d7095c740b8b
 +F ext/fts5/fts5_unicode2.c f74f53316377068812a1fa5a37819e6b8124631d
 +F ext/fts5/fts5parse.y 777da8e5819f75c217982c79c29d014c293acac9
 +F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
 +F ext/fts5/test/fts5_common.tcl d9ea79fdbc9ecbb3541bf89d13ee0e03a8dc3d32
 +F ext/fts5/test/fts5aa.test 065767c60ad301f77ad95f24369305e13347aa00
 +F ext/fts5/test/fts5ab.test 5da2e92a8047860b9e22b6fd3990549639d631b1
 +F ext/fts5/test/fts5ac.test 8b3c2938840da8f3f6a53b1324fb03e0bac12d1e
 +F ext/fts5/test/fts5ad.test 2141b0360dc4397bfed30f0b0d700fa64b44835d
 +F ext/fts5/test/fts5ae.test 9175201baf8c885fc1cbb2da11a0c61fd11224db
 +F ext/fts5/test/fts5af.test c2501ec2b61d6b179c305f5d2b8782ab3d4f832a
 +F ext/fts5/test/fts5ag.test ec3e119b728196620a31507ef503c455a7a73505
 +F ext/fts5/test/fts5ah.test 56b5a2599707621bf2fd1b5a00ddc0c0c1ffbf06
 +F ext/fts5/test/fts5ai.test f20e53bbf0c55bc596f1fd47f2740dae028b8f37
 +F ext/fts5/test/fts5aj.test 05b569f5c16ea3098fb1984eec5cf50dbdaae5d8
 +F ext/fts5/test/fts5ak.test 7b8c5df96df599293f920b7e5521ebc79f647592
 +F ext/fts5/test/fts5al.test 6a5717faaf7f1e0e866360022d284903f3a4eede
 +F ext/fts5/test/fts5auxdata.test c69b86092bf1a157172de5f9169731af3403179b
 +F ext/fts5/test/fts5content.test 8dc302fccdff834d946497e9d862750ea87d4517
 +F ext/fts5/test/fts5corrupt.test 78eb076867e750a013b46b3bc06065870bc93c22
 +F ext/fts5/test/fts5ea.test 04695560a444fcc00c3c4f27783bdcfbf71f030c
 +F ext/fts5/test/fts5eb.test 728a1f23f263548f5c29b29dfb851b5f2dbe723e
 +F ext/fts5/test/fts5fault1.test fbd8612889234849ff041f5b36f8e390feeed46e
 +F ext/fts5/test/fts5near.test 3f9f64e16cac82725d03d4e04c661090f0b3b947
 +F ext/fts5/test/fts5optimize.test 0028c90a7817d3e576d1148fc8dff17d89054e54
 +F ext/fts5/test/fts5porter.test 50322599823cb8080a99f0ec0c39f7d0c12bcb5e
 +F ext/fts5/test/fts5prefix.test 4610dfba4460d92f23a8014874a46493f1be77b5
 +F ext/fts5/test/fts5rebuild.test 2a5e98205393487b4a732c8290999af7c0b907b4
 +F ext/fts5/test/fts5rowid.test a1b2a6d76648c734c1aab11ee1a619067e8d90e6
 +F ext/fts5/test/fts5tokenizer.test b34ae592db66f6e89546d791ce1f905ba0b3395c
 +F ext/fts5/test/fts5unicode.test 79b3e34eb29ce4929628aa514a40cb467fdabe4d
 +F ext/fts5/test/fts5unicode2.test 64a5267fd6082fcb46439892ebd0cbaa5c38acee
 +F ext/fts5/tool/loadfts5.tcl 1e126891d14ab85dcdb0fac7755a4cd5ba52e8b8
  F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
  F ext/icu/icu.c d415ccf984defeb9df2c0e1afcfaa2f6dc05eacb
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
@@@ -197,7 -152,7 +197,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 784b787dbf04af12581b53ceca57116a2bd355e6
 -F main.mk 04c49c495795b18a7b70053eef285be1e4d43fa4
++F main.mk e481861d67f0030e2c86ca947f4a7abaedaf696c
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -240,7 -195,7 +240,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c fe876f31d6744341d9e2de4da66f33563edec9cb
 -F src/main.c fa997fa27d95febc16d57095299384b667a7f762
++F src/main.c 350c13b7a12bab4a502b361455ec3a0bba7b161c
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -264,26 -219,27 +264,27 @@@ F src/os_win.c 8223e7db5b7c4a81d8b16109
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
  F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
  F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
- F src/parse.y c5d0d964f9ac023e8154cad512e54b0b6058e086
- F src/pcache.c d210cf90d04365a74f85d21374dded65af67b0cb
+ F src/parse.y 1299c66e7b1707322ccd8af43a359b8fb0d46d72
+ F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf
- F src/pragma.c ba149bbbc90783f84815636c509ced8eac11bbcf
+ F src/pragma.c ac4f3f856b4234e85f55b0f069698a4766011100
+ F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
  F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
- F src/printf.c 05edc41450d0eb2c05ef7db113bf32742ae65325
+ F src/printf.c 8da9a2687a396daa19860f4dc90975d319304744
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
+ F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 1f2087523007c42900ffcbdeaef06a23ad9329fc
- F src/shell.c 22b4406b0b59efd14b3b351a5809dda517df6d30
- F src/sqlite.h.in 54678c21401909f72b221344dd560d285a1ba5eb
+ F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5
+ F src/shell.c 9c1589c8271c04c02d23cdbc2c07bb40752fa9eb
+ F src/sqlite.h.in c7c9111477b76c82c46bf851b619df4dd35cc095
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h c4e05f7489cd300f856e2283d5e61302ce826471
- F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
+ F src/sqliteInt.h f2300529f3592323a98fd7acccec63d0e9082dc5
+ F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c d2a15339103ff7c61ab7766ea8f4f549997e6590
 -F src/tclsqlite.c fa72a7c5278662357c105ba7925c1d0972506ff9
++F src/tclsqlite.c a1c728bf8abe39b24ed16951c8e5ba004fe8803c
  F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
@@@ -295,14 -251,14 +296,14 @@@ F src/test8.c 610e3d523018ca63b08081795
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
- F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
+ F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 0f5843ef860a6d8381c1d4aafed4f74080584732
- F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
 -F src/test_config.c c2d3ff6c129d50183900c7eff14158ff7e9b3f03
++F src/test_config.c ca734889a4ece295d3ed129dc532f7fefc63711d
+ F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
- F src/test_func.c 14e543ae4d905ee31dc322b2f8d31bfac1769d45
+ F src/test_func.c f1ac201465472e76a73e2f3695c3553c63e7322a
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
  F src/test_init.c 66b33120ffe9cd853b5a905ec850d51151337b32
  F src/test_intarray.c 6c610a21ab8edde85a3a2c7f2b069244ecf4d834
@@@ -336,22 -292,23 +337,23 @@@ F src/trigger.c 25571661fdeae8c7f975ff4
  F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
- F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
- F src/vdbe.c ddfc977981cd6324668aa6b114045eb1c677421a
+ F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
+ F src/vdbe.c bd793ed436edccaf264ec969ac92c9b5f4b41d64
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
- F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
- F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
- F src/vdbeaux.c 97911edb61074b871ec4aa2d6bb779071643dee5
- F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
- F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
- F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
+ F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
+ F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
+ F src/vdbeaux.c 23390670e64f011f3fed8f38a2f25aaccacb74d2
+ F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
+ F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
+ F src/vdbesort.c 919717d7599fa31d343ec28bffd0f9e91a4ff5f6
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c ec672a0b5d507f24b9294c0696dbd2fd2ce9b122
- F src/wal.c 39303f2c9db02a4e422cd8eb2c8760420c6a51fe
 -F src/vtab.c 1680f58978ae014a331d99b4c87316d079056c5e
++F src/vtab.c 6206db6ca9eff2e7f0076816a8ff8a3c0bfd7a7b
+ F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
+ F src/wal.c 878c8e1a51cb2ec45c395d26b7d5cd9e1a098e4a
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c d46de821bc604a4fd36fa3928c086950e91aafb1
- F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
+ F src/where.c 85d832efa5ef57de542db7f430b72fecd3af8b38
+ F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -767,9 -728,9 +773,9 @@@ F test/mallocG.test 0ff91b65c50bdaba680
  F test/mallocH.test 79b65aed612c9b3ed2dcdaa727c85895fd1bfbdb
  F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
- F test/mallocK.test 223cc80c870c80d4a9c2014e94133efdf0123f82
+ F test/mallocK.test da01dcdd316767b8356741f8d33a23a06a23def5
  F test/mallocL.test 252ddc7eb4fbf75364eab17b938816085ff1fc17
 -F test/malloc_common.tcl 3663f9001ce3e29bbaa9677ffe15cd468e3ec7e3
 +F test/malloc_common.tcl a644f12e2da20ddfabb8bd077ec610a44113450e
  F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
  F test/memdb.test fcb5297b321b562084fc79d64d5a12a1cd2b639b
@@@ -830,9 -791,9 +836,9 @@@ 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 aa16dedfe01c02c8895169012f7dfde9c163f0d5
- F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
+ F test/pragma.test ad99d05e411c7687302124be56f3b362204be041
+ F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a
@@@ -1248,10 -1210,10 +1256,10 @@@ F tool/logest.c eef612f8adf4d0993dafed0
  F tool/mkautoconfamal.sh d1a2da0e15b2ed33d60af35c7e9d483f13a8eb9f
  F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 07a5124cf2dbafa1b375eefcf8ac4227028b0f8b
+ F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 9ef48e1748dce7b844f67e2450ff9dfeb0fb4ab5
- F tool/mksqlite3c.tcl ce1e8a27ecf2d20194325237a3bba6b40e7eed3b
 -F tool/mksqlite3c.tcl 95ab31eda659e7ffb091e04bd83178f260d8edfd
++F tool/mksqlite3c.tcl d7e4b042022fae78a70a8e64f534c1b22afd7c94
  F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
@@@ -1284,7 -1246,7 +1292,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 f5db489250029678fce845dfb2b1109fde46bea5
- R 258f390b03b29f1c61f33d36002f03e9
 -P e3e234649616f20610abce9ae9da1c572d3a4377 5fca41a3811766b48f5f23d5d49cc4e6e79fa867
 -R f330fb6722b7e402dae00a81353077df
++P ce972f6aab90f6929d018696f1ab3c2649eca802 2fbfec62fc03d42ee240dfefaa0aeb59a3f04d88
++R ac1096479f46553b83d75e58159a61e7
  U dan
- Z 6cf104c99eec6cd34913e25fa048b8ab
 -Z 1c256b7cca05bea8c4676944e04ddeb4
++Z 4a4a23e7de895ef00eee4c91a114f586

diff --cc manifest.uuid
index f5fccf09fafcfec1a5ed9e473ebcac31cc1ae43e,d71396b19d36d66280bda95c815abf42f7274821..5171b9525eaf9ab33ddec9363de733decc8b2b1a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ce972f6aab90f6929d018696f1ab3c2649eca802
 -2fbfec62fc03d42ee240dfefaa0aeb59a3f04d88
++142743918fd5a6d79fa10c44398360c3684a255a

diff --cc src/main.c
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vtab.c
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge