Merge latest trunk changes into this branch.

FossilOrigin-Name: d17231b63d48c1f9c4dee109c90cec112e2f0fd4

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
index a864bebee36d14dae6cbe936d924b4362e68e073,5d6460b7d573599cd9d4591bbfbb8727afe52d35..226d464785dee7fe64b007626240c5fdf57bce15
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -388,11 -562,11 +562,11 @@@ LIBOBJS0 = vdbe.lo parse.lo alter.lo an
           memjournal.lo \
           mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
           notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
-          pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
+          pager.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
           random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
 -         table.lo tokenize.lo trigger.lo \
 +         table.lo threads.o tokenize.lo trigger.lo \
           update.lo util.lo vacuum.lo \
-          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
+          vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
           vdbetrace.lo wal.lo walker.lo where.lo utf.lo vtab.lo
  
  # Object files for the amalgamation.

diff --cc main.mk
index a38208b663c608e10a6f20dd7fdef19caf110c1a,ebd508a279f68637ed7ecd455df7214858233d72..8793a282ee2434aa36fdf99481628fbe3a98d1d6
--- 1/main.mk
--- 2/main.mk
+++ b/main.mk
@@@ -62,11 -64,11 +64,11 @@@ LIBOBJ+= vdbe.o parse.o 
           memjournal.o \
           mutex.o mutex_noop.o mutex_unix.o mutex_w32.o \
           notify.o opcodes.o os.o os_unix.o os_win.o \
-          pager.o parse.o pcache.o pcache1.o pragma.o prepare.o printf.o \
+          pager.o pcache.o pcache1.o pragma.o prepare.o printf.o \
           random.o resolve.o rowset.o rtree.o select.o status.o \
 -         table.o tokenize.o trigger.o \
 +         table.o threads.o tokenize.o trigger.o \
           update.o util.o vacuum.o \
-          vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o vdbesort.o \
+          vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o vdbesort.o \
         vdbetrace.o wal.o walker.o where.o utf.o vtab.o
  
  

diff --cc manifest
index 401aeb8a57058b47c6499f058dc44bb00964edb2,66dfec84b5b286254e4bf0b863d3a92019e3f44e..4f0c8a0be4cc716c637fe32d3ef3459292c08b1f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,14 -1,14 +1,14 @@@
- C Cherry-pick\s[555fc07]:\s\nChanges\sto\sthe\sthread\sroutines\sto\sdisable\sthem\swhen\sthreading\sis\sturned\noff\susing\ssqlite3_config().\s\sAlso\smerge\sall\srecent\strunk\schanges.
- D 2012-08-21T17:36:44.651
 -C Fix\san\sobscure\sbug\scausing\ssqlite3_close()\sto\sfail\sif\sthere\sare\svirtual\stables\son\sthe\sdisconnect\slist\swhen\sit\sis\scalled.
 -D 2014-03-12T19:38:38.004
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2014-03-13T15:41:09.146
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in adec39f15a9c7000f634b87a535b95279b0cbd09
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
++F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc d2f83cd5e74d54f9e3bcd7a505ca5b356d7e7c68
- F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
- F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION a71848df48082f1d6585d4b0819d530fc455485d
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
++F Makefile.msc 153eb9b9725bc7b8e4dbe963219298e0c4a644b0
+ F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 -F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
++F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8 w README
+ F VERSION c3b0d47c3c5cf25c5bd4ff9e6f3af2f9d7934ea6
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
- F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
+ F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
@@@ -78,14 -102,27 +102,27 @@@ F ext/fts3/mkfts3amal.tcl 252ecb7fe6467
  F ext/fts3/tool/fts3view.c 6cfc5b67a5f0e09c0d698f9fd012c784bfaa9197
  F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c
  F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
- F ext/fts3/unicode/mkunicode.tcl 7a9bc018e2962abb79563c5a39fe581fcbf2f675
- F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
- F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a
+ F ext/fts3/unicode/mkunicode.tcl dc6f268eb526710e2c6e496c372471d773d0c368
+ F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
+ F ext/icu/icu.c d415ccf984defeb9df2c0e1afcfaa2f6dc05eacb
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 -F ext/misc/fuzzer.c 136533c53cfce0957f0b48fa11dba27e21c5c01d
+ F ext/misc/amatch.c 678056a4bfcd83c4e82dea81d37543cd1d6dbee1
+ F ext/misc/closure.c 636024302cde41b2bf0c542f81c40c624cfb7012
 -F ext/misc/spellfix.c 93f3961074cebe63c31fcefe62ca2a032ee8dfed
++F ext/misc/fuzzer.c 136533c53cfce0957f0b48fa11dba27e21c5c01d w src/test_fuzzer.c
+ F ext/misc/ieee754.c b0362167289170627659e84173f5d2e8fee8566e
+ F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
+ F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63
+ F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
+ F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a
 -F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
++F ext/misc/spellfix.c 93f3961074cebe63c31fcefe62ca2a032ee8dfed w src/test_spellfix.c
+ F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
+ F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
+ F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e
++F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212 w src/test_wholenumber.c
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c d17aecb7a92762efa7b1f5d5fd7c88fd77d70827
+ F ext/rtree/rtree.c 2d9f95da404d850474e628c720c5ce15d29b47de
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
- F ext/rtree/rtree1.test e474a2b5eff231496dbd073fe67e5fbaf7f444c9
+ F ext/rtree/rtree1.test cf679265ecafff494a768ac9c2f43a70915a6290
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
  F ext/rtree/rtree3.test a494da55c30ee0bc9b01a91c80c81b387b22d2dc
  F ext/rtree/rtree4.test c8fe384f60ebd49540a5fecc990041bf452eb6e0
@@@ -103,171 -142,178 +142,179 @@@ F ext/rtree/tkt3363.test 142ab96eded44a
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk a463acdf2898fed3ccd716ece9d3c5d28450c852
- F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
- F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
- F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
- F mkopcodec.awk f6fccee29e68493bfd90a2e0466ede5fa94dd2fc
- F mkopcodeh.awk 29b84656502eee5f444c3147f331ee686956ab0e
+ F magic.txt f439556c5ce01ced70987e5ee86549a45165d9ff
 -F main.mk 3ae543fa446525c1dec55f58de67f41b78651812
++F main.mk 4b30dd2a6cb441db688972496b45a6c3abef8b20
+ F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
+ F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
- F publish.sh 313c5b2425f2cf5e547db7549a9796acc4508f22
- F publish_osx.sh 2ad2ee7d50632dff99949edc9c162dbb052f7534
+ F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
+ F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
+ F mptest/crash01.test cce8e306d8596d5a2e497e27112dae1f6e5e3538
+ F mptest/crash02.subtest f4ef05adcd15d60e5d2bd654204f2c008b519df8
+ F mptest/mptest.c 499a74af4be293b7c1c7c3d40f332b67227dd739
+ F mptest/multiwrite01.test 499ad0310da8dff8e8f98d2e272fc2a8aa741b2e
  F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
- F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
- F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
- F src/alter.c 149cc80d9257971b0bff34e58fb2263e01998289
- F src/analyze.c 7553068d21e32a57fc33ab6b2393fc8c1ba41410
- F src/attach.c 577bf5675b0c50495fc28549f2fcbdb1bac71143
+ F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
+ F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
+ F src/alter.c 5d99edbac5bc416032772b723ee30182ee6e5de0
+ F src/analyze.c 663e0b291d27eb03c9fd6b421e2d61ba348a2389
+ F src/attach.c 3801129015ef59d76bf23c95ef9b0069d18a0c52
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
- F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
+ F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
+ F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 32dc63ef18c6a8d448c37c030ced70cf23ccad75
- F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
- F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
- F src/build.c 196734374128023e414a818f2051d836badb3526
- F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
+ F src/btree.c 4d28fb15543f0e071b1780b2af8cd2ee489de32d
+ F src/btree.h 9e0f97c01b972f779eb7655cfb4f8727fd6dc26f
+ F src/btreeInt.h 0be66063468a520e4d66b80c7a1dc26d04ee6ea4
+ F src/build.c 0d50ef95aad63f4c4fc47f3fa2670d4557c45db0
+ F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 500d019da966631ad957c37705642be87524463b
- F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
- F src/expr.c e2927abf9c69ce4ff9a931bd201946961c34819a
+ F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
+ F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
+ F src/delete.c cdd57149543bb28304d8f717c243f2a86b1fc280
+ F src/expr.c 014b8087a15c4c314bdd798cb1cb0b32693f8b40
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
- F src/func.c 18dfedfb857e100b05755a1b12e88b389f957879
- F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
- F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
- F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
+ F src/fkey.c 5269ef07b100763134f71b889327c333bd0989cf
+ F src/func.c 2945bb2c4cdc0ac43733046285a4434310be1811
+ F src/global.c 1d7bb7ea8254ae6a68ed9bfaf65fcb3d1690b486
+ F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
+ F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 770ed633830fb49d73d90c3fdf20b703973e1e84
- F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
- F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
- F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
- F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c 02255cf1da50956c5427c469abddb15bccc4ba09
- F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
+ F src/insert.c d8bb30535c8c0785876025a4a07f9074640a15d1
+ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
+ F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
+ F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
+ F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
+ F src/main.c 691b25754bef596108fe60ff1bcbe8445369c9db
+ F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
- F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
+ F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
+ F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
- F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
- F src/memjournal.c 0ebce851677a7ac035ba1512a7e65851b34530c6
+ F src/mem5.c aeb019f271ea53de83d651ec526877e6ba863450
+ F src/memjournal.c 0683aac6cab6ec2b5374c0db37c0deb2436a3785
  F src/mutex.c d3b66a569368015e0fcb1ac15f81c119f504d3bc
  F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
  F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
- F src/mutex_w32.c 32a9b3841e2d757355f0012b860b1bc5e01eafa0
+ F src/mutex_w32.c 6108c88e1cb38d8fbb3534b170793815cbedbf97
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
- F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
- F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
+ F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
+ F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
- F src/os_unix.c b5149a3343a6acd6c9df4e3acf5085a6501c1f68
- F src/os_win.c a7878531bf2c592218266f139d152cbe648fcc05
- F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78
- F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
- F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
- F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
- F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
- F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9
- F src/pragma.c 97f9357f0e7e5fb46a2519f14539550aa07db49f
- F src/prepare.c 33291b83cca285718048d219c67b8298501fa3a5
- F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
- F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
- F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
- F src/select.c a365da6d7a6d7d8a10ad60ca71837ab5e9369466
- F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
- F src/sqlite.h.in f664797c68ced43c2ea2c541d4ec8e1e04ec68ac
- F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 1ef5f8b64d204fe5deec83c58297493b2f5fbfa0
+ F src/os_unix.c 18f7f95dc6bcb9cf4d4a238d8e2de96611bc2ae5
 -F src/os_win.c e71678ac927d0a0fb11d993db20a9748eabf808e
++F src/os_win.c 8245fe9184300e641d02e29a8ca95cefe0cb0fd0
+ F src/pager.c 97a8908bf4e6e7c3adea09d3597cfa48ae33ab4e
+ F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
+ F src/parse.y 2613ca5d609c2f3d71dd297351f010bcec16e1e0
+ F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
+ F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
+ F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c
+ F src/pragma.c e78b4bf2a267de2c17ee09f90b6807cf8d40e6a3
+ F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
+ F src/printf.c 85d07756e45d7496d19439dcae3e6e9e0090f269
+ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
+ F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
+ F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
+ F src/select.c 0adf172d33cc610ff5ffe26edfd2ba67c3551655
+ F src/shell.c bab4de12b441369491812ecc93212ff4deda68fa
+ F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
+ F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
+ F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h fa7161b3de18a9c355d4148233f3563c92311fcc
++F src/sqliteInt.h 5b4df32250dd7bd94569ef36d2a667c1e91247d6
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
+ F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c fe5406573e1527957e00dcaf51edd9d8bd31b918
- F src/test1.c 3d70f7c5987f186884cfebbfa7151a7d3d67d86e
- F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
- F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
- F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
- F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013
- F src/test6.c 417e1e214734393c24a8ee80b41485a9c4169123
- F src/test7.c 2e0781754905c8adc3268d8f0967e7633af58843
- F src/test8.c 8bcce65e5ee027fbfd7da41d28371aabbfd369ff
+ F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
+ F src/test1.c 2401eee14a4309a7cfe2aeb2f30ad517a1d9c299
+ F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
+ F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
+ F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
+ F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
+ F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
+ F src/test7.c 72b732baa5642f795655ba1126ea032af46ecfd2
+ F src/test8.c 54ccd7b1df5062f0ecbf50a8f7b618f8b1f13b20
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
- F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
- F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
- F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
+ F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
+ F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
+ F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
  F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
- F src/test_config.c 09781397ccc24268cb895be0d4c21b4aad651486
- F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
+ F src/test_config.c 0336e0bdbe541b4af89d7e3dd0656e8e6b51e585
+ F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
- F src/test_func.c 3a8dd37c08ab43b76d38eea2836e34a3897bf170
- F src/test_fuzzer.c 1d26aa965120420bc14807da29d4d4541bfa6148
+ F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
+ F src/test_func.c d3013ce36f19ac72a99c73864930fd1fa41832f8
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
- F src/test_init.c 3cbad7ce525aec925f8fda2192d576d47f0d478a
- F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99
- F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
+ F src/test_init.c 66b33120ffe9cd853b5a905ec850d51151337b32
+ F src/test_intarray.c 87847c71c3c36889c0bcc9c4baf9d31881665d61
+ F src/test_intarray.h 2ece66438cfd177b78d1bfda7a4180cd3a10844d
  F src/test_journal.c f5c0a05b7b3d5930db769b5ee6c3766dc2221a64
- F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
- F src/test_malloc.c 3f5903a1528fd32fe4c472a3bd0259128d8faaef
- F src/test_multiplex.c ac0fbc1748e5b86a41a1d7a84654fae0d53a881d
- F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
- F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
+ F src/test_loadext.c a5251f956ab6af21e138dc1f9c0399394a510cb4
+ F src/test_malloc.c 1ff5b1243d96124c9a180f3b89424820a1f337f3
+ F src/test_multiplex.c 9f304bf04170c91c0318238d512df2da039eb1c8
+ F src/test_multiplex.h 110a8c4d356e0aa464ca8730375608a9a0b61ae1
+ F src/test_mutex.c 293042d623ebba969160f471a82aa1551626454f
  F src/test_onefile.c 0396f220561f3b4eedc450cef26d40c593c69a25
  F src/test_osinst.c 90a845c8183013d80eccb1f29e8805608516edba
  F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
- F src/test_quota.c 8ab295092c70903ca6f3209fa4c75f5cb6c1bf8e
+ F src/test_quota.c 30c64f0ef84734f2231a686df41ed882b0c59bc0
  F src/test_quota.h 8761e463b25e75ebc078bd67d70e39b9c817a0cb
- F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
- F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
- F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
- F src/test_spellfix.c fa83c9b4c4bdd1d41be4ad1e9241bf5a4fc9190f
- F src/test_stat.c d1569c7a4839f13e80187e2c26b2ab4da2d03935
+ F src/test_rtree.c f3d1d12538dccb75fd916e3fa58f250edbdd3b47
+ F src/test_schema.c cd12a2223c3a394f4d07bb93bdf6d344c5c121b6
+ F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
+ F src/test_sqllog.c c1c1bbedbcaf82b93d83e4f9dd990e62476a680e
+ F src/test_stat.c 9898687a6c2beca733b0dd6fe19163d987826d31
  F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
- F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
+ F src/test_syscall.c 16dbe79fb320fadb5acd7a0a59f49e52ab2d2091
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
- F src/test_thread.c e286f2173563f2a1747c24bcda6b9d030bf4f4e4
- F src/test_vfs.c c6260ef238c1142c8f8bd402db02216afd182ae3
- F src/test_vfstrace.c 6b28adb2a0e8ecd0f2e3581482e1f658b11b4067
- F src/test_wholenumber.c 3d2b9ed1505c40ad5c5ca2ad16ae7a289d6cc251
+ F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb
+ F src/test_vfs.c e72f555ef7a59080f898fcf1a233deb9eb704ea9
+ F src/test_vfstrace.c 3a0ab304682fecbceb689e7d9b904211fde11d78
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
- F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
- F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
- F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
- F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
- F src/vacuum.c 587a52bb8833d7ac15af8916f25437e2575028bd
- F src/vdbe.c 75da79cdcd58481825a06f045bc2f5ea3966eeae
- F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
- F src/vdbeInt.h 986b6b11a13c517337355009e5438703ba5b0a40
- F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
- F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
- F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
- F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
- F src/vdbesort.c 0dc1b274dcb4d4c8e71b0b2b15261f286caba39b
- F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
- F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
- F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
- F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
- F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 24c7494d8875ead994b4dfe5461340c27fd424ca
- F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 +F src/threads.c 2b918d1f4f0b0831e8f41c49bcaa097f01490120
+ F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
+ F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
+ F src/update.c 5b3e74a03b3811e586b4f2b4cbd7c49f01c93115
+ F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
+ F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
+ F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
+ F src/vdbe.c 5f0fffa9bf49a90c05dc3d46d8217603fd0ee00e
+ F src/vdbe.h fb2c48c198300a7c632f09fc940011d2ad2fc2ae
+ F src/vdbeInt.h e54fc4f289fce48e81b3371128446033d097733b
+ F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
+ F src/vdbeaux.c e45e3f9daf38c5be3fd39e9aacc1c9066af57a06
+ F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
+ F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
+ F src/vdbesort.c 46801acb342e5e4c07ba1777fe58880c143abb59
+ F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
+ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
+ F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
+ F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
+ F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
+ F src/where.c bb50b5aed4f9b2284eb92c944253e60df2fb8259
+ F src/whereInt.h 921f935af8b684ffb49705610bda7284db1db138
+ F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
+ F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
- F test/all.test 52fc8dee494092031a556911d404ca30a749a30b
- F test/alter.test 57d96ec9b320bd07af77567034488dcb6642c748
+ F test/all.test 6ff7b43c2b4b905c74dc4a813d201d0fa64c5783
+ F test/alter.test e88dfa77e020c2b48e52a8020c70171ab828e079
  F test/alter2.test 7ea05c7d92ac99349a802ef7ada17294dd647060
  F test/alter3.test 49c9d9fba2b8fcdce2dedeca97bbf1f369cc548d
- F test/alter4.test b2debc14d8cbe4c1d12ccd6a41eef88a8c1f15d5
+ F test/alter4.test d6c011fa0d6227abba762498cafbb607c9609e93
  F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
- F test/analyze.test f8ab7d15858b4093b06caf5e57e2a5ff7104bdae
- F test/analyze3.test c3c7f6c3951900c188cf94b2d5ee3246d6b3ff89
- F test/analyze4.test 757b37875cf9bb528d46f74497bc789c88365045
- F test/analyze5.test 713354664c5ff1853ab2cbcb740f0cf5cb7c802e
- F test/analyze6.test bd3625806a5ee6f7bef72d06295bd319f0290af2
- F test/analyze7.test d3587aa5af75c9048d031b94fceca2534fa75d1d
- F test/analyze8.test 4ca170de2ba30ccb1af2c0406803db72262f9691
+ F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
+ F test/analyze.test 1772936d66471c65221e437b6d1999c3a03166c4
+ F test/analyze3.test 412f690dfe95b337475e3e78a84a85d25f6f125d
+ F test/analyze4.test eff2df19b8dd84529966420f29ea52edc6b56213
+ F test/analyze5.test 765c4e284aa69ca172772aa940946f55629bc8c4
+ F test/analyze6.test d31defa011a561b938b4608d3538c1b4e0b5e92c
+ F test/analyze7.test bb1409afc9e8629e414387ef048b8e0e3e0bdc4f
+ F test/analyze8.test 093d15c1c888eed5034304a98c992f7360130b88
+ F test/analyze9.test e072a5172d55afcba98d6ca6a219ce8878c2f5c9
+ F test/analyzeA.test 1a5c40079894847976d983ca39c707aaa44b6944
+ F test/analyzeB.test 8bf35ee0a548aea831bf56762cb8e7fdb1db083d
  F test/async.test 1d0e056ba1bb9729283a0f22718d3a25e82c277b
  F test/async2.test c0a9bd20816d7d6a2ceca7b8c03d3d69c28ffb8b
  F test/async3.test d73a062002376d7edc1fe3edff493edbec1fc2f7
@@@ -978,27 -1116,31 +1117,31 @@@ F tool/fragck.tcl 5265a95126abcf6ab357f
  F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
  F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
  F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
- F tool/lemon.c 680980c7935bfa1edec20c804c9e5ba4b1dd96f5
+ F tool/lemon.c 07aba6270d5a5016ba8107b09e431eea4ecdc123
  F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
- F tool/mkkeywordhash.c bb52064aa614e1426445e4b2b9b00eeecd23cc79
+ F tool/logest.c 7ad625cac3d54012b27d468b7af6612f78b9ba75
+ F tool/mkautoconfamal.sh f8d8dbf7d62f409ebed5134998bf5b51d7266383
+ F tool/mkkeywordhash.c c9e05e4a7bcab8fab9f583d5b321fb72f565ad97
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
+ F tool/mkpragmatab.tcl 78a77b2c554d534c6f2dc903130186ed15715460
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 -F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 -F tool/mksqlite3c.tcl ed5b4e9ca8bf209ff401059a16362f37710fd8b8
 +F tool/mksqlite3c-noext.tcl 752f1a9d3287f6c0ef5738b1c4add0b96fbe0854
- F tool/mksqlite3c.tcl d4923e8e75b7710ddbe4eb37f83dda5eadef63d8
- F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
++F tool/mksqlite3c.tcl 8da823522f27608494997e1dba19cd426572ba80
+ F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
  F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
- F tool/mkvsix.tcl 19b2ab9ea16445953a76568a5bbe4cb864f92dfe
+ F tool/mkvsix.tcl 6477fb9dab838b7eea1eed50658ff1cda04850b5
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
- F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
+ F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
+ F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b
  F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
  F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
- F tool/showdb.c 2e28d8e499b016485672e9a7ac65dacc0d28ff69
+ F tool/showdb.c 1f3fe634d6f690b8d39ab1b9fd34583d468921e1
  F tool/showjournal.c b62cecaab86a4053d944c276bb5232e4d17ece02
- F tool/showwal.c f09e5a80a293919290ec85a6a37c85a5ddcf37d9
+ F tool/showwal.c 3f7f7da5ec0cba51b1449a75f700493377da57b5
  F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
  F tool/space_used.tcl f714c41a59e326b8b9042f415b628b561bafa06b
- F tool/spaceanal.tcl e42273000686a4afbf6a5e5d7fb12be65e92afb1
+ F tool/spaceanal.tcl 8e50b217c56a6a086a1b47eac9d09c5cd65b996f
  F tool/speedtest.tcl 06c76698485ccf597b9e7dbb1ac70706eb873355
  F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
  F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
@@@ -1008,11 -1151,12 +1152,12 @@@ F tool/stack_usage.tcl f8e71b92cdb099a1
  F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
  F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
- F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
+ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
+ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P f4125771e21f1ca29d5442b5441dacfc06b8032b c2cf498513c2633bd2b08372772eaa0f3b3ab25f
- R d53679dd7e2c9cf4e3b63c09756c305f
- U drh
- Z 171195171b662a876210fc11cf6e5f1e
+ F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
+ F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
 -P c67a52c356416cc200f51f9168d942e78db11d34
 -R 675a28e896dc8931c7ccad371f04b002
++P c92b0fe1371e7c20a5fbdf5fa96e30da14c40880 6504aa47a8ebb13827be017c4cb4b2dc3c4c55f4
++R c6806fc7f1eff740ed4af1293ffc55d0
+ U dan
 -Z 867ad6b65f1e7902a3a764dd985f4266
++Z b3b09b0f0acb184b570781ded35d947c

diff --cc manifest.uuid
index 1e3159f0c4f073c3c3dbdbf4a2659d7344338404,7a533b2f8c786ac7a486e77603f719905f7f5599..c9d158cd107be8a06f983acca132e42875993e31
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c92b0fe1371e7c20a5fbdf5fa96e30da14c40880
 -6504aa47a8ebb13827be017c4cb4b2dc3c4c55f4
++d17231b63d48c1f9c4dee109c90cec112e2f0fd4

diff --cc src/os_win.c
Simple merge

diff --cc src/sqliteInt.h
index fc2c5593a1ab967ff13c8313fb801ac3b0530f08,3ee39e5278c1375148f652399c5dd306916fdc2b..9b1ae0cf9930512abc6759f1ee5782be74c66ef7
--- 1/src/sqliteInt.h
--- 2/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@@ -661,7 -788,7 +788,8 @@@ typedef struct PrintfArguments PrintfAr
  typedef struct RowSet RowSet;
  typedef struct Savepoint Savepoint;
  typedef struct Select Select;
 +typedef struct SQLiteThread SQLiteThread;
+ typedef struct SelectDest SelectDest;
  typedef struct SrcList SrcList;
  typedef struct StrAccum StrAccum;
  typedef struct Table Table;

diff --cc tool/mksqlite3c.tcl
Simple merge